- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7653 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 00:27:14 2008 New Revision: 7653 Modified: freeswitch/trunk/libs/voipcodecs/src/oki_adpcm.c Log: hints for the code analysis. Modified: freeswitch/trunk/libs/voipcodecs/src/oki_adpcm.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/oki_adpcm.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/oki_adpcm.c Sun Feb 17 00:27:14 2008 @@ -276,6 +276,10 @@ int samples; float z; +#if (_MSC_VER >= 1400) + __analysis_assume(s->phase >=0 && s->phase <= 4); +#endif + samples = 0; if (s->bit_rate == 32000) {

1 0

[commit] r7652 - in freeswitch/trunk/libs/voipcodecs/src: . voipcodecs
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 00:11:21 2008 New Revision: 7652 Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_long_term.c freeswitch/trunk/libs/voipcodecs/src/gsm0610_rpe.c freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h Log: add assert macro to silence msvc code analysis. Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_long_term.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/gsm0610_long_term.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/gsm0610_long_term.c Sun Feb 17 00:11:21 2008 @@ -355,12 +355,12 @@ int16_t *Nc, int16_t *bc) { - assert(d); - assert(dp); - assert(e); - assert(dpp); - assert(Nc); - assert(bc); + vc_assert(d); + vc_assert(dp); + vc_assert(e); + vc_assert(dpp); + vc_assert(Nc); + vc_assert(bc); *bc = evaluate_ltp_parameters(d, dp, Nc); long_term_analysis_filtering(*bc, *Nc, dp, d, dpp, e); Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_rpe.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/gsm0610_rpe.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/gsm0610_rpe.c Sun Feb 17 00:11:21 2008 @@ -433,7 +433,7 @@ samples to obtain the xMp[0..12] array. Table 4.6 is used to get the mantissa of xmaxc (FAC[0..7]). */ - assert(mant >= 0 && mant <= 7); + vc_assert(mant >= 0 && mant <= 7); temp1 = gsm_FAC[mant]; /* See 4.2-15 for mant */ temp2 = gsm_sub(6, exp); /* See 4.2-15 for exp */ Modified: freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/voipcodecs/telephony.h Sun Feb 17 00:11:21 2008 @@ -54,6 +54,12 @@ #if !defined(TRUE) #define TRUE (!FALSE) #endif + +#if (_MSC_VER >= 1400) // VC8+ +#define vc_assert(expr) assert(expr);__analysis_assume( expr ) +#else +#define vc_assert(expr) assert(expr) +#endif #if defined(__cplusplus) /* C++ doesn't seem to have sane rounding functions/macros yet */

1 0

[commit] r7651 - in freeswitch/trunk/libs/voipcodecs: . src
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sun Feb 17 00:00:41 2008 New Revision: 7651 Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c freeswitch/trunk/libs/voipcodecs/src/gsm0610_local.h freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c Log: casts to shut up msvc warnings. Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj (original) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj Sun Feb 17 00:00:41 2008 @@ -49,6 +49,7 @@ UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool" @@ -109,6 +110,7 @@ UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c Sun Feb 17 00:00:41 2008 @@ -189,7 +189,7 @@ sr = (sr >> 6) | (s->xmaxc[i] << 10); *c++ = (uint8_t)(sr >> 3); sr = (sr >> 3) | (s->xMc[i][0] << 13); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); sr = (sr >> 3) | (s->xMc[i][1] << 13); sr = (sr >> 3) | (s->xMc[i][2] << 13); sr = (sr >> 3) | (s->xMc[i][3] << 13); @@ -260,43 +260,43 @@ { int i; - *c++ = ((GSM0610_MAGIC & 0xF) << 4) - | ((s->LARc[0] >> 2) & 0xF); - *c++ = ((s->LARc[0] & 0x3) << 6) - | (s->LARc[1] & 0x3F); - *c++ = ((s->LARc[2] & 0x1F) << 3) - | ((s->LARc[3] >> 2) & 0x7); - *c++ = ((s->LARc[3] & 0x3) << 6) + *c++ = (uint8_t)(((GSM0610_MAGIC & 0xF) << 4) + | ((s->LARc[0] >> 2) & 0xF)); + *c++ = (uint8_t)(((s->LARc[0] & 0x3) << 6) + | (s->LARc[1] & 0x3F)); + *c++ = (uint8_t)(((s->LARc[2] & 0x1F) << 3) + | ((s->LARc[3] >> 2) & 0x7)); + *c++ = (uint8_t)(((s->LARc[3] & 0x3) << 6) | ((s->LARc[4] & 0xF) << 2) - | ((s->LARc[5] >> 2) & 0x3); - *c++ = ((s->LARc[5] & 0x3) << 6) + | ((s->LARc[5] >> 2) & 0x3)); + *c++ = (uint8_t)(((s->LARc[5] & 0x3) << 6) | ((s->LARc[6] & 0x7) << 3) - | (s->LARc[7] & 0x7); + | (s->LARc[7] & 0x7)); for (i = 0; i < 4; i++) { - *c++ = ((s->Nc[i] & 0x7F) << 1) - | ((s->bc[i] >> 1) & 0x1); - *c++ = ((s->bc[i] & 0x1) << 7) + *c++ = (uint8_t)(((s->Nc[i] & 0x7F) << 1) + | ((s->bc[i] >> 1) & 0x1)); + *c++ = (uint8_t)(((s->bc[i] & 0x1) << 7) | ((s->Mc[i] & 0x3) << 5) - | ((s->xmaxc[i] >> 1) & 0x1F); - *c++ = ((s->xmaxc[i] & 0x1) << 7) + | ((s->xmaxc[i] >> 1) & 0x1F)); + *c++ = (uint8_t)(((s->xmaxc[i] & 0x1) << 7) | ((s->xMc[i][0] & 0x7) << 4) | ((s->xMc[i][1] & 0x7) << 1) - | ((s->xMc[i][2] >> 2) & 0x1); - *c++ = ((s->xMc[i][2] & 0x3) << 6) + | ((s->xMc[i][2] >> 2) & 0x1)); + *c++ = (uint8_t)(((s->xMc[i][2] & 0x3) << 6) | ((s->xMc[i][3] & 0x7) << 3) - | (s->xMc[i][4] & 0x7); - *c++ = ((s->xMc[i][5] & 0x7) << 5) + | (s->xMc[i][4] & 0x7)); + *c++ = (uint8_t)(((s->xMc[i][5] & 0x7) << 5) | ((s->xMc[i][6] & 0x7) << 2) - | ((s->xMc[i][7] >> 1) & 0x3); - *c++ = ((s->xMc[i][7] & 0x1) << 7) + | ((s->xMc[i][7] >> 1) & 0x3)); + *c++ = (uint8_t)(((s->xMc[i][7] & 0x1) << 7) | ((s->xMc[i][8] & 0x7) << 4) | ((s->xMc[i][9] & 0x7) << 1) - | ((s->xMc[i][10] >> 2) & 0x1); - *c++ = ((s->xMc[i][10] & 0x3) << 6) + | ((s->xMc[i][10] >> 2) & 0x1)); + *c++ = (uint8_t)(((s->xMc[i][10] & 0x3) << 6) | ((s->xMc[i][11] & 0x7) << 3) - | (s->xMc[i][12] & 0x7); + | (s->xMc[i][12] & 0x7)); } /*endfor*/ return 33; Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_local.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/gsm0610_local.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/gsm0610_local.h Sun Feb 17 00:00:41 2008 @@ -140,15 +140,15 @@ static __inline__ int16_t gsm_asr(int16_t a, int n) { if (n >= 16) - return -(a < 0); + return (int16_t)(-(a < 0)); /*endif*/ if (n <= -16) return 0; /*endif*/ if (n < 0) - return a << -n; + return (int16_t)(a << -n); /*endif*/ - return a >> n; + return (int16_t)(a >> n); } /*- End of function --------------------------------------------------------*/ @@ -158,12 +158,12 @@ return 0; /*endif*/ if (n <= -16) - return -(a < 0); + return (int16_t)(-(a < 0)); /*endif*/ if (n < 0) return gsm_asr(a, -n); /*endif*/ - return a << n; + return (int16_t)(a << n); } /*- End of function --------------------------------------------------------*/ Modified: freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c Sun Feb 17 00:00:41 2008 @@ -424,7 +424,7 @@ if (s->chunk_size == 0) { ima_data[bytes++] = (uint8_t)amp[1]; - ima_data[bytes++] = amp[1] >> 8; + ima_data[bytes++] = (uint8_t)(amp[1] >> 8); ima_data[bytes++] = (uint8_t)s->step_index; ima_data[bytes++] = 0; s->last = amp[1];

1 0

[commit] r7650 - freeswitch/trunk
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sat Feb 16 23:57:53 2008 New Revision: 7650 Modified: freeswitch/trunk/Freeswitch.sln Log: cleanup Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sat Feb 16 23:57:53 2008 @@ -206,9 +206,6 @@ EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" - ProjectSection(SolutionItems) = preProject - libs\voipcodecs\libvoipcodecs.vcproj = libs\voipcodecs\libvoipcodecs.vcproj - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" EndProject

1 0

[commit] r7649 - in freeswitch/trunk: . libs/voipcodecs libs/voipcodecs/src/msvc src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sat Feb 16 23:46:07 2008 New Revision: 7649 Added: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.h freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/voipcodecs/ (props changed) freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj freeswitch/trunk/src/mod/codecs/mod_voipcodecs/ (props changed) freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Log: add mod_voipcodecs to msvc build Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sat Feb 16 23:46:07 2008 @@ -876,6 +876,14 @@ {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvoipcodecs", "libs\voipcodecs\libvoipcodecs.2008.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voipcodecs", "src\mod\codecs\mod_voipcodecs\mod_voipcodecs.2008.vcproj", "{42B6C2E3-7D5F-4204-A1F6-C0376B86C315}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {CF70F278-3364-4395-A2E1-23501C9B8AD2} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1468,6 +1476,18 @@ {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|Win32.ActiveCfg = Release|Win32 {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|Win32.Build.0 = Release|Win32 {6FF941AC-82C5-429F-AA4C-AD2FB9E5DA52}.Release|x64.ActiveCfg = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.Build.0 = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x64.ActiveCfg = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.ActiveCfg = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.Build.0 = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x64.ActiveCfg = Release|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Debug|Win32.ActiveCfg = Debug|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Debug|Win32.Build.0 = Debug|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Debug|x64.ActiveCfg = Debug|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|Win32.ActiveCfg = Release|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|Win32.Build.0 = Release|Win32 + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1484,6 +1504,7 @@ {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {42B6C2E3-7D5F-4204-A1F6-C0376B86C315} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} @@ -1553,6 +1574,7 @@ {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sat Feb 16 23:46:07 2008 @@ -3,20 +3,20 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" @@ -26,15 +26,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectSection(ProjectDependencies) = postProject - {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject - {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" @@ -44,16 +44,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" @@ -63,14 +63,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject - {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" @@ -91,8 +91,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" @@ -106,22 +106,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" ProjectSection(ProjectDependencies) = postProject - {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" @@ -130,10 +130,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -145,22 +145,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" ProjectSection(ProjectDependencies) = postProject - {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" ProjectSection(ProjectDependencies) = postProject - {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" @@ -174,38 +174,41 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} - {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" + ProjectSection(SolutionItems) = preProject + libs\voipcodecs\libvoipcodecs.vcproj = libs\voipcodecs\libvoipcodecs.vcproj + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" EndProject @@ -215,8 +218,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject - {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" @@ -241,8 +244,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -260,8 +263,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" ProjectSection(ProjectDependencies) = postProject - {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" @@ -281,32 +284,32 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject - {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -318,70 +321,70 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" ProjectSection(ProjectDependencies) = postProject - {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" @@ -454,16 +457,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" ProjectSection(ProjectDependencies) = postProject - {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" ProjectSection(ProjectDependencies) = postProject - {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" @@ -480,8 +483,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" ProjectSection(ProjectDependencies) = postProject - {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" @@ -491,26 +494,26 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject - {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} - {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} - {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" @@ -875,8 +878,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\formats\mod_tone_stream\mod_tone_stream.vcproj", "{1A789A98-71EF-4EBD-8007-FC9ED585D32E}" ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvoipcodecs", "libs\voipcodecs\libvoipcodecs.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voipcodecs", "src\mod\codecs\mod_voipcodecs\mod_voipcodecs.vcproj", "{9EED03C8-8315-4214-8D13-8FF5FA46D93C}" + ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {CF70F278-3364-4395-A2E1-23501C9B8AD2} EndProjectSection EndProject Global @@ -1471,6 +1482,18 @@ {1A789A98-71EF-4EBD-8007-FC9ED585D32E}.Release|Win32.ActiveCfg = Release|Win32 {1A789A98-71EF-4EBD-8007-FC9ED585D32E}.Release|Win32.Build.0 = Release|Win32 {1A789A98-71EF-4EBD-8007-FC9ED585D32E}.Release|x64.ActiveCfg = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.Build.0 = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|x64.ActiveCfg = Debug|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.ActiveCfg = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.Build.0 = Release|Win32 + {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|x64.ActiveCfg = Release|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Debug|Win32.Build.0 = Debug|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Debug|x64.ActiveCfg = Debug|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|Win32.ActiveCfg = Release|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|Win32.Build.0 = Release|Win32 + {9EED03C8-8315-4214-8D13-8FF5FA46D93C}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1487,6 +1510,7 @@ {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {9EED03C8-8315-4214-8D13-8FF5FA46D93C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {9254C4B0-6F60-42B6-BB3A-36D63FC001C7} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} @@ -1544,6 +1568,7 @@ {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000} {8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000} Added: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.2008.vcproj Sat Feb 16 23:46:07 2008 @@ -0,0 +1,304 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libvoipcodecs" + ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" + RootNamespace="libvoipcodecs" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_MATH_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_MATH_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\bitstream.c" + > + </File> + <File + RelativePath=".\src\g711.c" + > + </File> + <File + RelativePath=".\src\g722_decode.c" + > + </File> + <File + RelativePath=".\src\g722_encode.c" + > + </File> + <File + RelativePath=".\src\g726.c" + > + </File> + <File + RelativePath=".\src\gsm0610_decode.c" + > + </File> + <File + RelativePath=".\src\gsm0610_encode.c" + > + </File> + <File + RelativePath=".\src\gsm0610_long_term.c" + > + </File> + <File + RelativePath=".\src\gsm0610_lpc.c" + > + </File> + <File + RelativePath=".\src\gsm0610_preprocess.c" + > + </File> + <File + RelativePath=".\src\gsm0610_rpe.c" + > + </File> + <File + RelativePath=".\src\gsm0610_short_term.c" + > + </File> + <File + RelativePath=".\src\ima_adpcm.c" + > + </File> + <File + RelativePath=".\src\lpc10_analyse.c" + > + </File> + <File + RelativePath=".\src\lpc10_decode.c" + > + </File> + <File + RelativePath=".\src\lpc10_encode.c" + > + </File> + <File + RelativePath=".\src\lpc10_placev.c" + > + </File> + <File + RelativePath=".\src\lpc10_voicing.c" + > + </File> + <File + RelativePath=".\src\oki_adpcm.c" + > + </File> + <File + RelativePath=".\src\vector_int.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\voipcodecs\bit_operations.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\bitstream.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\dc_restore.h" + > + </File> + <File + RelativePath=".\src\float_fudge.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g711.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g722.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g726.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\gsm0610.h" + > + </File> + <File + RelativePath=".\src\gsm0610_local.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\ima_adpcm.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\lpc10.h" + > + </File> + <File + RelativePath=".\src\lpc10_encdecs.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\oki_adpcm.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\telephony.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\vector_int.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\version.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj ============================================================================== --- freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj (original) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj Sat Feb 16 23:46:07 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="libvoipcodecs" ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" RootNamespace="libvoipcodecs" @@ -24,21 +24,6 @@ CharacterSet="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" @@ -50,33 +35,6 @@ WarningLevel="4" DebugInformationFormat="4" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> </Configuration> <Configuration Name="Release|Win32" @@ -87,21 +45,6 @@ WholeProgramOptimization="1" > <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_MATH_H" @@ -110,33 +53,6 @@ WarningLevel="4" DebugInformationFormat="3" /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> </Configuration> </Configurations> <References> Added: freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.h Sat Feb 16 23:46:07 2008 @@ -0,0 +1,50 @@ +/* + * VoIPcodecs - a series of DSP components for telephony + * + * voipcodecs.h - The head guy amongst the headers + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2003 Steve Underwood + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the Lesser GNU General Public License version 2.1, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +/*! \file */ + +#if !defined(_VOIPCODECS_H_) +#define _VOIPCODECS_H_ + +#include <stdlib.h> +#include <string.h> +#include <limits.h> +#include <time.h> + +#include <voipcodecs/telephony.h> +#include <voipcodecs/bit_operations.h> +#include <voipcodecs/bitstream.h> +#include <voipcodecs/g711.h> +#include <voipcodecs/g722.h> +#include <voipcodecs/g726.h> +#include <voipcodecs/gsm0610.h> +#include <voipcodecs/ima_adpcm.h> +#include <voipcodecs/lpc10.h> +#include <voipcodecs/oki_adpcm.h> + +#endif +/*- End of file ------------------------------------------------------------*/ Added: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj Sat Feb 16 23:46:07 2008 @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_voipcodecs" + ProjectGUID="{42B6C2E3-7D5F-4204-A1F6-C0376B86C315}" + RootNamespace="mod_voipcodecs" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\voipcodecs\src";"$(InputDir)..\..\..\..\libs\voipcodecs\src\msvc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\voipcodecs\src";"$(InputDir)..\..\..\..\libs\voipcodecs\src\msvc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_voipcodecs.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Sat Feb 16 23:46:07 2008 @@ -684,13 +684,13 @@ switch_gsm_init, switch_gsm_encode, switch_gsm_decode, switch_gsm_destroy); } /* LPC10 */ - if (SWITCH_MAX_INTERVAL >= 90) { - SWITCH_ADD_CODEC(codec_interface, "LPC-10"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, - 90000, 720, 1440, 28, 1, 1, 1, - switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); - } +#if SWITCH_MAX_INTERVAL >= 90 + SWITCH_ADD_CODEC(codec_interface, "LPC-10"); + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, + 90000, 720, 1440, 28, 1, 1, 1, + switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); +#endif /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Added: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj Sat Feb 16 23:46:07 2008 @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_voipcodecs" + ProjectGUID="{9EED03C8-8315-4214-8D13-8FF5FA46D93C}" + RootNamespace="mod_voipcodecs" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="4" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\voipcodecs\src";"$(InputDir)..\..\..\..\libs\voipcodecs\src\msvc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="4" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\voipcodecs\src";"$(InputDir)..\..\..\..\libs\voipcodecs\src\msvc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_voipcodecs.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r7648 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sat Feb 16 22:39:25 2008 New Revision: 7648 Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c Log: cast to uint8_t Modified: freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/gsm0610_encode.c Sat Feb 16 22:39:25 2008 @@ -169,87 +169,87 @@ sr = 0; sr = (sr >> 6) | (s->LARc[0] << 10); sr = (sr >> 6) | (s->LARc[1] << 10); - *c++ = sr >> 4; + *c++ = (uint8_t)(sr >> 4); sr = (sr >> 5) | (s->LARc[2] << 11); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 5) | (s->LARc[3] << 11); sr = (sr >> 4) | (s->LARc[4] << 12); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 4) | (s->LARc[5] << 12); sr = (sr >> 3) | (s->LARc[6] << 13); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 3) | (s->LARc[7] << 13); for (i = 0; i < 4; i++) { sr = (sr >> 7) | (s->Nc[i] << 9); - *c++ = sr >> 5; + *c++ = (uint8_t)(sr >> 5); sr = (sr >> 2) | (s->bc[i] << 14); sr = (sr >> 2) | (s->Mc[i] << 14); sr = (sr >> 6) | (s->xmaxc[i] << 10); - *c++ = sr >> 3; + *c++ = (uint8_t)(sr >> 3); sr = (sr >> 3) | (s->xMc[i][0] << 13); *c++ = sr >> 8; sr = (sr >> 3) | (s->xMc[i][1] << 13); sr = (sr >> 3) | (s->xMc[i][2] << 13); sr = (sr >> 3) | (s->xMc[i][3] << 13); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 3) | (s->xMc[i][4] << 13); sr = (sr >> 3) | (s->xMc[i][5] << 13); sr = (sr >> 3) | (s->xMc[i][6] << 13); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 3) | (s->xMc[i][7] << 13); sr = (sr >> 3) | (s->xMc[i][8] << 13); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); sr = (sr >> 3) | (s->xMc[i][9] << 13); sr = (sr >> 3) | (s->xMc[i][10] << 13); sr = (sr >> 3) | (s->xMc[i][11] << 13); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 3) | (s->xMc[i][12] << 13); } /*endfor*/ s++; sr = (sr >> 6) | (s->LARc[0] << 10); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 6) | (s->LARc[1] << 10); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); sr = (sr >> 5) | (s->LARc[2] << 11); sr = (sr >> 5) | (s->LARc[3] << 11); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 4) | (s->LARc[4] << 12); sr = (sr >> 4) | (s->LARc[5] << 12); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 3) | (s->LARc[6] << 13); sr = (sr >> 3) | (s->LARc[7] << 13); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); for (i = 0; i < 4; i++) { sr = (sr >> 7) | (s->Nc[i] << 9); sr = (sr >> 2) | (s->bc[i] << 14); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 2) | (s->Mc[i] << 14); sr = (sr >> 6) | (s->xmaxc[i] << 10); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 3) | (s->xMc[i][0] << 13); sr = (sr >> 3) | (s->xMc[i][1] << 13); sr = (sr >> 3) | (s->xMc[i][2] << 13); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 3) | (s->xMc[i][3] << 13); sr = (sr >> 3) | (s->xMc[i][4] << 13); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); sr = (sr >> 3) | (s->xMc[i][5] << 13); sr = (sr >> 3) | (s->xMc[i][6] << 13); sr = (sr >> 3) | (s->xMc[i][7] << 13); - *c++ = sr >> 7; + *c++ = (uint8_t)(sr >> 7); sr = (sr >> 3) | (s->xMc[i][8] << 13); sr = (sr >> 3) | (s->xMc[i][9] << 13); sr = (sr >> 3) | (s->xMc[i][10] << 13); - *c++ = sr >> 6; + *c++ = (uint8_t)(sr >> 6); sr = (sr >> 3) | (s->xMc[i][11] << 13); sr = (sr >> 3) | (s->xMc[i][12] << 13); - *c++ = sr >> 8; + *c++ = (uint8_t)(sr >> 8); } /*endfor*/ return 65; Modified: freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/ima_adpcm.c Sat Feb 16 22:39:25 2008 @@ -423,9 +423,9 @@ i = 0; if (s->chunk_size == 0) { - ima_data[bytes++] = amp[1]; + ima_data[bytes++] = (uint8_t)amp[1]; ima_data[bytes++] = amp[1] >> 8; - ima_data[bytes++] = s->step_index; + ima_data[bytes++] = (uint8_t)s->step_index; ima_data[bytes++] = 0; s->last = amp[1]; s->bits = 0; @@ -443,9 +443,9 @@ case IMA_ADPCM_DVI4: if (s->chunk_size == 0) { - ima_data[bytes++] = s->last >> 8; - ima_data[bytes++] = s->last; - ima_data[bytes++] = s->step_index; + ima_data[bytes++] = (uint8_t) (s->last >> 8); + ima_data[bytes++] = (uint8_t) s->last; + ima_data[bytes++] = (uint8_t) s->step_index; ima_data[bytes++] = 0; } for (i = 0; i < len; i++) @@ -460,9 +460,9 @@ case IMA_ADPCM_VDVI: if (s->chunk_size == 0) { - ima_data[bytes++] = s->last >> 8; - ima_data[bytes++] = s->last; - ima_data[bytes++] = s->step_index; + ima_data[bytes++] = (uint8_t) (s->last >> 8); + ima_data[bytes++] = (uint8_t) s->last; + ima_data[bytes++] = (uint8_t) s->step_index; ima_data[bytes++] = 0; } s->bits = 0;

1 0

[commit] r7647 - in freeswitch/trunk/libs/voipcodecs: . src/voipcodecs
by Freeswitch SVN 17 Feb '08

17 Feb '08

Author: mikej Date: Sat Feb 16 22:30:42 2008 New Revision: 7647 Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Log: msvc build. Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj ============================================================================== --- freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj (original) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj Sat Feb 16 22:30:42 2008 @@ -20,7 +20,7 @@ Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" CharacterSet="1" > <Tool @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -61,22 +60,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - LinkIncremental="2" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -86,9 +75,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -96,7 +82,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1" > @@ -122,7 +108,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -135,24 +120,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - LinkIncremental="1" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -162,9 +135,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> Modified: freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Sat Feb 16 22:30:42 2008 @@ -99,6 +99,35 @@ } /*- End of function --------------------------------------------------------*/ +#ifdef _MSC_VER +__inline float rintf (float flt) +{ + _asm + { fld flt + frndint + } +} + +__inline double rint(double dbl) +{ + __asm + { + fld dbl + frndint + } +} + +__inline long lrintf (float flt) +{ + long retval; + _asm + { fld flt + fistp retval + } + return retval; +} +#endif + static __inline__ int16_t fsaturatef(float famp) { if (famp > 32767.0)

1 0

[commit] r7646 - freeswitch/trunk/src/mod/codecs/mod_l16
by Freeswitch SVN 16 Feb '08

16 Feb '08

Author: brian Date: Sat Feb 16 15:33:18 2008 New Revision: 7646 Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Log: these rates are for file playing and not voip related Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Sat Feb 16 15:33:18 2008 @@ -109,12 +109,17 @@ bpf = bpf * 2; ebpf = ebpf * 2; } + /* these formats below are for file playing. */ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 22050, 22050, 352800, 20000, 441, 882, 882, 1, 1, 1, switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); - + + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 11025, 11025, 176400, + 40000, 441, 882, 882, 1, 1, 1, + switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7644 - freeswitch/trunk
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: mikej Date: Fri Feb 15 18:53:58 2008 New Revision: 7644 Modified: freeswitch/trunk/Makefile.am Log: add prefix/recordings Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Feb 15 18:53:58 2008 @@ -193,7 +193,7 @@ install-data-local: @echo Installing $(NAME) - @for x in mod db log log/xml_cdr bin scripts grammar ; do \ + @for x in mod db log log/xml_cdr bin scripts grammar recordings ; do \ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done test -d $(DESTDIR)$(prefix)/conf || $(MAKE) samples-conf

1 0

[commit] r7643 - in freeswitch/trunk/src/mod: applications/mod_conference applications/mod_dptools applications/mod_expr applications/mod_voicemail asr_tts/mod_openmrcp endpoints/mod_wanpipe event_handlers/mod_radius_cdr
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 18:23:59 2008 New Revision: 7643 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: cleanup Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Feb 15 18:23:59 2008 @@ -555,11 +555,11 @@ } if (conference->count > 1) { - if(conference->moh_sound) { + if (conference->moh_sound) { /* stop MoH if any */ conference_stop_file(conference, FILE_STOP_ASYNC); } - if(conference->enter_sound) { + if (conference->enter_sound) { conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); } } Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Feb 15 18:23:59 2008 @@ -877,7 +877,7 @@ SWITCH_STANDARD_APP(system_session_function) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n",data); - if(!system(data)) { + if (!system(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n",data); } } Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Fri Feb 15 18:23:59 2008 @@ -82,43 +82,43 @@ /* Create function list */ err = exprFuncListCreate(&f); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Init function list with internal functions */ err = exprFuncListInit(f); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Add custom function */ //err = exprFuncListAdd(f, my_func, "myfunc", 1, 1, 1, 1); - //if(err != EXPR_ERROR_NOERROR) + //if (err != EXPR_ERROR_NOERROR) //goto error; /* Create constant list */ err = exprValListCreate(&c); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Init constant list with internal constants */ err = exprValListInit(c); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Create variable list */ err = exprValListCreate(&v); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Create expression object */ err = exprCreate(&e, f, v, c, breaker, NULL); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Parse expression */ err = exprParse(e, (char *)expr); - if(err != EXPR_ERROR_NOERROR) + if (err != EXPR_ERROR_NOERROR) goto error; /* Enable soft errors */ @@ -153,19 +153,19 @@ done: /* Do cleanup */ - if(e) { + if (e) { exprFree(e); } - if(f) { + if (f) { exprFuncListFree(f); } - if(v) { + if (v) { exprValListFree(v); } - if(c) { + if (c) { exprValListFree(c); } Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Feb 15 18:23:59 2008 @@ -1046,7 +1046,7 @@ switch_file_handle_t fh = { 0 }; cc_t cc = { 0 }; - if(switch_channel_ready(channel)) { + if (switch_channel_ready(channel)) { args.input_callback = cancel_on_dtmf; @@ -1160,13 +1160,13 @@ switch_channel_set_variable(channel, "voicemail_message_len", duration_str); switch_channel_set_variable(channel, "voicemail_email", cbt->email); - if(switch_strlen_zero(profile->email_headers)) { + if (switch_strlen_zero(profile->email_headers)) { from = switch_core_session_sprintf(session, "%s@%s", cbt->user, cbt->domain); } else { from = switch_channel_expand_variables(channel,profile->email_from); } - if(switch_strlen_zero(profile->email_headers)) { + if (switch_strlen_zero(profile->email_headers)) { headers = switch_core_session_sprintf(session, "From: FreeSWITCH mod_voicemail <%s@%s>\nSubject: Voicemail from %s %s\nX-Priority: %d", cbt->user, cbt->domain, cbt->cid_name, cbt->cid_number, priority); @@ -1617,7 +1617,7 @@ if (auth || !thepass || (thepass && mypass && !strcmp(thepass, mypass))) { if (!dir_path) { - if(switch_strlen_zero(profile->storage_dir)) { + if (switch_strlen_zero(profile->storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, @@ -1710,7 +1710,7 @@ return SWITCH_STATUS_FALSE; } - if(switch_strlen_zero(profile->storage_dir)) { + if (switch_strlen_zero(profile->storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, @@ -1819,14 +1819,14 @@ if (*buf != '\0') { if (!strcasecmp(buf, profile->main_menu_key)) { voicemail_check_main(session, profile_name, domain_name, id, 0); - } else if(!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) { + } else if (!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) { int argc; char *argv[4]; char *mycmd; if (!switch_strlen_zero(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if(argc >= 1 && argc <= 4) { + if (argc >= 1 && argc <= 4) { switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); /* the application still runs after we leave it so we need to make sure that we dont do anything evil */ send_mail=0; @@ -1877,7 +1877,7 @@ } } - if(!send_mail && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + if (!send_mail && switch_file_exists(file_path, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { char *usql; switch_event_t *event; char *mwi_id = NULL; Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Fri Feb 15 18:23:59 2008 @@ -114,12 +114,12 @@ openmrcp_session_t *openmrcp_session; apr_pool_t *session_pool; - if(!profile) { + if (!profile) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no profile specified\n"); return NULL; } - if(apr_pool_create(&session_pool, NULL) != APR_SUCCESS) { + if (apr_pool_create(&session_pool, NULL) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create session_pool\n"); return NULL; } @@ -150,7 +150,7 @@ static void openmrcp_session_destroy(openmrcp_session_t *openmrcp_session) { - if(openmrcp_session && openmrcp_session->pool) { + if (openmrcp_session && openmrcp_session->pool) { mrcp_client_context_session_destroy(openmrcp_session->profile->mrcp_context, openmrcp_session->client_session); apr_pool_destroy(openmrcp_session->pool); } @@ -166,7 +166,7 @@ { openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "on_session_terminate called\n"); - if(!openmrcp_session) { + if (!openmrcp_session) { return MRCP_STATUS_FAILURE; } @@ -183,7 +183,7 @@ { openmrcp_session_t *openmrcp_session = mrcp_client_context_session_object_get(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "on_channel_add called\n"); - if(!openmrcp_session) { + if (!openmrcp_session) { return MRCP_STATUS_FAILURE; } switch_mutex_lock(openmrcp_session->flag_mutex); @@ -245,7 +245,7 @@ mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, asr_session->client_session, asr_session->control_channel, RECOGNIZER_RECOGNIZE); - if(!mrcp_message) { + if (!mrcp_message) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create mrcp msg\n"); return MRCP_STATUS_FAILURE; } @@ -264,7 +264,7 @@ buf1[bytes2read] = '\0'; generic_header = mrcp_generic_header_prepare(mrcp_message); - if(!generic_header) { + if (!generic_header) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not prepare generic_header\n"); return MRCP_STATUS_FAILURE; } @@ -336,11 +336,11 @@ switch_mutex_lock(asr_session->flag_mutex); mrcp_client_context_channel_add(asr_session->profile->mrcp_context, asr_session->client_session, asr_channel, NULL); - if(switch_thread_cond_timedwait(asr_session->wait_object, asr_session->flag_mutex, 5000*1000) != APR_SUCCESS) { + if (switch_thread_cond_timedwait(asr_session->wait_object, asr_session->flag_mutex, 5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); } switch_mutex_unlock(asr_session->flag_mutex); - if(!asr_session->control_channel) { + if (!asr_session->control_channel) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No recognizer channel available\n"); return SWITCH_STATUS_FALSE; } @@ -404,7 +404,7 @@ len -= (unsigned int)media_frame.codec_frame.size; media_frame.codec_frame.buffer = (char*)media_frame.codec_frame.buffer + media_frame.codec_frame.size; } - if(len > 0) { + if (len > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame alligned data len [%d]\n", len); } return SWITCH_STATUS_SUCCESS; @@ -514,7 +514,7 @@ </result> */ - if(message->body) { + if (message->body) { char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. char *position = strstr(message->body, marker); if (!position) { @@ -577,12 +577,12 @@ text2speak = switch_core_sprintf(tts_session->pool, "%s%s%s", xml_head, text, xml_tail); mrcp_message = mrcp_client_context_message_get(context, tts_session->client_session, tts_session->control_channel, SYNTHESIZER_SPEAK); - if(!mrcp_message) { + if (!mrcp_message) { goto end; } generic_header = mrcp_generic_header_prepare(mrcp_message); - if(!generic_header) { + if (!generic_header) { goto end; } @@ -601,7 +601,7 @@ static mrcp_status_t synth_stop(mrcp_client_context_t *context, openmrcp_session_t *tts_session) { mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, tts_session->client_session, tts_session->control_channel, SYNTHESIZER_STOP); - if(!mrcp_message) { + if (!mrcp_message) { return MRCP_STATUS_FAILURE; } @@ -642,11 +642,11 @@ } switch_mutex_lock(tts_session->flag_mutex); mrcp_client_context_channel_add(tts_session->profile->mrcp_context, tts_session->client_session, tts_channel, NULL); - if(switch_thread_cond_timedwait(tts_session->wait_object, tts_session->flag_mutex, 5000*1000) != APR_SUCCESS) { + if (switch_thread_cond_timedwait(tts_session->wait_object, tts_session->flag_mutex, 5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); } switch_mutex_unlock(tts_session->flag_mutex); - if(!tts_session->control_channel) { + if (!tts_session->control_channel) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No synthesizer channel available\n"); return SWITCH_STATUS_FALSE; } @@ -673,7 +673,7 @@ openmrcp_session_t *tts_session = (openmrcp_session_t *) sh->private_info; mrcp_client_context_t *context = tts_session->profile->mrcp_context; - if(!tts_session->control_channel) { + if (!tts_session->control_channel) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "no synthesizer channel too feed tts\n"); return SWITCH_STATUS_FALSE; } @@ -719,13 +719,13 @@ } audio_source = mrcp_client_audio_source_get(tts_session->audio_channel); - if(!audio_source) { + if (!audio_source) { return SWITCH_STATUS_BREAK; } if (!switch_test_flag(tts_session, FLAG_FEED_STARTED)) { switch_set_flag(tts_session, FLAG_FEED_STARTED); // shouldn't this use set_flag_locked? -tl - if(audio_source->method_set->open) { + if (audio_source->method_set->open) { audio_source->method_set->open(audio_source); } } @@ -736,7 +736,7 @@ while(return_len < *datalen) { media_frame.codec_frame.buffer = (char*)data + return_len; audio_source->method_set->read_frame(audio_source, &media_frame); - if(media_frame.type != MEDIA_FRAME_TYPE_AUDIO) { + if (media_frame.type != MEDIA_FRAME_TYPE_AUDIO) { memset(media_frame.codec_frame.buffer, 0, media_frame.codec_frame.size); } return_len += media_frame.codec_frame.size; @@ -808,7 +808,7 @@ mrcp_profile->mrcp_client = NULL; mrcp_profile->mrcp_context = NULL; mrcp_profile->name = "noname"; - if(profile_name) { + if (profile_name) { mrcp_profile->name = switch_core_strdup(openmrcp_module.pool, profile_name); } @@ -838,7 +838,7 @@ /* add profile */ if (!switch_core_hash_find(openmrcp_module.profile_hash, mrcp_profile->name)) { - if(openmrcp_profile_run(mrcp_profile) == SWITCH_STATUS_SUCCESS) { + if (openmrcp_profile_run(mrcp_profile) == SWITCH_STATUS_SUCCESS) { switch_core_hash_insert(openmrcp_module.profile_hash, mrcp_profile->name, mrcp_profile); } } @@ -880,7 +880,7 @@ // create client context, which must be passed to client engine mrcp_context = mrcp_client_context_create(&openmrcp_module, mrcp_event_handler); - if(!mrcp_context) { + if (!mrcp_context) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mrcp_client_context creation failed\n"); return SWITCH_STATUS_GENERR; } @@ -889,7 +889,7 @@ // this basically starts a thread that pulls events from the event queue // and handles them mrcp_client = openmrcp_client_start(profile->mrcp_options, mrcp_context); - if(!mrcp_client) { + if (!mrcp_client) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_client_start FAILED\n"); mrcp_client_context_destroy(mrcp_context); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Feb 15 18:23:59 2008 @@ -809,7 +809,7 @@ teletone_dtmf_detect (&tech_pvt->dtmf_detect, tech_pvt->read_frame.data, tech_pvt->read_frame.samples); teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str)); - if(digit_str[0]) { + if (digit_str[0]) { char *p = digit_str; switch_dtmf_t dtmf = {0, globals.dtmf_on}; while(p && *p) { @@ -1141,7 +1141,7 @@ if (is_raw) { int chan, span; - if (sangoma_span_chan_fromif(bchan, &span, &chan)) { + if (sangoma_span_chan_fromif (bchan, &span, &chan)) { if (!(tech_pvt->wpsock = wp_open(span, chan))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd for s%dc%d! [%s]\n", span, chan, strerror(errno)); switch_core_session_destroy(new_session); @@ -1744,7 +1744,7 @@ res = poll(pfds, 1, timeout); if (res > 0) { - if(pfds[0].revents & POLLIN) { + if (pfds[0].revents & POLLIN) { res = 1; } else if ((pfds[0].revents & POLLERR)) { res = -1; @@ -2314,7 +2314,7 @@ continue; } - if (!sangoma_span_chan_fromif(c_dev, &span, &chan)) { + if (!sangoma_span_chan_fromif (c_dev, &span, &chan)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid device name '%s'\n", c_dev); continue; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Fri Feb 15 18:23:59 2008 @@ -166,7 +166,7 @@ /* Add VSAs */ - if(channel) { + if (channel) { /*switch_call_cause_t cause;*/ switch_caller_profile_t *profile; @@ -181,8 +181,8 @@ profile = switch_channel_get_caller_profile(channel); - if(profile) { - if(profile->username) { + if (profile) { + if (profile->username) { if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *)profile->username, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username); @@ -190,7 +190,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_id_number) { + if (profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); @@ -198,7 +198,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_id_name) { + if (profile->caller_id_name) { if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *)profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); @@ -206,7 +206,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->destination_number) { + if (profile->destination_number) { if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *)profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); @@ -214,7 +214,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->dialplan) { + if (profile->dialplan) { if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *)profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); @@ -222,7 +222,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->network_addr) { + if (profile->network_addr) { if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *)profile->network_addr, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr); @@ -230,7 +230,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->rdnis) { + if (profile->rdnis) { if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *)profile->rdnis, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); @@ -238,7 +238,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->context) { + if (profile->context) { if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *)profile->context, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context); @@ -246,7 +246,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->ani) { + if (profile->ani) { if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *)profile->ani, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani); @@ -254,7 +254,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->aniii) { + if (profile->aniii) { if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *)profile->aniii, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii); @@ -262,7 +262,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->source) { + if (profile->source) { if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *)profile->source, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source); @@ -270,7 +270,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_extension && profile->caller_extension->last_application->application_name) { + if (profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -284,7 +284,7 @@ } } - if(rc_acct(rad_config, client_port, send) == OK_RC) { + if (rc_acct(rad_config, client_port, send) == OK_RC) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] RADIUS Accounting OK\n"); retval = SWITCH_STATUS_SUCCESS; } else { @@ -347,7 +347,7 @@ /* Add VSAs */ - if(channel) { + if (channel) { switch_call_cause_t cause; switch_caller_profile_t *profile; @@ -360,7 +360,7 @@ profile = switch_channel_get_caller_profile(channel); - if(profile) { + if (profile) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Calculating billable time\n"); @@ -370,23 +370,23 @@ calltransferdate = profile->times->transferred; callenddate = profile->times->hungup; - if(switch_channel_test_flag(channel,CF_ANSWERED)) { - if(callstartdate && callanswerdate) { - if(callenddate) + if (switch_channel_test_flag(channel,CF_ANSWERED)) { + if (callstartdate && callanswerdate) { + if (callenddate) billusec = callenddate - callanswerdate; - else if(calltransferdate) + else if (calltransferdate) billusec = calltransferdate - callanswerdate; } } - else if(switch_channel_test_flag(channel,CF_TRANSFER)) { - if(callanswerdate && calltransferdate) + else if (switch_channel_test_flag(channel,CF_TRANSFER)) { + if (callanswerdate && calltransferdate) billusec = calltransferdate - callanswerdate; } billsec = (billusec / 1000000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Finished calculating billable time\n"); - if(profile->username) { + if (profile->username) { if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *)profile->username, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding User-Name: %s\n", profile->username); @@ -394,7 +394,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_id_number) { + if (profile->caller_id_number) { if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); @@ -402,7 +402,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_id_name) { + if (profile->caller_id_name) { if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *)profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); @@ -410,7 +410,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->destination_number) { + if (profile->destination_number) { if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *)profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); @@ -418,7 +418,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->dialplan) { + if (profile->dialplan) { if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *)profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); @@ -426,7 +426,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->network_addr) { + if (profile->network_addr) { if (rc_avpair_add(rad_config, &send, PW_FRAMED_IP_ADDRESS, (void *)profile->network_addr, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Framed-IP-Address: %s\n", profile->network_addr); @@ -434,7 +434,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->rdnis) { + if (profile->rdnis) { if (rc_avpair_add(rad_config, &send, PW_FS_RDNIS, (void *)profile->rdnis, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-RDNIS: %s\n", profile->rdnis); @@ -442,7 +442,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->context) { + if (profile->context) { if (rc_avpair_add(rad_config, &send, PW_FS_CONTEXT, (void *)profile->context, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Context: %s\n", profile->context); @@ -450,7 +450,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->ani) { + if (profile->ani) { if (rc_avpair_add(rad_config, &send, PW_FS_ANI, (void *)profile->ani, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANI: %s\n", profile->ani); @@ -458,7 +458,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->aniii) { + if (profile->aniii) { if (rc_avpair_add(rad_config, &send, PW_FS_ANIII, (void *)profile->aniii, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-ANIII: %s\n", profile->aniii); @@ -466,7 +466,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->source) { + if (profile->source) { if (rc_avpair_add(rad_config, &send, PW_FS_SOURCE, (void *)profile->source, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Source: %s\n", profile->source); @@ -474,7 +474,7 @@ return SWITCH_STATUS_TERM; } } - if(profile->caller_extension && profile->caller_extension->last_application->application_name) { + if (profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -500,7 +500,7 @@ } } - if(rc_acct(rad_config, client_port, send) == OK_RC) { + if (rc_acct(rad_config, client_port, send) == OK_RC) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RADIUS Accounting OK\n"); retval = SWITCH_STATUS_SUCCESS; } else { @@ -558,7 +558,7 @@ switch_xml_free(xml); - if(num_servers < 1) { + if (num_servers < 1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "you must specify at least 1 radius server\n"); return SWITCH_STATUS_TERM;

1 0