kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

fix more msvc warnings. Fix mod_sndfile build on OSX

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@635 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2006-02-20 04:36:29 +00:00
parent fc341792be
commit 70739b6d2e
29 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/codecs/mod_g711/g711.c
View File

@@ -161,7 +161,7 @@ unsigned char linear2alaw(short pcm_val)
aval |= (pcm_val >> 1) & QUANT_MASK;
else
aval |= (pcm_val >> seg) & QUANT_MASK;
return (aval ^ mask);
return (unsigned char)(aval ^ mask);
}
}
@@ -177,7 +177,7 @@ short alaw2linear(unsigned char a_val)
a_val ^= 0x55;
t = (a_val & QUANT_MASK) << 4;
seg = ((unsigned) a_val & SEG_MASK) >> SEG_SHIFT;
seg = (short)(((unsigned) a_val & SEG_MASK) >> SEG_SHIFT);
switch (seg) {
case 0:
t += 8;
@@ -252,8 +252,8 @@ unsigned char linear2ulaw(short pcm_val)
if (seg >= 8) /* out of range, return maximum value. */
return (unsigned char) (0x7F ^ mask);
else {
uval = (unsigned char) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
return (uval ^ mask);
uval = (unsigned char) ((seg << 4) | ((pcm_val >> (seg + 1)) & 0xF));
return (unsigned char) (uval ^ mask);
}
}

4
src/mod/codecs/mod_g711/mod_g711.vcproj
View File

@@ -47,7 +47,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -125,7 +125,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>

4
src/mod/codecs/mod_g729/mod_g729.vcproj
View File

@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -128,7 +128,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>

4
src/mod/codecs/mod_gsm/mod_gsm.vcproj
View File

@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -128,7 +128,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>

4
src/mod/codecs/mod_l16/mod_l16.vcproj
View File

@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -128,7 +128,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>

2
src/mod/codecs/mod_speex/mod_speex.c
View File

@@ -87,7 +87,7 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl
memcpy(&codec->codec_settings, codec_settings, sizeof(codec->codec_settings));
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
if (!(encoding || decoding) || ((context = switch_core_alloc(codec->memory_pool, sizeof(*context))) == 0)) {
return SWITCH_STATUS_FALSE;
} else {
const SpeexMode *mode = NULL;

4
src/mod/codecs/mod_speex/mod_speex.vcproj
View File

@@ -48,7 +48,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
@@ -128,7 +128,7 @@
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>