Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 143095 Details for
Bug 209494
media-sound/audacity-1.3.4-r1 fails at alsa recording/playback due to broken internal portaudio snapshot
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
portaudio-cvs-rev1.7.patch (for above ebuild)
portaudio-cvs-rev1.7.patch (text/plain), 40.57 KB, created by
Alexandre Rostovtsev (RETIRED)
on 2008-02-10 06:21:53 UTC
(
hide
)
Description:
portaudio-cvs-rev1.7.patch (for above ebuild)
Filename:
MIME Type:
Creator:
Alexandre Rostovtsev (RETIRED)
Created:
2008-02-10 06:21:53 UTC
Size:
40.57 KB
patch
obsolete
>diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/build/msvc/PAStaticWMMEv19.vcproj portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj >--- ../../../portaudio/build/msvc/PAStaticWMMEv19.vcproj 1970-01-01 01:00:00.000000000 +0100 >+++ portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj 2007-12-09 20:30:18.000000000 +0000 >@@ -0,0 +1,790 @@ >+<?xml version="1.0" encoding="Windows-1252"?> >+<VisualStudioProject >+ ProjectType="Visual C++" >+ Version="8.00" >+ Name="PAStaticWMMEv19" >+ ProjectGUID="{7ABA0F80-94AE-4E82-AB89-2E1258212D59}" >+ RootNamespace="PAStaticWMMEv19" >+ > >+ <Platforms> >+ <Platform >+ Name="Win32" >+ /> >+ </Platforms> >+ <ToolFiles> >+ </ToolFiles> >+ <Configurations> >+ <Configuration >+ Name="Release|Win32" >+ OutputDirectory="$(ConfigurationName)" >+ IntermediateDirectory="$(ConfigurationName)" >+ ConfigurationType="4" >+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" >+ UseOfMFC="0" >+ ATLMinimizesCRunTimeLibraryUsage="false" >+ CharacterSet="2" >+ > >+ <Tool >+ Name="VCPreBuildEventTool" >+ CommandLine="echo // Automatically generated file >".\$(ConfigurationName)\config.h"
IF "%DXSDK_DIR%" == "" echo #define PA_NO_DS >>".\$(ConfigurationName)\config.h"
IF "%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO >>".\$(ConfigurationName)\config.h"
" >+ /> >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ <Tool >+ Name="VCXMLDataGeneratorTool" >+ /> >+ <Tool >+ Name="VCWebServiceProxyGeneratorTool" >+ /> >+ <Tool >+ Name="VCMIDLTool" >+ /> >+ <Tool >+ Name="VCCLCompilerTool" >+ AdditionalOptions="/O2" >+ Optimization="2" >+ InlineFunctionExpansion="1" >+ AdditionalIncludeDirectories="../../include;../../src/common" >+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB" >+ StringPooling="true" >+ RuntimeLibrary="0" >+ EnableFunctionLevelLinking="true" >+ UsePrecompiledHeader="0" >+ PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch" >+ AssemblerListingLocation=".\$(ConfigurationName)/" >+ ObjectFile=".\$(ConfigurationName)/" >+ ProgramDataBaseFileName=".\$(ConfigurationName)/" >+ WarningLevel="3" >+ SuppressStartupBanner="true" >+ CompileAs="0" >+ DisableSpecificWarnings="4996" >+ ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h" >+ /> >+ <Tool >+ Name="VCManagedResourceCompilerTool" >+ /> >+ <Tool >+ Name="VCResourceCompilerTool" >+ PreprocessorDefinitions="NDEBUG" >+ Culture="1032" >+ /> >+ <Tool >+ Name="VCPreLinkEventTool" >+ /> >+ <Tool >+ Name="VCLibrarianTool" >+ OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19.lib" >+ SuppressStartupBanner="true" >+ /> >+ <Tool >+ Name="VCALinkTool" >+ /> >+ <Tool >+ Name="VCXDCMakeTool" >+ /> >+ <Tool >+ Name="VCBscMakeTool" >+ /> >+ <Tool >+ Name="VCFxCopTool" >+ /> >+ <Tool >+ Name="VCPostBuildEventTool" >+ CommandLine="set CFLAGS=/I "../../include" /I "../../src/common" /I "../../src/common" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo".\$(OutDir)/" /Fd".\$(OutDir)/"
set LIBS=

