Win32 library of libsndfile v1.0.19 migrated to v1.0.20.

git-svn-id: svn://svn.code.sf.net/p/bs2b/code/trunk/libbs2b@142 bc0edfbe-c936-4687-b64d-f70bc3985e72

8 files changed, 54 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 55cb87b..bf50cd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-05-22 Boris Mikhaylov <http://www.tmn.ru/~bor>
+	* Win32 library of libsndfile v1.0.19 migrated to v1.0.20.
+
 2009-05-19 Boris Mikhaylov <http://www.tmn.ru/~bor>
 	* bs2bstream - add switch of crossfeed level by feed level
 	and cut frequency.
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 8e4a289..5c61667 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
 	bs2bconvert/bs2bconvert.vcproj \
 	bs2bconvert/bs2bconvert-readme.txt \
+	\
 	bs2bstream/bs2bstream.vcproj \
 	bs2bstream/bs2bstream-readme.txt \
 	\
@@ -8,6 +9,8 @@ EXTRA_DIST = \
 	examples/bs2bwav.bat \
 	examples/mp3bs2bmp3.bat \
 	\
+	sndfile/libsndfile-1.def \
+	sndfile/libsndfile-1.dll \
 	sndfile/libsndfile-1.lib \
 	sndfile/libsndfile-license.txt \
 	sndfile/readme.txt \
diff --git a/win32/bs2bconvert/bs2bconvert-readme.txt b/win32/bs2bconvert/bs2bconvert-readme.txt
index 22d427c..de5ba5d 100644
--- a/win32/bs2bconvert/bs2bconvert-readme.txt
+++ b/win32/bs2bconvert/bs2bconvert-readme.txt
@@ -7,7 +7,7 @@ Project source code and description is available at
 http://bs2b.sourceforge.net/

 

 bs2bconvert.exe - win32 x86 binary.

-libsndfile-1.dll - libsndfile library v1.0.19.

+libsndfile-1.dll - win32 library of libsndfile v1.0.20.

 

 libsndfile is copyright by Erik de Castro Lopo.

 http://www.mega-nerd.com/libsndfile/

diff --git a/win32/sndfile/libsndfile-1.def b/win32/sndfile/libsndfile-1.def
new file mode 100644
index 0000000..6e3af4d
--- /dev/null
+++ b/win32/sndfile/libsndfile-1.def
@@ -0,0 +1,40 @@
+; Auto-generated by create_symbols_file.py

+

+LIBRARY libsndfile-1.dll

+EXPORTS

+

+sf_command           @1

+sf_open              @2

+sf_close             @3

+sf_seek              @4

+sf_error             @7

+sf_perror            @8

+sf_error_str         @9

+sf_error_number      @10

+sf_format_check      @11

+sf_read_raw          @16

+sf_readf_short       @17

+sf_readf_int         @18

+sf_readf_float       @19

+sf_readf_double      @20

+sf_read_short        @21

+sf_read_int          @22

+sf_read_float        @23

+sf_read_double       @24

+sf_write_raw         @32

+sf_writef_short      @33

+sf_writef_int        @34

+sf_writef_float      @35

+sf_writef_double     @36

+sf_write_short       @37

+sf_write_int         @38

+sf_write_float       @39

+sf_write_double      @40

+sf_strerror          @50

+sf_get_string        @60

+sf_set_string        @61

+sf_version_string    @68

+sf_open_fd           @70

+sf_open_virtual      @80

+sf_write_sync        @90

+

diff --git a/win32/sndfile/libsndfile-1.dll b/win32/sndfile/libsndfile-1.dll
new file mode 100644
index 0000000..c6becf7
--- /dev/null
+++ b/win32/sndfile/libsndfile-1.dll
diff --git a/win32/sndfile/libsndfile-1.lib b/win32/sndfile/libsndfile-1.lib
index ec664a2..7cab6fb 100644
--- a/win32/sndfile/libsndfile-1.lib
+++ b/win32/sndfile/libsndfile-1.lib
diff --git a/win32/sndfile/readme.txt b/win32/sndfile/readme.txt
index d303006..5902ecd 100644
--- a/win32/sndfile/readme.txt
+++ b/win32/sndfile/readme.txt
@@ -1,4 +1,4 @@
-Win32 import library and header file of libsndfile library v1.0.19.

+Win32 library of libsndfile v1.0.20.

 

 libsndfile is copyright by Erik de Castro Lopo.

 http://www.mega-nerd.com/libsndfile/

diff --git a/win32/sndfile/sndfile.h b/win32/sndfile/sndfile.h
index 08e63d2..1507338 100644
--- a/win32/sndfile/sndfile.h
+++ b/win32/sndfile/sndfile.h
@@ -301,8 +301,8 @@ typedef	struct SNDFILE_tag	SNDFILE ;
 ** header file to be compiler by both GCC and the microsoft compiler.

 */

 

-#ifdef _MSCVER

-typedef __int64_t	sf_count_t ;

+#if (defined (_MSCVER) || defined (_MSC_VER))

+typedef __int64	sf_count_t ;

 #define SF_COUNT_MAX		0x7fffffffffffffffi64

 #else

 typedef __int64	sf_count_t ;

@@ -551,6 +551,10 @@ int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
 

 const char* sf_get_string (SNDFILE *sndfile, int str_type) ;

 

+/* Return the library version string. */

+

+const char * sf_version_string (void) ;

+

 /* Functions for reading/writing the waveform data of a sound file.

 */