From 0d6238ab9f36250020db622db2b9825179738d56 Mon Sep 17 00:00:00 2001 From: Chris Kiefer Date: Thu, 25 Aug 2011 15:47:16 +0100 Subject: rtaudio mods --- player.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/player.cpp b/player.cpp index 37edf80..396215d 100644 --- a/player.cpp +++ b/player.cpp @@ -16,6 +16,7 @@ #include "portaudio.h" //#include "pa_mac_core.h" #elif defined(MAXIMILIAN_RT_AUDIO) +#include #include "RtAudio.h" #endif @@ -109,9 +110,11 @@ int main() std::cout << "PortAudio error: "<< Pa_GetErrorText( err ) << std::endl; #elif defined(MAXIMILIAN_RT_AUDIO) - RtAudio dac; + RtAudio dac(RtAudio::WINDOWS_DS); if ( dac.getDeviceCount() < 1 ) { std::cout << "\nNo audio devices found!\n"; + char input; + std::cin.get( input ); exit( 0 ); } @@ -121,11 +124,12 @@ int main() parameters.firstChannel = 0; unsigned int sampleRate = maxiSettings::sampleRate; unsigned int bufferFrames = maxiSettings::bufferSize; - double data[parameters.nChannels]; + //double data[maxiSettings::channels]; + vector data(maxiSettings::channels,0); try { dac.openStream( ¶meters, NULL, RTAUDIO_FLOAT64, - sampleRate, &bufferFrames, &routing, (void *)&data); + sampleRate, &bufferFrames, &routing, (void *)&(data[0])); dac.startStream(); } -- cgit v1.3 From 075815d598682309055d2178f799e4e46d47a93a Mon Sep 17 00:00:00 2001 From: Chris Kiefer Date: Thu, 25 Aug 2011 15:47:29 +0100 Subject: rtaudio mods --- RtAudio.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/RtAudio.cpp b/RtAudio.cpp index 4a3966b..ecea3ea 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -3662,10 +3662,14 @@ unsigned int RtApiDs :: getDeviceCount( void ) // Clean out any devices that may have disappeared. std::vector< int > indices; - for ( unsigned int i=0; i Date: Thu, 25 Aug 2011 15:50:41 +0100 Subject: windows vs2010 project --- .gitignore | 5 +- .../maximilianTestWindowsVS2010.sln | 20 +++++ .../maximilianTestWindowsVS2010.suo | Bin 0 -> 24576 bytes .../maximilianTestWindowsVS2010/ReadMe.txt | 40 +++++++++ .../maximilianTestWindowsVS2010.vcxproj | 96 +++++++++++++++++++++ .../maximilianTestWindowsVS2010.vcxproj.filters | 57 ++++++++++++ .../maximilianTestWindowsVS2010.vcxproj.user | 3 + .../maximilianTestWindowsVS2010/stdafx.h | 15 ++++ .../maximilianTestWindowsVS2010/targetver.h | 8 ++ 9 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.suo create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/ReadMe.txt create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.user create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/stdafx.h create mode 100644 maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/targetver.h diff --git a/.gitignore b/.gitignore index 3c09044..8c0f4d4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ build -build \ No newline at end of file +build +/maximilianTestWindowsVS2010/Debug +/maximilianTestWindowsVS2010/ipch +/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/Debug \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln new file mode 100644 index 0000000..9a258d6 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maximilianTestWindowsVS2010", "maximilianTestWindowsVS2010\maximilianTestWindowsVS2010.vcxproj", "{599B9B87-ABE8-4096-A0E7-A68775D8A284}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.ActiveCfg = Debug|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Debug|Win32.Build.0 = Debug|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.ActiveCfg = Release|Win32 + {599B9B87-ABE8-4096-A0E7-A68775D8A284}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.suo b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.suo new file mode 100644 index 0000000..04a3cf3 Binary files /dev/null and b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.suo differ diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/ReadMe.txt b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/ReadMe.txt new file mode 100644 index 0000000..f41a328 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/ReadMe.txt @@ -0,0 +1,40 @@ +======================================================================== + CONSOLE APPLICATION : maximilianTestWindowsVS2010 Project Overview +======================================================================== + +AppWizard has created this maximilianTestWindowsVS2010 application for you. + +This file contains a summary of what you will find in each of the files that +make up your maximilianTestWindowsVS2010 application. + + +maximilianTestWindowsVS2010.vcxproj + This is the main project file for VC++ projects generated using an Application Wizard. + It contains information about the version of Visual C++ that generated the file, and + information about the platforms, configurations, and project features selected with the + Application Wizard. + +maximilianTestWindowsVS2010.vcxproj.filters + This is the filters file for VC++ projects generated using an Application Wizard. + It contains information about the association between the files in your project + and the filters. This association is used in the IDE to show grouping of files with + similar extensions under a specific node (for e.g. ".cpp" files are associated with the + "Source Files" filter). + +maximilianTestWindowsVS2010.cpp + This is the main application source file. + +///////////////////////////////////////////////////////////////////////////// +Other standard files: + +StdAfx.h, StdAfx.cpp + These files are used to build a precompiled header (PCH) file + named maximilianTestWindowsVS2010.pch and a precompiled types file named StdAfx.obj. + +///////////////////////////////////////////////////////////////////////////// +Other notes: + +AppWizard uses "TODO:" comments to indicate parts of the source code you +should add to or customize. + +///////////////////////////////////////////////////////////////////////////// diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj new file mode 100644 index 0000000..54a6575 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj @@ -0,0 +1,96 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {599B9B87-ABE8-4096-A0E7-A68775D8A284} + Win32Proj + maximilianTestWindowsVS2010 + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + + + false + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;__WINDOWS_DS__;%(PreprocessorDefinitions) + + + Console + true + DSound.lib;%(AdditionalDependencies) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters new file mode 100644 index 0000000..6f24e7e --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + + + + Header Files + + + Header Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.user b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.user new file mode 100644 index 0000000..ace9a86 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/stdafx.h b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/stdafx.h new file mode 100644 index 0000000..b005a83 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/targetver.h b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/targetver.h new file mode 100644 index 0000000..87c0086 --- /dev/null +++ b/maximilianTestWindowsVS2010/maximilianTestWindowsVS2010/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include -- cgit v1.3