[xiph-commits] r11772 - in trunk/speex: src win32/VS2005/libspeex win32/VS2005/speexdec win32/VS2005/speexenc

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-08-14 07:33:40 -0700 (Mon, 14 Aug 2006)
New Revision: 11772

Modified:
   trunk/speex/src/skeleton.h
   trunk/speex/src/speexdec.c
   trunk/speex/win32/VS2005/libspeex/libspeex.vcproj
   trunk/speex/win32/VS2005/speexdec/speexdec.vcproj
   trunk/speex/win32/VS2005/speexenc/speexenc.vcproj
Log:
* Update win32 files
* Add a #define for snprintf under windows in skeleton.h
* Fix a c99 declaration in speexdec.c

Modified: trunk/speex/src/skeleton.h
===================================================================
--- trunk/speex/src/skeleton.h	2006-08-14 13:24:48 UTC (rev 11771)
+++ trunk/speex/src/skeleton.h	2006-08-14 14:33:40 UTC (rev 11772)
@@ -10,6 +10,10 @@
 extern "C" {
 #endif
 
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
 #include <ogg/ogg.h>
 
 #define SKELETON_VERSION_MAJOR 3

Modified: trunk/speex/src/speexdec.c
===================================================================
--- trunk/speex/src/speexdec.c	2006-08-14 13:24:48 UTC (rev 11771)
+++ trunk/speex/src/speexdec.c	2006-08-14 14:33:40 UTC (rev 11772)
@@ -462,6 +462,7 @@
    int extra_headers;
    int wav_format=0;
    int lookahead;
+   int skeleton_serialno = -1;
 
    enh_enabled = 1;
 
@@ -584,7 +585,7 @@
    
    speex_bits_init(&bits);
    /*Main decoding loop*/
-   int skeleton_serialno = -1;
+   
    while (1)
    {
       char *data;

Modified: trunk/speex/win32/VS2005/libspeex/libspeex.vcproj
===================================================================
--- trunk/speex/win32/VS2005/libspeex/libspeex.vcproj	2006-08-14 13:24:48 UTC (rev 11771)
+++ trunk/speex/win32/VS2005/libspeex/libspeex.vcproj	2006-08-14 14:33:40 UTC (rev 11772)
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libspeex"
-	ProjectGUID="{6D653C6F-8722-4B10-9C3A-CB7094DD159F}"
+	ProjectGUID="{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
 	RootNamespace="libspeex"
 	Keyword="Win32Proj"
 	>

Modified: trunk/speex/win32/VS2005/speexdec/speexdec.vcproj
===================================================================
--- trunk/speex/win32/VS2005/speexdec/speexdec.vcproj	2006-08-14 13:24:48 UTC (rev 11771)
+++ trunk/speex/win32/VS2005/speexdec/speexdec.vcproj	2006-08-14 14:33:40 UTC (rev 11772)
@@ -380,6 +380,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\skeleton.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\speexdec.c"
 				>
 			</File>
@@ -402,6 +406,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\skeleton.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\wav_io.h"
 				>
 			</File>

Modified: trunk/speex/win32/VS2005/speexenc/speexenc.vcproj
===================================================================
--- trunk/speex/win32/VS2005/speexenc/speexenc.vcproj	2006-08-14 13:24:48 UTC (rev 11771)
+++ trunk/speex/win32/VS2005/speexenc/speexenc.vcproj	2006-08-14 14:33:40 UTC (rev 11772)
@@ -380,6 +380,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\skeleton.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\speexenc.c"
 				>
 			</File>
@@ -402,6 +406,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\skeleton.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\wav_io.h"
 				>
 			</File>