June 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r8839 - in freeswitch/trunk: libs/voipcodecs src/mod/endpoints/mod_portaudio
by Freeswitch SVN 25 Jun '08

25 Jun '08

Author: anthm Date: Wed Jun 25 09:45:59 2008 New Revision: 8839 Modified: freeswitch/trunk/libs/voipcodecs/INSTALL freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: add 'pa rescan' to portaudio to look for new devices Modified: freeswitch/trunk/libs/voipcodecs/INSTALL ============================================================================== --- freeswitch/trunk/libs/voipcodecs/INSTALL (original) +++ freeswitch/trunk/libs/voipcodecs/INSTALL Wed Jun 25 09:45:59 2008 @@ -1,27 +1,43 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.ac' is used to create `configure' by a program -called `autoconf'. You only need `configure.ac' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -54,20 +70,22 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -75,28 +93,28 @@ the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -107,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -122,48 +140,86 @@ Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== - `configure' recognizes the following options to control how it -operates. +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' @@ -175,8 +231,6 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -`configure' also accepts some other, not widely useful, options. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jun 25 09:45:59 2008 @@ -317,10 +317,10 @@ static void deactivate_ring_device(void) { switch_mutex_lock(globals.device_lock); - if (globals.ring_stream) { + if (globals.ringdev != globals.outdev && globals.ring_stream) { CloseAudioStream(globals.ring_stream); - globals.ring_stream = NULL; } + globals.ring_stream = NULL; switch_mutex_unlock(globals.device_lock); } @@ -712,6 +712,8 @@ return SWITCH_STATUS_TERM; } + memset(&globals, 0, sizeof(globals)); + if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; } @@ -776,7 +778,6 @@ return SWITCH_STATUS_TERM; } - memset(&globals, 0, sizeof(globals)); globals.indev = globals.outdev = globals.ringdev = -1; if ((settings = switch_xml_child(cfg, "settings"))) { @@ -1021,6 +1022,14 @@ return 0; } + if (verbose < 0) { + Pa_Terminate(); + Pa_Initialize(); + load_config(); + verbose = 0; + } + + numDevices = Pa_GetDeviceCount(); if (numDevices < 0) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices); @@ -1207,25 +1216,29 @@ PaError err; if (!globals.ring_stream) { - if (!sample_rate) { - sample_rate = globals.sample_rate; - } + if (globals.ringdev == globals.outdev) { + globals.ring_stream = globals.audio_stream; + } else { + if (!sample_rate) { + sample_rate = globals.sample_rate; + } - switch_mutex_lock(globals.device_lock); - /* LOCKED ************************************************************************************************** */ - outputParameters.device = globals.ringdev; - outputParameters.channelCount = channels; - outputParameters.sampleFormat = SAMPLE_TYPE; - outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; - outputParameters.hostApiSpecificStreamInfo = NULL; - err = OpenAudioStream(&globals.ring_stream, NULL, &outputParameters, sample_rate, paClipOff, globals.read_codec.implementation->samples_per_frame); + switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + outputParameters.device = globals.ringdev; + outputParameters.channelCount = channels; + outputParameters.sampleFormat = SAMPLE_TYPE; + outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; + outputParameters.hostApiSpecificStreamInfo = NULL; + err = OpenAudioStream(&globals.ring_stream, NULL, &outputParameters, sample_rate, paClipOff, globals.read_codec.implementation->samples_per_frame); - /* UNLOCKED ************************************************************************************************* */ - switch_mutex_unlock(globals.device_lock); + /* UNLOCKED ************************************************************************************************* */ + switch_mutex_unlock(globals.device_lock); - if (err != paNoError) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open ring device!\n"); - return SWITCH_STATUS_FALSE; + if (err != paNoError) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open ring device!\n"); + return SWITCH_STATUS_FALSE; + } } } @@ -1572,6 +1585,7 @@ "--------------------------------------------------------------------------------\n" "pa help\n" "pa dump\n" + "pa rescan\n" "pa call <dest> [<dialplan> <cid_name> <cid_num> <rate>]\n" "pa answer [<call_id>]\n" "pa hangup [<call_id>]\n" @@ -1650,6 +1664,10 @@ goto done; } else if (!strcasecmp(argv[0], "devlist")) { func = devlist; + } else if (!strcasecmp(argv[0], "rescan")) { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "Looking for new devices.\n"); + dump_info(-1); + goto done; } else if (!strcasecmp(argv[0], "dump")) { dump_info(1); goto done;

1 0

[commit] r8838 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 24 Jun '08

24 Jun '08

Author: anthm Date: Tue Jun 24 18:43:58 2008 New Revision: 8838 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: add timeout to iax read Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Jun 24 18:43:58 2008 @@ -574,6 +574,7 @@ { private_t *tech_pvt = switch_core_session_get_private(session); switch_byte_t *data; + int ms_count = 0; switch_assert(tech_pvt != NULL); tech_pvt->read_frame.flags = SFF_NONE; @@ -615,6 +616,9 @@ } switch_yield(1000); + if (++ms_count >= 30000) { + break; + } } return SWITCH_STATUS_FALSE;

1 0