diff options
| author | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 01:57:40 +0200 |
|---|---|---|
| committer | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 01:57:40 +0200 |
| commit | 0a26019ddd1e5e979bb38161e2ebee7866e79156 (patch) | |
| tree | bd582fb0efc317f43ce36889e148b8ed706630bf /RtAudio.cpp | |
| parent | f44483cc73ce2a36229c3f904c4230243a181e51 (diff) | |
| parent | caedd756a73367c72e8c2c64c5554419d2168b97 (diff) | |
Merge 4.0.6 into releases
Diffstat (limited to 'RtAudio.cpp')
| -rw-r--r-- | RtAudio.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp index cd427f3..8d47585 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -38,7 +38,7 @@ */ /************************************************************************/ -// RtAudio: Version 4.0.5 +// RtAudio: Version 4.0.6 #include "RtAudio.h" #include <iostream> @@ -403,7 +403,9 @@ unsigned int RtApi :: getStreamSampleRate( void ) // implementation. struct CoreHandle { AudioDeviceID id[2]; // device ids +#if defined( MAC_OS_X_VERSION_10_5 ) && ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ) AudioDeviceIOProcID procId[2]; +#endif UInt32 iStream[2]; // device stream index (or first if using multiple) UInt32 nStreams[2]; // number of streams to use bool xrun[2]; @@ -5646,7 +5648,7 @@ bool RtApiAlsa :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne } // Set the buffer number, which in ALSA is referred to as the "period". - int totalSize, dir; + int totalSize, dir = 0; unsigned int periods = 0; if ( options ) periods = options->numberOfBuffers; totalSize = *bufferSize * periods; |