Update of /cvsroot/audacity/lib-src/libsndfile/programs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14379/programs
Modified Files:
Makefile.am Makefile.in common.c common.h sndfile-cmp.c
sndfile-convert.c sndfile-info.c sndfile-jackplay.c
sndfile-metadata-get.c sndfile-metadata-set.c
sndfile-play-beos.cpp sndfile-play.c
test-sndfile-metadata-set.py
Log Message:
Update to 1.0.18 release plus our portability patches.
Index: sndfile-convert.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/sndfile-convert.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sndfile-convert.c 8 Feb 2009 18:44:57 -0000 1.1
+++ sndfile-convert.c 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2008 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 1999-2009 Erik de Castro Lopo <[email protected]>
**
** All rights reserved.
**
@@ -66,6 +66,7 @@
{ "fap", 0, SF_ENDIAN_LITTLE | SF_FORMAT_PAF
},
{ "gsm", 0, SF_FORMAT_RAW },
{ "nist", 0, SF_FORMAT_NIST },
+ { "htk", 0, SF_FORMAT_HTK },
{ "ircam", 0, SF_FORMAT_IRCAM },
{ "sf", 0, SF_FORMAT_IRCAM },
{ "voc", 0, SF_FORMAT_VOC },
Index: common.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.h 8 Feb 2009 18:44:57 -0000 1.1
+++ common.h 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2008 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 1999-2009 Erik de Castro Lopo <[email protected]>
**
** All rights reserved.
**
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in 8 Feb 2009 18:44:57 -0000 1.1
+++ Makefile.in 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -50,8 +50,7 @@
$(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \
$(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \
$(top_srcdir)/M4/mkoctfile_version.m4 \
- $(top_srcdir)/M4/octave.m4 $(top_srcdir)/M4/pkg.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -177,7 +176,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKOCTFILE = @MKOCTFILE@
@@ -278,7 +276,6 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
@@ -305,12 +302,12 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
exit 1;; \
esac; \
done; \
@@ -330,9 +327,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -445,7 +442,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
Index: sndfile-play.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/sndfile-play.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sndfile-play.c 8 Feb 2009 18:44:57 -0000 1.1
+++ sndfile-play.c 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2007 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 1999-2009 Erik de Castro Lopo <[email protected]>
**
** All rights reserved.
**
Index: common.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/common.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.c 8 Feb 2009 18:44:57 -0000 1.1
+++ common.c 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2008 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 1999-2009 Erik de Castro Lopo <[email protected]>
** Copyright (C) 2008 George Blood Audio
**
** All rights reserved.
Index: sndfile-cmp.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/sndfile-cmp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sndfile-cmp.c 8 Feb 2009 18:44:57 -0000 1.1
+++ sndfile-cmp.c 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 2008 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 2008-2009 Erik de Castro Lopo <[email protected]>
**
** All rights reserved.
**
Index: sndfile-info.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsndfile/programs/sndfile-info.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sndfile-info.c 8 Feb 2009 18:44:57 -0000 1.1
+++ sndfile-info.c 13 Feb 2009 21:33:28 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2008 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 1999-2009 Erik de Castro Lopo <[email protected]>
**
** All rights reserved.
**
@@ -145,22 +145,9 @@
static double
get_signal_max (SNDFILE *file)
-{ double max, temp ;
- int readcount, k, save_state ;
-
- save_state = sf_command (file, SFC_GET_NORM_DOUBLE, NULL, 0) ;
- sf_command (file, SFC_SET_NORM_DOUBLE, NULL, SF_FALSE) ;
-
- max = 0.0 ;
- while ((readcount = sf_read_double (file, data, BUFFER_LEN)))
- { for (k = 0 ; k < readcount ; k++)
- { temp = fabs (data [k]) ;
- if (temp > max)
- max = temp ;
- } ;
- } ;
+{ double max ;
- sf_command (file, SFC_SET_NORM_DOUBLE, NULL, save_state) ;
+ sf_command (file, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ;
return max ;
} /* get_signal_max */
@@ -275,7 +262,7 @@
printf ("Seekable : %s\n", (sfinfo.seekable ? "TRUE" :
"FALSE")) ;
printf ("Duration : %s\n", generate_duration_str (&sfinfo)) ;
- if (sfinfo.frames < 10 * 1024 * 1024)
+ if (sfinfo.frames < 100 * 1024 * 1024)
{ /* Do not use sf_signal_max because it doesn't work for
non-seekable files . */
signal_max = get_signal_max (file) ;
decibels = calc_decibels (&sfinfo, signal_max) ;
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
