Fixed Speex warnings, and set version to 0.5.3.1

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@279 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 47 insertions, 4 deletions

diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c
index f554b26b..7766a973 100644
--- a/pjlib/src/pj/config.c
+++ b/pjlib/src/pj/config.c
@@ -21,7 +21,7 @@
 #include <pj/ioqueue.h>
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.3";
+const char *PJ_VERSION = "0.5.3.1";
 
 PJ_DEF(void) pj_dump_config(void)
 {
diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp
index 0b650510..df1737d8 100644
--- a/pjmedia/build/pjmedia_codec.dsp
+++ b/pjmedia/build/pjmedia_codec.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX- /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX- /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -411,130 +411,162 @@ SOURCE="..\src\pjmedia-codec\speex\vq_sse.h"
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\bits.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\cb_search.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_10_16_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_10_32_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_20_32_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_5_256_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_5_64_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\exc_8_128_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\filters.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\gain_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\gain_table_lbr.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\hexc_10_32_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\hexc_table.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\high_lsp_tables.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\lpc_spx.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\lsp.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\lsp_tables_nb.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\ltp.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\math_approx.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\misc.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\modes.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\nb_celp.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\preprocess_spx.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\quant_lsp.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\sb_celp.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\smallft.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\speex.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\speex_callbacks.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\speex_header.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\stereo.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\vbr.c"
+# ADD CPP /W4
 # End Source File
 # Begin Source File
 
 SOURCE="..\src\pjmedia-codec\speex\vq.c"
+# ADD CPP /W4
 # End Source File
 # End Group
 # End Group
diff --git a/pjmedia/src/pjmedia-codec/speex/config.h b/pjmedia/src/pjmedia-codec/speex/config.h
index 0bb4998a..ef3a4a03 100644
--- a/pjmedia/src/pjmedia-codec/speex/config.h
+++ b/pjmedia/src/pjmedia-codec/speex/config.h
@@ -5,3 +5,15 @@
 #define restrict
 
 #include "misc.h"
+
+#if !defined(PJ_HAS_FLOATING_POINT) || PJ_HAS_FLOATING_POINT==0
+#   define FIXED_POINT
+#endif
+
+#ifdef _MSC_VER
+#   pragma warning(disable: 4100)   // unreferenced formal parameter
+#   pragma warning(disable: 4101)   // unreferenced local variable
+#   pragma warning(disable: 4244)   // conversion from 'double ' to 'float '
+#   pragma warning(disable: 4305)   // truncation from 'const double ' to 'float '
+#   pragma warning(disable: 4701)   // local variable used without initialized
+#endif
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c
index ca209ffe..53a2bf4b 100644
--- a/pjmedia/src/pjmedia/conference.c
+++ b/pjmedia/src/pjmedia/conference.c
@@ -889,7 +889,6 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
 			      pj_uint32_t timestamp)
 {
     pj_int16_t *buf;
-    pj_bool_t sent = PJ_FALSE;
     unsigned j;
 
     /* If port is muted or nobody is transmitting to this port,