- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8849 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: mikej Date: Wed Jun 25 22:50:08 2008 New Revision: 8849 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj Log: tweak for new lib location in newer cepstral version Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj Wed Jun 25 22:50:08 2008 @@ -54,7 +54,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="swift.lib" - AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt";"C:\Program Files\Cepstral\sdk\lib\windows"" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> @@ -118,7 +118,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="swift.lib" - AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt";"C:\Program Files\Cepstral\sdk\lib\windows"" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj Wed Jun 25 22:50:08 2008 @@ -23,7 +23,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt";"C:\Program Files\Cepstral\sdk\lib\windows"" UsePrecompiledHeader="0" /> <Tool @@ -40,7 +40,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt";"C:\Program Files\Cepstral\sdk\lib\windows"" UsePrecompiledHeader="0" /> <Tool

1 0

[commit] r8848 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: mikej Date: Wed Jun 25 22:45:16 2008 New Revision: 8848 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: const tweak Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Jun 25 22:45:16 2008 @@ -333,14 +333,14 @@ assert(cepstral != NULL); if (!strcasecmp(param, "voice")) { - char *voice_name = val; + const char *voice_name = val; if (!strcasecmp(voice_name, "next")) { if ((cepstral->voice = swift_port_find_next_voice(cepstral->port))) { if (SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice))) { cepstral->done = cepstral->done_gen = 1; return; } - voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name"); + voice_name = swift_voice_get_attribute(cepstral->voice, "name"); } else { voice_name = NULL; } @@ -366,7 +366,7 @@ return; } - voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name"); + voice_name = swift_voice_get_attribute(cepstral->voice, "name"); } if (voice_name) {

1 0

[commit] r8847 - in freeswitch/trunk: . build
by Freeswitch SVN 26 Jun '08

26 Jun '08

Author: cypromis Date: Wed Jun 25 22:27:32 2008 New Revision: 8847 Modified: freeswitch/trunk/build/modmake.rules.in freeswitch/trunk/configure.in Log: tweak for gcc build on solaris Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Wed Jun 25 22:27:32 2008 @@ -112,9 +112,9 @@ @test -d .libs || mkdir .libs @error="";\ if test -f $(CSOURCEFILE); then \ - $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ else \ - $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ + $(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ fi; mod_clean: Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed Jun 25 22:27:32 2008 @@ -100,6 +100,9 @@ *darwin*) SOLINK="-dynamic -bundle -force-flat-namespace" ;; + *-solaris2*) + SOLINK="-shared -Xlinker" + ;; *) SOLINK="-shared -Xlinker -x" ;;

1 0

