Browse Source

Updates to OS-X for multi-stream support (GS).

tags/4.0.5
Gary Scavone Stephen Sinclair 17 years ago
parent
commit
287e68ea21
5 changed files with 5311 additions and 5210 deletions
  1. +5303
    -5202
      RtAudio.cpp
  2. +1
    -1
      RtAudio.h
  3. +2
    -2
      tests/playraw.cpp
  4. +3
    -3
      tests/playsaw.cpp
  5. +2
    -2
      tests/record.cpp

+ 5303
- 5202
RtAudio.cpp
File diff suppressed because it is too large
View File


+ 1
- 1
RtAudio.h View File

@@ -4,7 +4,7 @@


RtAudio provides a common API (Application Programming Interface) RtAudio provides a common API (Application Programming Interface)
for realtime audio input/output across Linux (native ALSA, Jack, for realtime audio input/output across Linux (native ALSA, Jack,
and OSS), SGI, Macintosh OS X (CoreAudio and Jack), and Windows
and OSS), Macintosh OS X (CoreAudio and Jack), and Windows
(DirectSound and ASIO) operating systems. (DirectSound and ASIO) operating systems.


RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/ RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/


+ 2
- 2
tests/playraw.cpp View File

@@ -16,11 +16,13 @@
typedef char MY_TYPE; typedef char MY_TYPE;
#define FORMAT RTAUDIO_SINT8 #define FORMAT RTAUDIO_SINT8
#define SCALE 127.0 #define SCALE 127.0
*/


typedef signed short MY_TYPE; typedef signed short MY_TYPE;
#define FORMAT RTAUDIO_SINT16 #define FORMAT RTAUDIO_SINT16
#define SCALE 32767.0 #define SCALE 32767.0


/*
typedef signed long MY_TYPE; typedef signed long MY_TYPE;
#define FORMAT RTAUDIO_SINT24 #define FORMAT RTAUDIO_SINT24
#define SCALE 8388607.0 #define SCALE 8388607.0
@@ -28,13 +30,11 @@ typedef signed long MY_TYPE;
typedef signed long MY_TYPE; typedef signed long MY_TYPE;
#define FORMAT RTAUDIO_SINT32 #define FORMAT RTAUDIO_SINT32
#define SCALE 2147483647.0 #define SCALE 2147483647.0
*/


typedef float MY_TYPE; typedef float MY_TYPE;
#define FORMAT RTAUDIO_FLOAT32 #define FORMAT RTAUDIO_FLOAT32
#define SCALE 1.0; #define SCALE 1.0;


/*
typedef double MY_TYPE; typedef double MY_TYPE;
#define FORMAT RTAUDIO_FLOAT64 #define FORMAT RTAUDIO_FLOAT64
#define SCALE 1.0; #define SCALE 1.0;


+ 3
- 3
tests/playsaw.cpp View File

@@ -19,21 +19,21 @@ typedef signed long MY_TYPE;
typedef char MY_TYPE; typedef char MY_TYPE;
#define FORMAT RTAUDIO_SINT8 #define FORMAT RTAUDIO_SINT8
#define SCALE 127.0 #define SCALE 127.0
*/


typedef signed short MY_TYPE; typedef signed short MY_TYPE;
#define FORMAT RTAUDIO_SINT16 #define FORMAT RTAUDIO_SINT16
#define SCALE 32767.0 #define SCALE 32767.0


/*
typedef signed long MY_TYPE; typedef signed long MY_TYPE;
#define FORMAT RTAUDIO_SINT32 #define FORMAT RTAUDIO_SINT32
#define SCALE 2147483647.0 #define SCALE 2147483647.0
*/


typedef float MY_TYPE; typedef float MY_TYPE;
#define FORMAT RTAUDIO_FLOAT32 #define FORMAT RTAUDIO_FLOAT32
#define SCALE 1.0 #define SCALE 1.0


/*
typedef double MY_TYPE; typedef double MY_TYPE;
#define FORMAT RTAUDIO_FLOAT64 #define FORMAT RTAUDIO_FLOAT64
#define SCALE 1.0 #define SCALE 1.0
@@ -155,12 +155,12 @@ int main( int argc, char *argv[] )
} }


char input; char input;
//std::cout << "Stream latency = " << dac.getStreamLatency() << "\n" << std::endl;
std::cout << "\nPlaying ... press <enter> to quit (buffer size = " << bufferFrames << ").\n"; std::cout << "\nPlaying ... press <enter> to quit (buffer size = " << bufferFrames << ").\n";
std::cin.get( input ); std::cin.get( input );


try { try {
// Stop the stream // Stop the stream
std::cout << "Stream latency = " << dac.getStreamLatency() << "\n" << std::endl;
dac.stopStream(); dac.stopStream();
} }
catch ( RtError& e ) { catch ( RtError& e ) {


+ 2
- 2
tests/record.cpp View File

@@ -15,21 +15,21 @@
/* /*
typedef char MY_TYPE; typedef char MY_TYPE;
#define FORMAT RTAUDIO_SINT8 #define FORMAT RTAUDIO_SINT8
*/


typedef signed short MY_TYPE; typedef signed short MY_TYPE;
#define FORMAT RTAUDIO_SINT16 #define FORMAT RTAUDIO_SINT16


/*
typedef signed long MY_TYPE; typedef signed long MY_TYPE;
#define FORMAT RTAUDIO_SINT24 #define FORMAT RTAUDIO_SINT24


typedef signed long MY_TYPE; typedef signed long MY_TYPE;
#define FORMAT RTAUDIO_SINT32 #define FORMAT RTAUDIO_SINT32
*/


typedef float MY_TYPE; typedef float MY_TYPE;
#define FORMAT RTAUDIO_FLOAT32 #define FORMAT RTAUDIO_FLOAT32


/*
typedef double MY_TYPE; typedef double MY_TYPE;
#define FORMAT RTAUDIO_FLOAT64 #define FORMAT RTAUDIO_FLOAT64
*/ */


Loading…
Cancel
Save