- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13097 - in freeswitch/trunk: build libs/win32
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Mon Apr 20 23:34:41 2009 New Revision: 13097 Log: use sound_version.txt and moh_version.txt to determine sound file version on windows (FSBUILD-152) Modified: freeswitch/trunk/build/moh_version.txt freeswitch/trunk/build/sounds_version.txt freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Modified: freeswitch/trunk/build/moh_version.txt ============================================================================== --- freeswitch/trunk/build/moh_version.txt (original) +++ freeswitch/trunk/build/moh_version.txt Mon Apr 20 23:34:41 2009 @@ -1 +1 @@ -1.0.8 +1.0.8 \ No newline at end of file Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Mon Apr 20 23:34:41 2009 @@ -1 +1 @@ -1.0.8 +1.0.8 \ No newline at end of file Modified: freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\32000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VER… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-%SOUND_VERSION%.t… "$(ProjectDir)..\sounds"

" Outputs="$(ProjectDir)..\sounds\music\16000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERS… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\sounds_version.txt
if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERS… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Mon Apr 20 23:34:41 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.ta… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\music\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="set /P SOUND_VERSION=<$(ProjectDir)..\..\build\moh_version.txt
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-%SOUND_VERSION%.ta… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\music\8000" /> </FileConfiguration>

1 0