[commit] r8846 - freeswitch/trunk/src/mod/applications/mod_rss
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: mikej Date: Wed Jun 25 18:09:33 2008 New Revision: 8846 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: use the session interval Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Wed Jun 25 18:09:33 2008 @@ -170,7 +170,6 @@ switch_speech_handle_t sh; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; switch_core_thread_session_t thread_session; - uint32_t rate, interval = 20; switch_timer_t timer = { 0 }, *timerp = NULL; uint32_t last; char *mydata = NULL; @@ -186,6 +185,8 @@ switch_input_args_t args = { 0 }; const char *vcf = NULL; char *chanvars = switch_channel_build_param_string(channel, NULL, NULL); + switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + uint32_t rate, interval = read_codec->implementation->microseconds_per_frame / 1000; if ((vcf = switch_channel_get_variable(channel, "rss_alt_config"))) { cf = vcf;

1 0

[commit] r8845 - in freeswitch/trunk/conf: . autoload_configs
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: brian Date: Wed Jun 25 16:56:01 2008 New Revision: 8845 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml freeswitch/trunk/conf/vars.xml Log: move variables from switch.conf.xml to vars.xml where they belong. Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Wed Jun 25 16:56:01 2008 @@ -33,12 +33,6 @@   </settings> -  - <variables> - <variable name="uk-ring" value="%(400,200,400,450);%(400,2200,400,450)"/> - <variable name="us-ring" value="%(2000, 4000, 440.0, 480.0)"/> - <variable name="fr-ring" value="%(1500, 3500, 440.0, 0.0)"/> - <variable name="bong-ring" value="v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> - </variables> + </configuration> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Jun 25 16:56:01 2008 @@ -93,3 +93,8 @@ <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/> <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/> <X-PRE-PROCESS cmd="set" data="call_debug=false"/> + + <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/> + <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/> + <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/> + <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>

1 0

[commit] r8844 - freeswitch/trunk/src/mod/applications/mod_rss
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: mikej Date: Wed Jun 25 16:17:56 2008 New Revision: 8844 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: don't always play the first news feed (MODAPP-108) Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Wed Jun 25 16:17:56 2008 @@ -367,7 +367,7 @@ x = atoi(cmd) - 1; if (x > -1 && x < feed_index) { - filename = feed_list[i]; + filename = feed_list[x]; } else if (matches > 1) { } else {

1 0

[commit] r8843 - in freeswitch/trunk: libs/portaudio/build/msvc src/mod/endpoints/mod_portaudio
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: mikej Date: Wed Jun 25 16:14:02 2008 New Revision: 8843 Modified: freeswitch/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj freeswitch/trunk/libs/portaudio/build/msvc/portaudio.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Log: fix mod_portaudio windows build Modified: freeswitch/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj (original) +++ freeswitch/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj Wed Jun 25 16:14:02 2008 @@ -51,8 +51,8 @@ Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="0" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" - PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -129,8 +129,8 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" - PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -154,6 +154,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" LinkIncremental="1" SuppressStartupBanner="true" @@ -220,8 +221,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" - PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -391,8 +392,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" - PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -417,6 +418,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll" LinkIncremental="2" SuppressStartupBanner="true" @@ -485,8 +487,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" - PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -511,6 +513,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib" OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" LinkIncremental="2" SuppressStartupBanner="true" @@ -579,7 +582,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" @@ -2620,6 +2623,14 @@ </FileConfiguration> </File> <File + RelativePath="..\..\src\os\win\pa_win_waveformat.c" + > + </File> + <File + RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c" + > + </File> + <File RelativePath="..\..\src\os\win\pa_x86_plain_converters.c" > <FileConfiguration Modified: freeswitch/trunk/libs/portaudio/build/msvc/portaudio.vcproj ============================================================================== --- freeswitch/trunk/libs/portaudio/build/msvc/portaudio.vcproj (original) +++ freeswitch/trunk/libs/portaudio/build/msvc/portaudio.vcproj Wed Jun 25 16:14:02 2008 @@ -4,6 +4,8 @@ Version="8.00" Name="portaudio" ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}" + RootNamespace="portaudio" + TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -20,8 +22,7 @@ Name="Release|Win32" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -48,10 +49,10 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" + InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" - PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -74,23 +75,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="ksuser.lib" - OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll" - LinkIncremental="1" - SuppressStartupBanner="true" - ModuleDefinitionFile=".\portaudio.def" - ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb" - ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib" - TargetMachine="1" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -102,12 +92,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -176,6 +160,8 @@ SuppressStartupBanner="true" ModuleDefinitionFile=".\portaudio.def" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib" TargetMachine="17" /> @@ -200,14 +186,88 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS;PAWIN_USE_WDMKS_DEVICE_INFO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="Debug|Win32" + Name="Debug|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" @@ -232,6 +292,99 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug DirectSound|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug_x86/portaudio.tlb" HeaderFileName="" @@ -250,7 +403,7 @@ ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -272,6 +425,8 @@ ModuleDefinitionFile=".\portaudio.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib" TargetMachine="1" /> @@ -296,14 +451,11 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="Debug|x64" + Name="Debug DirectSound|x64" OutputDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" @@ -368,6 +520,8 @@ ModuleDefinitionFile=".\portaudio.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib" TargetMachine="17" /> @@ -392,76 +546,218 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + <Configuration + Name="Release DirectSound|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" > - <Filter - Name="common" - > - <File - RelativePath="..\..\src\common\pa_allocation.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\src\common\pa_converters.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release DirectSound|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <Filter + Name="common" + > + <File + RelativePath="..\..\src\common\pa_allocation.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -488,12 +784,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\common\pa_cpuload.c" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -502,7 +794,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -511,7 +803,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -520,7 +812,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -530,7 +822,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\common\pa_debugprint.c" + RelativePath="..\..\src\common\pa_converters.c" > <FileConfiguration Name="Release|Win32" @@ -568,12 +860,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\common\pa_dither.c" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -582,7 +870,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -591,7 +879,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -600,7 +888,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -610,7 +898,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\common\pa_front.c" + RelativePath="..\..\src\common\pa_cpuload.c" > <FileConfiguration Name="Release|Win32" @@ -648,12 +936,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\common\pa_process.c" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -662,7 +946,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -671,7 +955,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -680,7 +964,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -690,7 +974,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\common\pa_skeleton.c" + RelativePath="..\..\src\common\pa_debugprint.c" > <FileConfiguration Name="Release|Win32" @@ -728,12 +1012,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\common\pa_stream.c" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -742,7 +1022,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -751,7 +1031,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -760,7 +1040,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -770,7 +1050,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\common\pa_trace.c" + RelativePath="..\..\src\common\pa_dither.c" > <FileConfiguration Name="Release|Win32" @@ -808,29 +1088,483 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - </Filter> - <Filter - Name="hostapi" - > - <Filter - Name="ASIO" - > - <File - RelativePath="..\..\src\hostapi\asio\pa_asio.cpp" + <FileConfiguration + Name="Debug DirectSound|Win32" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_front.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_process.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_skeleton.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_stream.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_trace.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="hostapi" + > + <Filter + Name="ASIO" + > + <File + RelativePath="..\..\src\hostapi\asio\pa_asio.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" @@ -838,7 +1572,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -847,7 +1581,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -864,6 +1598,241 @@ > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -881,7 +1850,44 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -890,7 +1896,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -900,10 +1906,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp" + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp" > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -922,6 +1929,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -938,12 +1946,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -952,7 +1956,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -961,7 +1965,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -970,7 +1974,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -980,10 +1984,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp" + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp" > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1002,6 +2007,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1018,12 +2024,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -1032,7 +2034,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -1041,7 +2043,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -1050,7 +2052,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -1060,10 +2062,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp" + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp" > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1082,6 +2085,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1098,12 +2102,8 @@ PreprocessorDefinitions="" /> </FileConfiguration> - </File> - <File - RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp" - > <FileConfiguration - Name="Release|Win32" + Name="Debug DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -1112,7 +2112,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -1121,7 +2121,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release DirectSound|Win32" > <Tool Name="VCCLCompilerTool" @@ -1130,7 +2130,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release DirectSound|x64" > <Tool Name="VCCLCompilerTool" @@ -1149,6 +2149,7 @@ > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1167,6 +2168,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1183,12 +2185,49 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c" > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1207,6 +2246,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1223,6 +2263,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -1267,6 +2343,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -1277,6 +2389,7 @@ > <FileConfiguration Name="Release|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1295,6 +2408,7 @@ </FileConfiguration> <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1311,6 +2425,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> </Filter> @@ -1359,6 +2509,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\os\win\pa_win_util.c" @@ -1399,6 +2585,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\os\win\pa_win_waveformat.c" @@ -1447,6 +2669,42 @@ PreprocessorDefinitions="" /> </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> </Filter> Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj Wed Jun 25 16:14:02 2008 @@ -56,6 +56,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" + AdditionalDependencies="ksuser.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -121,6 +122,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" RandomizedBaseAddress="1" DataExecutionPrevention="0" Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Wed Jun 25 16:14:02 2008 @@ -31,6 +31,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" + AdditionalDependencies="ksuser.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration> @@ -49,6 +50,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="ksuser.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration>

1 0

[commit] r8842 - freeswitch/trunk/src
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: brian Date: Wed Jun 25 15:56:20 2008 New Revision: 8842 Modified: freeswitch/trunk/src/switch_core_session.c Log: declinatio mortuus obfirmo Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Jun 25 15:56:20 2008 @@ -730,8 +730,9 @@ const char *val; session->thread = thread; - + switch_core_session_run(session); + switch_core_media_bug_remove_all(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Locked, Waiting on external entities\n", session->id, switch_channel_get_name(session->channel)); switch_core_session_write_lock(session);

1 0

[commit] r8841 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: anthm Date: Wed Jun 25 15:08:01 2008 New Revision: 8841 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: wait for broadcast to start when starting async hold to avoid race Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Jun 25 15:08:01 2008 @@ -1917,6 +1917,7 @@ switch_ivr_hold_uuid(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), NULL, 0); } else { switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP); + switch_channel_wait_for_flag(tech_pvt->channel, CF_BROADCAST, SWITCH_TRUE, 5000); } } }

1 0

[commit] r8840 - freeswitch/trunk
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: cypromis Date: Wed Jun 25 11:09:54 2008 New Revision: 8840 Modified: freeswitch/trunk/freeswitch.spec Log: typo in spec file Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed Jun 25 11:09:54 2008 @@ -281,7 +281,7 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/directory -%dir %attr(0750, freeswitch. daemon) %{prefix}/conf/directory/default +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/directory/default %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/mrcp_profiles %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles

1 0