if "%DXSDK_DIR%"=="" goto NoDX

cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

set LIBS="%DXSDK_DIR%lib\x86\dxguid.lib"

:NoDX

if "%ASIOSDK_DIR%"=="" goto NoASIO

cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib /OUT:"$(TargetPath)" ".\$(OutDir)\*.obj" %LIBS%
" >+ /> >+ </Configuration> >+ <Configuration >+ Name="Debug|Win32" >+ OutputDirectory="$(ConfigurationName)" >+ IntermediateDirectory="$(ConfigurationName)" >+ ConfigurationType="4" >+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" >+ UseOfMFC="0" >+ ATLMinimizesCRunTimeLibraryUsage="false" >+ CharacterSet="2" >+ > >+ <Tool >+ Name="VCPreBuildEventTool" >+ CommandLine="echo // Automatically generated file >".\$(ConfigurationName)\config.h"
IF "%DXSDK_DIR%" == "" echo #define PA_NO_DS >>".\$(ConfigurationName)\config.h"
IF "%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO >>".\$(ConfigurationName)\config.h"
" >+ /> >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ <Tool >+ Name="VCXMLDataGeneratorTool" >+ /> >+ <Tool >+ Name="VCWebServiceProxyGeneratorTool" >+ /> >+ <Tool >+ Name="VCMIDLTool" >+ /> >+ <Tool >+ Name="VCCLCompilerTool" >+ Optimization="0" >+ AdditionalIncludeDirectories="../../include;../../src/common" >+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" >+ BasicRuntimeChecks="3" >+ RuntimeLibrary="1" >+ UsePrecompiledHeader="0" >+ PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch" >+ AssemblerListingLocation=".\$(ConfigurationName)/" >+ ObjectFile=".\$(ConfigurationName)/" >+ ProgramDataBaseFileName=".\$(ConfigurationName)/" >+ WarningLevel="3" >+ SuppressStartupBanner="true" >+ DebugInformationFormat="4" >+ CompileAs="0" >+ DisableSpecificWarnings="4996" >+ ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h" >+ /> >+ <Tool >+ Name="VCManagedResourceCompilerTool" >+ /> >+ <Tool >+ Name="VCResourceCompilerTool" >+ PreprocessorDefinitions="_DEBUG" >+ Culture="1032" >+ /> >+ <Tool >+ Name="VCPreLinkEventTool" >+ /> >+ <Tool >+ Name="VCLibrarianTool" >+ OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19d.lib" >+ SuppressStartupBanner="true" >+ /> >+ <Tool >+ Name="VCALinkTool" >+ /> >+ <Tool >+ Name="VCXDCMakeTool" >+ /> >+ <Tool >+ Name="VCBscMakeTool" >+ /> >+ <Tool >+ Name="VCFxCopTool" >+ /> >+ <Tool >+ Name="VCPostBuildEventTool" >+ CommandLine="set CFLAGS= /I "../../include" /I "../../src/common" /I "../../src/common" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "_MBCS" /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo".\$(OutDir)/" /Fd".\$(OutDir)/"
set LIBS=

if "%DXSDK_DIR%"=="" goto NoDX

cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

set LIBS="%DXSDK_DIR%lib\x86\dxguid.lib"

:NoDX

if "%ASIOSDK_DIR%"=="" goto NoASIO

cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib /OUT:"$(TargetPath)" ".\$(OutDir)\*.obj" %LIBS%
" >+ /> >+ </Configuration> >+ <Configuration >+ Name="Unicode_Debug|Win32" >+ OutputDirectory="$(ConfigurationName)" >+ IntermediateDirectory="$(ConfigurationName)" >+ ConfigurationType="4" >+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" >+ UseOfMFC="0" >+ ATLMinimizesCRunTimeLibraryUsage="false" >+ CharacterSet="0" >+ > >+ <Tool >+ Name="VCPreBuildEventTool" >+ CommandLine="echo // Automatically generated file >".\$(ConfigurationName)\config.h"
IF "%DXSDK_DIR%" == "" echo #define PA_NO_DS >>".\$(ConfigurationName)\config.h"
IF "%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO >>".\$(ConfigurationName)\config.h"
" >+ /> >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ <Tool >+ Name="VCXMLDataGeneratorTool" >+ /> >+ <Tool >+ Name="VCWebServiceProxyGeneratorTool" >+ /> >+ <Tool >+ Name="VCMIDLTool" >+ /> >+ <Tool >+ Name="VCCLCompilerTool" >+ Optimization="0" >+ AdditionalIncludeDirectories="../../include;../../src/common" >+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" >+ BasicRuntimeChecks="3" >+ RuntimeLibrary="1" >+ UsePrecompiledHeader="0" >+ PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch" >+ AssemblerListingLocation=".\$(ConfigurationName)/" >+ ObjectFile=".\$(ConfigurationName)/" >+ ProgramDataBaseFileName=".\$(ConfigurationName)/" >+ WarningLevel="3" >+ SuppressStartupBanner="true" >+ DebugInformationFormat="4" >+ CompileAs="0" >+ DisableSpecificWarnings="4996" >+ ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h" >+ /> >+ <Tool >+ Name="VCManagedResourceCompilerTool" >+ /> >+ <Tool >+ Name="VCResourceCompilerTool" >+ PreprocessorDefinitions="_DEBUG" >+ Culture="1032" >+ /> >+ <Tool >+ Name="VCPreLinkEventTool" >+ /> >+ <Tool >+ Name="VCLibrarianTool" >+ OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19ud.lib" >+ SuppressStartupBanner="true" >+ /> >+ <Tool >+ Name="VCALinkTool" >+ /> >+ <Tool >+ Name="VCXDCMakeTool" >+ /> >+ <Tool >+ Name="VCBscMakeTool" >+ /> >+ <Tool >+ Name="VCFxCopTool" >+ /> >+ <Tool >+ Name="VCPostBuildEventTool" >+ CommandLine="set CFLAGS= /I "../../include" /I "../../src/common" /I "../../src/common" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "_MBCS" /Od /FD /EHsc /RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo".\$(OutDir)/" /Fd".\$(OutDir)/"
set LIBS=

if "%DXSDK_DIR%"=="" goto NoDX

cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

set LIBS="%DXSDK_DIR%lib\x86\dxguid.lib"

:NoDX

if "%ASIOSDK_DIR%"=="" goto NoASIO

cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib /OUT:"$(TargetPath)" ".\$(OutDir)\*.obj" %LIBS%
" >+ /> >+ </Configuration> >+ <Configuration >+ Name="Unicode_Release|Win32" >+ OutputDirectory="$(ConfigurationName)" >+ IntermediateDirectory="$(ConfigurationName)" >+ ConfigurationType="4" >+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" >+ UseOfMFC="0" >+ ATLMinimizesCRunTimeLibraryUsage="false" >+ CharacterSet="0" >+ > >+ <Tool >+ Name="VCPreBuildEventTool" >+ CommandLine="echo // Automatically generated file >".\$(ConfigurationName)\config.h"
IF "%DXSDK_DIR%" == "" echo #define PA_NO_DS >>".\$(ConfigurationName)\config.h"
IF "%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO >>".\$(ConfigurationName)\config.h"
" >+ /> >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ <Tool >+ Name="VCXMLDataGeneratorTool" >+ /> >+ <Tool >+ Name="VCWebServiceProxyGeneratorTool" >+ /> >+ <Tool >+ Name="VCMIDLTool" >+ /> >+ <Tool >+ Name="VCCLCompilerTool" >+ AdditionalOptions="/O2" >+ Optimization="2" >+ InlineFunctionExpansion="1" >+ AdditionalIncludeDirectories="../../include;../../src/common" >+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB" >+ StringPooling="true" >+ RuntimeLibrary="0" >+ EnableFunctionLevelLinking="true" >+ UsePrecompiledHeader="0" >+ PrecompiledHeaderFile=".\$(ConfigurationName)/PA19StaticWMME.pch" >+ AssemblerListingLocation=".\$(ConfigurationName)/" >+ ObjectFile=".\$(ConfigurationName)/" >+ ProgramDataBaseFileName=".\$(ConfigurationName)/" >+ WarningLevel="3" >+ SuppressStartupBanner="true" >+ CompileAs="0" >+ DisableSpecificWarnings="4996" >+ ForcedIncludeFiles="$(ProjectDir)\$(ConfigurationName)\config.h" >+ /> >+ <Tool >+ Name="VCManagedResourceCompilerTool" >+ /> >+ <Tool >+ Name="VCResourceCompilerTool" >+ PreprocessorDefinitions="NDEBUG" >+ Culture="1032" >+ /> >+ <Tool >+ Name="VCPreLinkEventTool" >+ /> >+ <Tool >+ Name="VCLibrarianTool" >+ OutputFile="$(SolutionDir)\$(ConfigurationName)\pastaticwmmev19u.lib" >+ SuppressStartupBanner="true" >+ /> >+ <Tool >+ Name="VCALinkTool" >+ /> >+ <Tool >+ Name="VCXDCMakeTool" >+ /> >+ <Tool >+ Name="VCBscMakeTool" >+ /> >+ <Tool >+ Name="VCFxCopTool" >+ /> >+ <Tool >+ Name="VCPostBuildEventTool" >+ CommandLine="set CFLAGS=/I "../../include" /I "../../src/common" /I "../../src/common" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /O2 /Ob1 /GF /FD /EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo".\$(OutDir)/" /Fd".\$(OutDir)/"
set LIBS=