[commit] r13096 - in freeswitch/trunk: . libs/win32 libs/win32/Sound_Files
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Mon Apr 20 22:21:15 2009 New Revision: 13096 Log: de-couple version numbers and builds of sound files and moh files (FSBUILD-153) Added: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Mon Apr 20 22:21:15 2009 @@ -610,6 +610,27 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2008.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Dowload 32khz music.2008.vcproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2008.vcproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khz music", "libs\win32\Download 16khz music.2008.vcproj", "{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz music", "libs\win32\Sound_Files\8khzmusic.2008.vcproj", "{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + ProjectSection(ProjectDependencies) = postProject + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {4F5C9D55-98EF-4256-8311-32D7BD360406} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz music", "libs\win32\Sound_Files\16khzmusic.2008.vcproj", "{BA599D0A-4310-4505-91DA-6A6447B3E289}" + ProjectSection(ProjectDependencies) = postProject + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {E10571C4-E7F4-4608-B5F2-B22E7EB95400} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz music", "libs\win32\Sound_Files\32khzmusic.2008.vcproj", "{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + ProjectSection(ProjectDependencies) = postProject + {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -698,7 +719,6 @@ {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|x64 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.Build.0 = Release|x64 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32 - {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.Build.0 = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1584,6 +1604,7 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32 + {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1593,7 +1614,6 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1602,6 +1622,7 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32 + {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1611,21 +1632,18 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32 - {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.Build.0 = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32 - {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.Build.0 = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|Win32 @@ -2001,6 +2019,54 @@ {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.Build.0 = All|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Mon Apr 20 22:21:15 2009 @@ -997,6 +997,27 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khz music", "libs\win32\Dowload 32khz music.2008.vcproj", "{1F0A8A77-E661-418F-BB92-82172AE43803}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 8khz music", "libs\win32\Download 8khz music.2008.vcproj", "{4F5C9D55-98EF-4256-8311-32D7BD360406}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 16khz music", "libs\win32\Download 16khz music.2008.vcproj", "{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8khz music", "libs\win32\Sound_Files\8khzmusic.2008.vcproj", "{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + ProjectSection(ProjectDependencies) = postProject + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {4F5C9D55-98EF-4256-8311-32D7BD360406} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "16khz music", "libs\win32\Sound_Files\16khzmusic.2008.vcproj", "{BA599D0A-4310-4505-91DA-6A6447B3E289}" + ProjectSection(ProjectDependencies) = postProject + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {E10571C4-E7F4-4608-B5F2-B22E7EB95400} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz music", "libs\win32\Sound_Files\32khzmusic.2008.vcproj", "{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + ProjectSection(ProjectDependencies) = postProject + {1F0A8A77-E661-418F-BB92-82172AE43803} = {1F0A8A77-E661-418F-BB92-82172AE43803} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -1085,7 +1106,6 @@ {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|x64 {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.Build.0 = Release|x64 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.ActiveCfg = Release|Win32 - {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|Win32.Build.0 = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.All|x64.ActiveCfg = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1970,6 +1990,7 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|Win32.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.ActiveCfg = Release|Win32 + {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.All|x64.Build.0 = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.ActiveCfg = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|Win32.Build.0 = Debug|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1979,7 +2000,6 @@ {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.ActiveCfg = Release|Win32 {3CE1DC99-8246-4DB1-A709-74F19F08EC67}.Release|x64.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.ActiveCfg = Release|Win32 - {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|Win32.Build.0 = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.All|x64.ActiveCfg = Release|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|Win32.ActiveCfg = Debug|Win32 {87A1FE3D-F410-4C8E-9591-8C625985BC70}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1988,6 +2008,7 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|Win32.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.ActiveCfg = Release|Win32 + {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.All|x64.Build.0 = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.ActiveCfg = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|Win32.Build.0 = Debug|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1997,21 +2018,18 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.ActiveCfg = Release|Win32 {7A8D8174-B355-4114-AFC1-04777CB9DE0A}.Release|x64.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.ActiveCfg = Release|Win32 - {7EB71250-F002-4ED8-92CA-CA218114537A}.All|Win32.Build.0 = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.All|x64.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|Win32.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Debug|x64.ActiveCfg = Debug|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|Win32.ActiveCfg = Release|Win32 {7EB71250-F002-4ED8-92CA-CA218114537A}.Release|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.ActiveCfg = Release|Win32 - {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|Win32.Build.0 = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.All|x64.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|Win32.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Debug|x64.ActiveCfg = Debug|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|Win32.ActiveCfg = Release|Win32 {6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F}.Release|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.ActiveCfg = Release|Win32 - {464AAB78-5489-4916-BE51-BF8D61822311}.All|Win32.Build.0 = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.All|x64.ActiveCfg = Release|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|Win32.ActiveCfg = Debug|Win32 {464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|Win32 @@ -2408,6 +2426,54 @@ {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32 {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32 {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.All|x64.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Debug|x64.ActiveCfg = Debug|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|Win32.ActiveCfg = Release|Win32 + {1F0A8A77-E661-418F-BB92-82172AE43803}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.All|x64.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|Win32.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.ActiveCfg = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Debug|x64.Build.0 = Debug|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|Win32.Build.0 = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.ActiveCfg = Release|Win32 + {4F5C9D55-98EF-4256-8311-32D7BD360406}.Release|x64.Build.0 = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.All|x64.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|Win32.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Debug|x64.ActiveCfg = Debug|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|Win32.ActiveCfg = Release|Win32 + {E10571C4-E7F4-4608-B5F2-B22E7EB95400}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.All|x64.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|Win32.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.ActiveCfg = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Debug|x64.Build.0 = Debug|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|Win32.Build.0 = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.ActiveCfg = Release|Win32 + {D1ABE208-6442-4FB4-9AAD-1677E41BC870}.Release|x64.Build.0 = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.All|x64.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Debug|x64.ActiveCfg = Debug|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|Win32.ActiveCfg = Release|Win32 + {BA599D0A-4310-4505-91DA-6A6447B3E289}.Release|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.All|x64.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|Win32.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Debug|x64.ActiveCfg = Debug|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|Win32.ActiveCfg = Release|Win32 + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2531,6 +2597,9 @@ {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E796E337-DE78-4303-8614-9A590862EE95} = {C120A020-773F-4EA3-923F-B67AF28B750D} {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {1F0A8A77-E661-418F-BB92-82172AE43803} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {4F5C9D55-98EF-4256-8311-32D7BD360406} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {E10571C4-E7F4-4608-B5F2-B22E7EB95400} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} @@ -2587,5 +2656,8 @@ {7A8D8174-B355-4114-AFC1-04777CB9DE0A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {7EB71250-F002-4ED8-92CA-CA218114537A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {464AAB78-5489-4916-BE51-BF8D61822311} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {D1ABE208-6442-4FB4-9AAD-1677E41BC870} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {BA599D0A-4310-4505-91DA-6A6447B3E289} = {4F227C26-768F-46A3-8684-1D08A46FB374} + {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} = {4F227C26-768F-46A3-8684-1D08A46FB374} EndGlobalSection EndGlobal Modified: freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 32khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Dowload 32khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 32khz music" + ProjectGUID="{1F0A8A77-E661-418F-BB92-82172AE43803}" + RootNamespace="Download 32khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\32khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 32khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\32000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 32khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\32000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-32000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\32000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 16khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.7.tar.… "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-1.0.8.tar.… "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download 16khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 16khz music" + ProjectGUID="{E10571C4-E7F4-4608-B5F2-B22E7EB95400}" + RootNamespace="Download 16khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\16khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 16khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\16000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 16khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\16000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\16000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -75,7 +75,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading 8khzsound." - CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.7.tar.gz "$(ProjectDir)..\sounds"
" + CommandLine="if not exist "$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000" /> </FileConfiguration> Added: freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Download 8khz music.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Download 8khz music" + ProjectGUID="{4F5C9D55-98EF-4256-8311-32D7BD360406}" + RootNamespace="Download 8khz music" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\8khzsound\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 8khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\8000" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading 8khzsound." + CommandLine="if not exist "$(ProjectDir)..\sounds\music\8000" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/freeswitch-sounds-music-8000-1.0.8.tar.gz "$(ProjectDir)..\sounds"
" + Outputs="$(ProjectDir)..\sounds\music\8000" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/16khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\16000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\16000" xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\16000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\16000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\16000\*.*" "$(OutDir)\sounds\en\us\callie\conference\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\16000\*.*" "$(OutDir)\sounds\en\us\callie\time\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\16000\*.*" "$(OutDir)\sounds\en\us\callie\digits\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\16000\*.*" "$(OutDir)\sounds\en\us\callie\misc\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\16000\*.*" "$(OutDir)\sounds\en\us\callie\currency\16000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\16000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\16000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/16khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="16khz music" + ProjectGUID="{BA599D0A-4310-4505-91DA-6A6447B3E289}" + RootNamespace="My16khzmusic" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\16000\*.*" "$(OutDir)\sounds\music\16000" /C /D /Y /S /I
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/32khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\32000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\32000" xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\32000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\32000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\32000\*.*" "$(OutDir)\sounds\en\us\callie\conference\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\32000\*.*" "$(OutDir)\sounds\en\us\callie\time\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\32000\*.*" "$(OutDir)\sounds\en\us\callie\digits\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\32000\*.*" "$(OutDir)\sounds\en\us\callie\misc\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\32000\*.*" "$(OutDir)\sounds\en\us\callie\currency\32000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\32000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\32000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/32khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="32khz music" + ProjectGUID="{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959}" + RootNamespace="My32khz music" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\32000\*.*" "$(OutDir)\sounds\music\32000" /C /D /Y /S /I" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Sound_Files/8khz.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -33,7 +33,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
" /> </Configuration> <Configuration @@ -55,7 +55,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(OutDir)\sounds\en\us\callie\voicemail\8000" xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
if not exist "$(OutDir)\sounds\music\8000" xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + CommandLine="xcopy "$(SolutionDir)libs\sounds\en\us\callie\voicemail\8000\*.*" "$(OutDir)\sounds\en\us\callie\voicemail\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ivr\8000\*.*" "$(OutDir)\sounds\en\us\callie\ivr\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\conference\8000\*.*" "$(OutDir)\sounds\en\us\callie\conference\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\time\8000\*.*" "$(OutDir)\sounds\en\us\callie\time\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\digits\8000\*.*" "$(OutDir)\sounds\en\us\callie\digits\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\ascii\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\misc\8000\*.*" "$(OutDir)\sounds\en\us\callie\misc\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\currency\8000\*.*" "$(OutDir)\sounds\en\us\callie\currency\8000" /C /D /Y /S /I
xcopy "$(SolutionDir)libs\sounds\en\us\callie\phonetic-ascii\8000\*.*" "$(OutDir)\sounds\en\us\callie\phonetic-ascii\8000" /C /D /Y /S /I
" /> </Configuration> </Configurations> Added: freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/Sound_Files/8khzmusic.2008.vcproj Mon Apr 20 22:21:15 2009 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="8khz music" + ProjectGUID="{D1ABE208-6442-4FB4-9AAD-1677E41BC870}" + RootNamespace="8khz music" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy "$(SolutionDir)libs\sounds\music\8000\*.*" "$(OutDir)\sounds\music\8000" /C /D /Y /S /I
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r13095 - freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: nmartin Date: Mon Apr 20 21:23:25 2009 New Revision: 13095 Log: cleaned up license and give proper attribution Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README (original) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README Mon Apr 20 21:23:25 2009 @@ -11,9 +11,9 @@ ======================= -If the prior author's claimed copyright is infringed by the one I claim we'll -work it out, BUT I prefer a much looser license: -============================================================== +================================================================================ +Copyright (c) 2008 Feith Systems and Software, Inc. +and Copyright (c) 2009 Nik Martin Permission is hereby granted, free of charge, to any person @@ -41,7 +41,7 @@ OTHER DEALINGS IN THE SOFTWARE. -============================================================== +================================================================================ dial_by_name_directory.xml is a phrase macro for the beginning of the directory app. dial_by_name_directory.js is the directory app itself. Modified: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js (original) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js Mon Apr 20 21:23:25 2009 @@ -8,10 +8,9 @@ ======================= -If the prior author's claimed copyright is infringed by the one I claim we'll -work it out, BUT I prefer a much looser MIT license: -============================================================== - +================================================================================ +Copyright (c) 2008 Feith Systems and Software, Inc. +and Copyright (c) 2009 Nik Martin Permission is hereby granted, free of charge, to any person @@ -39,7 +38,7 @@ OTHER DEALINGS IN THE SOFTWARE. -============================================================== +================================================================================ */ var digitTimeOut = 3000;

1 0

[commit] r13094 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Mon Apr 20 21:21:34 2009 New Revision: 13094 Log: don't do wrapup when agent is in nowait mode or call has ended Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Apr 20 21:21:34 2009 @@ -995,7 +995,6 @@ switch_frame_t *read_frame; switch_status_t status; char *uuid; - int done = 0; switch_core_session_t *other_session; switch_input_args_t args = { 0 }; const char *pop_order = NULL; @@ -1310,9 +1309,10 @@ switch_mutex_unlock(node->mutex); send_presence(node); switch_core_session_rwunlock(other_session); + switch_safe_free(uuid); - if (!do_wait) { - done = 1; + if (!do_wait || !switch_channel_ready(channel)) { + break; } fifo_consumer_wrapup_sound = switch_channel_get_variable(channel, "fifo_consumer_wrapup_sound"); @@ -1377,13 +1377,7 @@ } switch_channel_set_variable(channel, "fifo_status", "WAITING"); } - - switch_safe_free(uuid); - - if (done) { - break; - } - + if (do_wait && switch_channel_ready(channel)) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); @@ -1393,7 +1387,7 @@ } } } - + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]);

1 0

[commit] r13093 - in freeswitch/trunk: . build
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: brian Date: Mon Apr 20 20:11:12 2009 New Revision: 13093 Log: use different version file for moh version Added: freeswitch/trunk/build/moh_version.txt - copied unchanged from r13091, /freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Apr 20 20:11:12 2009 @@ -17,9 +17,11 @@ target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \ sound_perfix=`echo $@ | sed -e 's|-.*||'`; \ sounds_version=`cat build/sounds_version.txt`;\ + moh_version=`cat build/moh_version.txt`;\ full_sound_dir=`echo $@ | sed -e 's|^sounds||' | sed -e 's|^-||' | sed -e 's|-install$$||'`; \ test ! -z $$full_sound_dir || full_sound_dir=`echo $(DEFAULT_SOUNDS)`; \ - soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \ + soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$moh_version.tar.gz`; \ + echo $$full_sound_dir | grep music >/dev/null || soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \ if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \ if test "$$target_prefix" = "sounds"; then \ if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \

1 0

[commit] r13092 - in freeswitch/trunk/src/mod: applications/mod_dptools applications/mod_vmd applications/mod_voicemail endpoints/mod_alsa endpoints/mod_sofia event_handlers/mod_event_socket
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mrene Date: Mon Apr 20 20:02:45 2009 New Revision: 13092 Log: Fix them all while we're at it Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 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 Mon Apr 20 20:02:45 2009 @@ -989,7 +989,7 @@ if (!strcasecmp(var,"Event-Name")) { switch_name_event(val, &event->event_id); switch_event_del_header(event, var); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, var, "%s", val); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, var, val); } else if (!strcasecmp(var,"Event-Subclass")) { size_t len = strlen(val) + 1; void *new = malloc(len); @@ -997,7 +997,7 @@ memcpy(new, val, len); event->subclass_name = new; } else { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, var, "%s", val); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, var, val); } } } Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c Mon Apr 20 20:02:45 2009 @@ -323,7 +323,7 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Beep-Status", "stop"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Beep-Time", "%d", (int) vmd_info->timestamp / POINTS); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(vmd_info->session)); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(vmd_info->session)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Frequency", "%6.4lf", vmd_info->beep_freq); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "vmd"); 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 Mon Apr 20 20:02:45 2009 @@ -1647,7 +1647,7 @@ if (total_new_messages || total_new_urgent_messages) { yn = "yes"; } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", yn); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "%s@%s", id, domain_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); switch_event_fire(&event); Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon Apr 20 20:02:45 2009 @@ -251,8 +251,8 @@ snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_info", "%s", buf); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call_id", "%s", tech_pvt->call_id); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_info", buf); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call_id", tech_pvt->call_id); switch_channel_event_set_data(channel, event); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 20 20:02:45 2009 @@ -235,14 +235,14 @@ /* dispatch freeswitch event */ if (switch_event_create(&s_event, SWITCH_EVENT_NOTIFY_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "event", "%s", sip->sip_event->o_type); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "pl_data", "%s", sip->sip_payload->pl_data); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "sip_content_type", "%s", sip->sip_content_type->c_type); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event", sip->sip_event->o_type); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "pl_data", sip->sip_payload->pl_data); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "sip_content_type", sip->sip_content_type->c_type); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", sofia_private->gateway->profile->sip_port); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia"); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_name", "%s", sofia_private->gateway->profile->name); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_uri", "%s", sofia_private->gateway->profile->url); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "gateway_name", "%s", sofia_private->gateway->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "module_name", "mod_sofia"); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile_name", sofia_private->gateway->profile->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile_uri", sofia_private->gateway->profile->url); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "gateway_name", sofia_private->gateway->name); switch_event_fire(&s_event); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dispatched freeswitch event for message-summary NOTIFY\n"); } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Apr 20 20:02:45 2009 @@ -97,8 +97,8 @@ static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway) { switch_event_t *s_event; if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_GATEWAY_STATE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Gateway", "%s", gateway->name); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "State", "%s", sofia_state_string(gateway->state)); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "Gateway", gateway->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "State", sofia_state_string(gateway->state)); switch_event_fire(&s_event); } } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Apr 20 20:02:45 2009 @@ -1043,7 +1043,7 @@ count++; if (count == 1) { switch_event_create(event, SWITCH_EVENT_COMMAND); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Command", "%s", mbuf); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Command", mbuf); } else if (cur) { char *var, *val; var = cur;

1 0

[commit] r13091 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: stkn Date: Mon Apr 20 19:54:50 2009 New Revision: 13091 Log: duh, much better (and faster) this way, thanks mrene and mikej... forgot we added this one to speed things up Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 20 19:54:50 2009 @@ -3995,37 +3995,37 @@ if (switch_event_create(&event, SWITCH_EVENT_RECV_INFO) == SWITCH_STATUS_SUCCESS) { if (sip->sip_content_type) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", "%s", sip->sip_content_type->c_type); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", sip->sip_content_type->c_type); } if (sip->sip_from && sip->sip_from->a_url) { if (sip->sip_from->a_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-User", "%s", sip->sip_from->a_url->url_user); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-User", sip->sip_from->a_url->url_user); } if (sip->sip_from->a_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", "%s", sip->sip_from->a_url->url_host); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", sip->sip_from->a_url->url_host); } } if (sip->sip_to && sip->sip_to->a_url) { if (sip->sip_to->a_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-User", "%s", sip->sip_to->a_url->url_user); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-User", sip->sip_to->a_url->url_user); } if (sip->sip_to->a_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", "%s", sip->sip_to->a_url->url_host); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", sip->sip_to->a_url->url_host); } } if (sip->sip_contact && sip->sip_contact->m_url) { if (sip->sip_contact->m_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", "%s", sip->sip_contact->m_url->url_user); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", sip->sip_contact->m_url->url_user); } if (sip->sip_contact->m_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", "%s", sip->sip_contact->m_url->url_host); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", sip->sip_contact->m_url->url_host); } }

1 0

[commit] r13090 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: stkn Date: Mon Apr 20 19:44:33 2009 New Revision: 13090 Log: snprintf needs a format string too, and write has the warn_unused_result attribute set, so store the return value somewhere Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Mon Apr 20 19:44:33 2009 @@ -58,7 +58,7 @@ char msgbuf[2048]; char *s; int index = 0; - /*int n;*/ + int ret; index = 5; /* max sizes: */ ei_encode_version(msgbuf,&index); /* 1 */ @@ -74,7 +74,7 @@ /* sum: 542 */ switch_mutex_lock(listener->sock_mutex); - write(listener->sockfd, msgbuf, index); + ret = write(listener->sockfd, msgbuf, index); switch_mutex_unlock(listener->sock_mutex); } @@ -190,7 +190,7 @@ void ei_init_ref(ei_cnode *ec, erlang_ref *ref) { memset(ref, 0, sizeof(*ref)); /* zero out the struct */ - snprintf(ref->node, MAXATOMLEN, ec->thisnodename); + snprintf(ref->node, MAXATOMLEN, "%s", ec->thisnodename); switch_mutex_lock(globals.ref_mutex); globals.reference0++;

1 0

[commit] r13089 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Apr '09

20 Apr '09

Author: stkn Date: Mon Apr 20 18:53:24 2009 New Revision: 13089 Log: switch_add_event_header needs a format specifier, or >=gcc-4.3 will be very unhappy... Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 20 18:53:24 2009 @@ -4000,32 +4000,32 @@ if (sip->sip_from && sip->sip_from->a_url) { if (sip->sip_from->a_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-User", sip->sip_from->a_url->url_user); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-User", "%s", sip->sip_from->a_url->url_user); } if (sip->sip_from->a_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", sip->sip_from->a_url->url_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-From-Host", "%s", sip->sip_from->a_url->url_host); } } if (sip->sip_to && sip->sip_to->a_url) { if (sip->sip_to->a_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-User", sip->sip_to->a_url->url_user); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-User", "%s", sip->sip_to->a_url->url_user); } if (sip->sip_to->a_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", sip->sip_to->a_url->url_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-To-Host", "%s", sip->sip_to->a_url->url_host); } } if (sip->sip_contact && sip->sip_contact->m_url) { if (sip->sip_contact->m_url->url_user) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", sip->sip_contact->m_url->url_user); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-User", "%s", sip->sip_contact->m_url->url_user); } if (sip->sip_contact->m_url->url_host) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", sip->sip_contact->m_url->url_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "SIP-Contact-Host", "%s", sip->sip_contact->m_url->url_host); } }

1 0

[commit] r13088 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Apr '09

20 Apr '09

Author: anthm Date: Mon Apr 20 14:00:39 2009 New Revision: 13088 Log: add sip info to event_socket gateway Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Apr 20 14:00:39 2009 @@ -2899,7 +2899,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name); return; } - nh = nua_handle(profile->nua, NULL, @@ -2909,7 +2908,10 @@ SIPTAG_CONTACT_STR(profile->url), TAG_END()); + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + nua_info(nh, + NUTAG_WITH_THIS(profile->nua), TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), TAG_END()); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 20 14:00:39 2009 @@ -3900,7 +3900,7 @@ } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); - goto fail; + goto end; } if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) { @@ -3916,7 +3916,7 @@ int tmp = atoi(sip->sip_payload->pl_data); dtmf.digit = switch_rfc2833_to_char(tmp); } else { - goto fail; + goto end; } if (dtmf.digit) { @@ -3944,11 +3944,8 @@ /* Send 200 OK response */ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - - goto end; - } else { - goto fail; } + goto end; } if ((clientcode_header = sofia_glue_get_unknown_header(sip, "x-clientcode"))) { @@ -3956,8 +3953,6 @@ switch_channel_set_variable(channel, "call_clientcode", clientcode_header); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Setting CMC to %s\n", clientcode_header); nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - } else { - goto fail; } goto end; } @@ -3991,15 +3986,8 @@ } } } - goto end; } } - goto end; - - fail: - - /* *shrug* just ok it */ - nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); end: @@ -4041,7 +4029,7 @@ } } - if (sip->sip_payload->pl_data) { + if (sip->sip_payload && sip->sip_payload->pl_data) { switch_event_add_body(event, "%s", sip->sip_payload->pl_data); } @@ -4049,6 +4037,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dispatched freeswitch event for INFO\n"); } + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + return; }

1 0