if "%DXSDK_DIR%"=="" goto NoDX

cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I "%DXSDK_DIR%include" "..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

set LIBS="%DXSDK_DIR%lib\x86\dxguid.lib"

:NoDX

if "%ASIOSDK_DIR%"=="" goto NoASIO

cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%ASIOSDK_DIR%/host/pc" "%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib /OUT:"$(TargetPath)" ".\$(OutDir)\*.obj" %LIBS%
" >+ /> >+ </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" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_allocation.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_converters.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_converters.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_cpuload.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_cpuload.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_dither.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_dither.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_endianness.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_front.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_hostapi.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_process.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_process.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_skeleton.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_stream.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_stream.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_trace.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_trace.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_types.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\common\pa_util.h" >+ > >+ </File> >+ </Filter> >+ <Filter >+ Name="hostapi" >+ > >+ <Filter >+ Name="wmme" >+ > >+ <File >+ RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c" >+ > >+ </File> >+ </Filter> >+ <Filter >+ Name="wdmks" >+ > >+ <File >+ RelativePath="..\..\src\hostapi\wdmks\pa_win_wdmks.c" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ </File> >+ </Filter> >+ <Filter >+ Name="dsound" >+ > >+ <File >+ RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ </File> >+ <File >+ RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ </File> >+ <File >+ RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.h" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ </File> >+ </Filter> >+ <Filter >+ Name="asio" >+ > >+ <File >+ RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.cpp" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ </File> >+ <File >+ RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.h" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ </File> >+ <File >+ RelativePath="..\..\src\hostapi\asio\pa_asio.cpp" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCLCompilerTool" >+ /> >+ </FileConfiguration> >+ </File> >+ </Filter> >+ </Filter> >+ <Filter >+ Name="os" >+ > >+ <File >+ RelativePath="..\..\src\os\win\pa_win_hostapis.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_win_util.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_win_waveformat.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\include\pa_win_waveformat.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_win_wdmks_utils.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_win_wdmks_utils.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_x86_plain_converters.c" >+ > >+ </File> >+ <File >+ RelativePath="..\..\src\os\win\pa_x86_plain_converters.h" >+ > >+ </File> >+ </Filter> >+ </Filter> >+ <Filter >+ Name="Public Headers" >+ Filter="h;hpp;hxx;hm;inl" >+ > >+ <File >+ RelativePath="..\..\include\pa_win_ds.h" >+ > >+ <FileConfiguration >+ Name="Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Debug|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ <FileConfiguration >+ Name="Unicode_Release|Win32" >+ ExcludedFromBuild="true" >+ > >+ <Tool >+ Name="VCCustomBuildTool" >+ /> >+ </FileConfiguration> >+ </File> >+ <File >+ RelativePath="..\..\include\pa_win_wmme.h" >+ > >+ </File> >+ <File >+ RelativePath="..\..\include\portaudio.h" >+ > >+ </File> >+ </Filter> >+ </Files> >+ <Globals> >+ </Globals> >+</VisualStudioProject> >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/include/pa_unix_oss.h portaudio-v19/include/pa_unix_oss.h >--- ../../../portaudio/include/pa_unix_oss.h 1970-01-01 01:00:00.000000000 +0100 >+++ portaudio-v19/include/pa_unix_oss.h 2007-12-09 20:30:18.000000000 +0000 >@@ -0,0 +1,104 @@ >+#ifndef PA_UNIX_OSS_H >+#define PA_UNIX_OSS_H >+ >+/* >+ * $Id: portaudio.patch,v 1.7 2008/01/09 05:16:19 llucius Exp $ >+ * PortAudio Portable Real-Time Audio Library >+ * OSS-specific extensions >+ * >+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk >+ * >+ * Permission is hereby granted, free of charge, to any person obtaining >+ * a copy of this software and associated documentation files >+ * (the "Software"), to deal in the Software without restriction, >+ * including without limitation the rights to use, copy, modify, merge, >+ * publish, distribute, sublicense, and/or sell copies of the Software, >+ * and to permit persons to whom the Software is furnished to do so, >+ * subject to the following conditions: >+ * >+ * The above copyright notice and this permission notice shall be >+ * included in all copies or substantial portions of the Software. >+ * >+ * Any person wishing to distribute modifications to the Software is >+ * requested to send the modifications to the original developer so that >+ * they can be incorporated into the canonical version. >+ * >+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. >+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR >+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF >+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION >+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >+ * >+ */ >+ >+/** @file >+ * OSS-specific PortAudio API extension header file. >+ */ >+ >+#ifdef __cplusplus >+extern "C" { >+#endif >+ >+const char *PaOSS_GetStreamInputDevice( PaStream *s ); >+ >+const char *PaOSS_GetStreamOutputDevice( PaStream *s ); >+ >+#ifdef __cplusplus >+} >+#endif >+ >+#endif >+#ifndef PA_UNIX_OSS_H >+#define PA_UNIX_OSS_H >+ >+/* >+ * $Id: portaudio.patch,v 1.7 2008/01/09 05:16:19 llucius Exp $ >+ * PortAudio Portable Real-Time Audio Library >+ * OSS-specific extensions >+ * >+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk >+ * >+ * Permission is hereby granted, free of charge, to any person obtaining >+ * a copy of this software and associated documentation files >+ * (the "Software"), to deal in the Software without restriction, >+ * including without limitation the rights to use, copy, modify, merge, >+ * publish, distribute, sublicense, and/or sell copies of the Software, >+ * and to permit persons to whom the Software is furnished to do so, >+ * subject to the following conditions: >+ * >+ * The above copyright notice and this permission notice shall be >+ * included in all copies or substantial portions of the Software. >+ * >+ * Any person wishing to distribute modifications to the Software is >+ * requested to send the modifications to the original developer so that >+ * they can be incorporated into the canonical version. >+ * >+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. >+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR >+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF >+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION >+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >+ * >+ */ >+ >+/** @file >+ * OSS-specific PortAudio API extension header file. >+ */ >+ >+#ifdef __cplusplus >+extern "C" { >+#endif >+ >+const char *PaOSS_GetStreamInputDevice( PaStream *s ); >+ >+const char *PaOSS_GetStreamOutputDevice( PaStream *s ); >+ >+#ifdef __cplusplus >+} >+#endif >+ >+#endif >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/include/pa_win_ds.h portaudio-v19/include/pa_win_ds.h >--- ../../../portaudio/include/pa_win_ds.h 2007-12-02 17:24:45.000000000 +0000 >+++ portaudio-v19/include/pa_win_ds.h 2007-12-09 20:34:02.000000000 +0000 >@@ -91,6 +91,21 @@ > > }PaWinDirectSoundStreamInfo; > >+/** Retrieve the GUID of the input device. >+ >+ @param stream The stream to query. >+ >+ @return A pointer to the GUID, or NULL if none. >+*/ >+LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ); >+ >+/** Retrieve the GUID of the output device. >+ >+ @param stream The stream to query. >+ >+ @return A pointer to the GUID, or NULL if none. >+*/ >+LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ); > > > #ifdef __cplusplus >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/include/portaudio.h portaudio-v19/include/portaudio.h >--- ../../../portaudio/include/portaudio.h 2007-12-02 17:24:45.000000000 +0000 >+++ portaudio-v19/include/portaudio.h 2007-12-09 20:30:23.000000000 +0000 >@@ -1105,6 +1105,15 @@ > signed long Pa_GetStreamWriteAvailable( PaStream* stream ); > > >+/** Retrieve the host type handling an open stream. >+ >+ @return Returns a non-negative value representing the host API type >+ handling an open stream or, a PaErrorCode (which are always negative) >+ if PortAudio is not initialized or an error is encountered. >+*/ >+PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream ); >+ >+ > /* Miscellaneous utilities */ > > >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/common/pa_front.c portaudio-v19/src/common/pa_front.c >--- ../../../portaudio/src/common/pa_front.c 2007-12-02 17:24:56.000000000 +0000 >+++ portaudio-v19/src/common/pa_front.c 2007-12-09 20:30:23.000000000 +0000 >@@ -1206,8 +1206,10 @@ > hostApiInputParametersPtr, hostApiOutputParametersPtr, > sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); > >- if( result == paNoError ) >+ if( result == paNoError ) { > AddOpenStream( *stream ); >+ PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type; >+ } > > > PA_LOGAPI(("Pa_OpenStream returned:\n" )); >@@ -1719,6 +1721,32 @@ > return result; > } > >+PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream ) >+{ >+ PaError error = PaUtil_ValidateStreamPointer( stream ); >+ PaHostApiTypeId result; >+ >+#ifdef PA_LOG_API_CALLS >+ PaUtil_DebugPrint("Pa_GetStreamHostApiType called:\n" ); >+ PaUtil_DebugPrint("\tPaStream* stream: 0x%p\n", stream ); >+#endif >+ >+ if( error == paNoError ) >+ { >+ result = PA_STREAM_REP(stream)->hostApiType; >+ } >+ else >+ { >+ result = (PaHostApiTypeId) error; >+ } >+ >+#ifdef PA_LOG_API_CALLS >+ PaUtil_DebugPrint("Pa_GetStreamHostApiType returned:\n" ); >+ PaUtil_DebugPrint("\tPaError: %d ( %s )\n\n", result, Pa_GetErrorText( result ) ); >+#endif >+ >+ return result; >+} > > PaError Pa_GetSampleSize( PaSampleFormat format ) > { >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/common/pa_stream.c portaudio-v19/src/common/pa_stream.c >--- ../../../portaudio/src/common/pa_stream.c 2007-12-02 17:24:56.000000000 +0000 >+++ portaudio-v19/src/common/pa_stream.c 2007-12-09 20:30:23.000000000 +0000 >@@ -93,6 +93,8 @@ > streamRepresentation->streamInfo.inputLatency = 0.; > streamRepresentation->streamInfo.outputLatency = 0.; > streamRepresentation->streamInfo.sampleRate = 0.; >+ >+ streamRepresentation->hostApiType = 0; > } > > >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/common/pa_stream.h portaudio-v19/src/common/pa_stream.h >--- ../../../portaudio/src/common/pa_stream.h 2007-12-02 17:24:56.000000000 +0000 >+++ portaudio-v19/src/common/pa_stream.h 2007-12-09 20:30:23.000000000 +0000 >@@ -152,6 +152,7 @@ > PaStreamFinishedCallback *streamFinishedCallback; > void *userData; > PaStreamInfo streamInfo; >+ PaHostApiTypeId hostApiType; > } PaUtilStreamRepresentation; > > >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c >--- ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c 2007-12-02 17:24:51.000000000 +0000 >+++ portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c 2007-12-09 20:30:23.000000000 +0000 >@@ -66,6 +66,9 @@ > #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS > # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) > # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) ) >+#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 >+# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b ) >+# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b ) > #else > # include <libkern/OSAtomic.h> > #endif >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-v19/src/hostapi/dsound/pa_win_ds.c >--- ../../../portaudio/src/hostapi/dsound/pa_win_ds.c 2007-12-02 17:24:53.000000000 +0000 >+++ portaudio-v19/src/hostapi/dsound/pa_win_ds.c 2007-12-09 20:52:42.000000000 +0000 >@@ -221,6 +221,7 @@ > /* DirectSound specific data. */ > > /* Output */ >+ LPGUID pOutputGuid; > LPDIRECTSOUND pDirectSound; > LPDIRECTSOUNDBUFFER pDirectSoundOutputBuffer; > DWORD outputBufferWriteOffsetBytes; /* last write position */ >@@ -236,6 +237,7 @@ > double dsw_framesWritten; > double framesPlayed; > /* Input */ >+ LPGUID pInputGuid; > LPDIRECTSOUNDCAPTURE pDirectSoundCapture; > LPDIRECTSOUNDCAPTUREBUFFER pDirectSoundInputBuffer; > INT bytesPerInputFrame; >@@ -1544,8 +1546,8 @@ > PaWinDsDeviceInfo *inputWinDsDeviceInfo, *outputWinDsDeviceInfo; > PaDeviceInfo *inputDeviceInfo, *outputDeviceInfo; > int inputChannelCount, outputChannelCount; >- PaSampleFormat inputSampleFormat, outputSampleFormat; >- PaSampleFormat hostInputSampleFormat, hostOutputSampleFormat; >+ PaSampleFormat inputSampleFormat = 0, outputSampleFormat = 0; >+ PaSampleFormat hostInputSampleFormat = 0, hostOutputSampleFormat = 0; > unsigned long suggestedInputLatencyFrames, suggestedOutputLatencyFrames; > PaWinDirectSoundStreamInfo *inputStreamInfo, *outputStreamInfo; > PaWinWaveFormatChannelMask inputChannelMask, outputChannelMask; >@@ -1803,6 +1804,13 @@ > PA_DS_SET_LAST_DIRECTSOUND_ERROR( hr ); > goto error; > } >+ >+ stream->pOutputGuid = outputWinDsDeviceInfo->lpGUID; >+ if( stream->pOutputGuid == NULL ) >+ { >+ stream->pOutputGuid = (GUID *) &DSDEVID_DefaultPlayback; >+ } >+ > hr = InitOutputBuffer( stream, > hostOutputSampleFormat, > (unsigned long) (sampleRate + 0.5), >@@ -1842,6 +1850,12 @@ > goto error; > } > >+ stream->pInputGuid = inputWinDsDeviceInfo->lpGUID; >+ if( stream->pInputGuid == NULL ) >+ { >+ stream->pInputGuid = (GUID *)&DSDEVID_DefaultCapture; >+ } >+ > hr = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( > ((PaWinDsDeviceInfo*)hostApi->deviceInfos[inputParameters->device])->lpGUID, > &stream->pDirectSoundCapture, NULL ); >@@ -2507,4 +2520,19 @@ > } > > >+/***********************************************************************************/ >+LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ) >+{ >+ PaWinDsStream *stream = (PaWinDsStream*)s; > >+ return stream->pInputGuid; >+} >+ >+ >+/***********************************************************************************/ >+LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ) >+{ >+ PaWinDsStream *stream = (PaWinDsStream*)s; >+ >+ return stream->pOutputGuid; >+} >diff -ur -N --exclude CVS --exclude .svn --exclude Makefile.in --exclude Makefile --exclude aclocal.m4 --exclude configure --exclude 'config.*' --exclude '*.patch' --exclude ltmain.sh ../../../portaudio/src/hostapi/oss/pa_unix_oss.c portaudio-v19/src/hostapi/oss/pa_unix_oss.c >--- ../../../portaudio/src/hostapi/oss/pa_unix_oss.c 2007-12-02 17:24:47.000000000 +0000 >+++ portaudio-v19/src/hostapi/oss/pa_unix_oss.c 2007-12-09 20:30:23.000000000 +0000 >@@ -1953,3 +1953,26 @@ > return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback ); > } > >+const char *PaOSS_GetStreamInputDevice( PaStream* s ) >+{ >+ PaOssStream *stream = (PaOssStream*)s; >+ >+ if( stream->capture ) >+ { >+ return stream->capture->devName; >+ } >+ >+ return NULL; >+} >+ >+const char *PaOSS_GetStreamOutputDevice( PaStream* s ) >+{ >+ PaOssStream *stream = (PaOssStream*)s; >+ >+ if( stream->playback ) >+ { >+ return stream->playback->devName; >+ } >+ >+ return NULL; >+} >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=143095">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 209494
:
143093
| 143095
