Version 2.1

INSTALL

@@ -0,0 +1,28 @@
+RtAudio - a C++ class which provides a common API for realtime audio input/output across Linux (native ALSA and OSS), SGI, Macintosh OS X (CoreAudio), and Windows (DirectSound and ASIO) operating systems.
+
+By Gary P. Scavone, 2002.
+
+To configure and compile (on Unix systems):
+
+1. Unpack the RtAudio distribution (tar -xzf rtaudio-2.x.tar.gz).
+2. From within the directory containing this file, run configure:
+
+   ./configure
+
+3. From within the "tests" directory, type "make".
+
+A few options can be passed to configure, including:
+
+  --enable-debug = enable various debug output
+  --with-alsa = choose native ALSA API support (linux only)
+
+Typing "./configure --help" will display all the available options.
+
+If you wish to use a different compiler than that selected by configure, specify that compiler in the command line (ex. to use CC):
+
+  ./configure CXX=CC
+
+
+For Windows Users:
+
+Visual C++ 6.0 project files are included for the test programs.  For projects using the DirectSound API, go to the /tests/DirectSound/ directory.  For projects using the ASIO API, go to the /tests/asio/ directory.

README

@@ -1,40 +1,63 @@
-RtAudio - a C++ class which provides a common API for realtime audio input/output across Linux (native ALSA and OSS), SGI, and Windows operating systems.
-
-By Gary P. Scavone, 2002.
-
-This distribution of the Synthesis ToolKit in C++ (STK) contains the following:
-
-doc:      RtAudio documentation
-tests:    example RtAudio programs
-
-
-OVERVIEW:
-
-RtAudio is a C++ class which provides a common API (Application Programming Interface) for realtime audio input/output across Linux (native ALSA and OSS), SGI, and Windows operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following goals:
-
-  - object oriented C++ design
-  - simple, common API across all supported platforms
-  - single independent header and source file for easy inclusion in programming projects (no libraries!)
-  - blocking functionality
-  - callback functionality
-  - extensive audio device parameter control
-  - audio device capability probing
-  - automatic internal conversion for data format, channel number compensation, de-interleaving, and byte-swapping
-  - control over multiple audio streams and devices with a single instance
-
-RtAudio incorporates the concept of audio streams, which represent audio output (playback) and/or input (recording). Available audio devices and their capabilities can be enumerated and then specified when opening a stream. Multiple streams can run at the same time and, when allowed by the underlying audio API, a single device can serve multiple streams.
-
-The RtAudio API provides both blocking (synchronous) and callback (asyncronous) functionality. Callbacks are typically used in conjunction with graphical user interfaces (GUI). Blocking functionality is often necessary for explicit control of multiple input/output stream synchronization or when audio must be synchronized with other system events. 
-
-
-LEGAL AND ETHICAL:
-
-This software was designed and created to be made publicly available for free, primarily for academic purposes, so if you use it, pass it on with this documentation, and for free.  
-
-If you make a million dollars with it, give me some.  If you make compositions with it, put me in the program notes.
-
-
-FURTHER READING:
-
-For complete documentation on RtAudio, see the doc directory of the distribution or surf to http://www-ccrma.stanford.edu/~gary/rtaudio/.
-
+RtAudio - a C++ class which provides a common API for realtime audio input/output across Linux (native ALSA and OSS), SGI, Macintosh OS X (CoreAudio), and Windows (DirectSound and ASIO) operating systems.
+
+By Gary P. Scavone, 2002.
+
+This distribution of the Synthesis ToolKit in C++ (STK) contains the following:
+
+doc:      RtAudio documentation
+tests:    example RtAudio programs
+
+
+OVERVIEW:
+
+RtAudio is a C++ class which provides a common API (Application Programming Interface) for realtime audio input/output across Linux (native ALSA and OSS), SGI, Macintosh OS X (CoreAudio), and Windows (DirectSound and ASIO) operating systems. RtAudio significantly simplifies the process of interacting with computer audio hardware. It was designed with the following goals:
+
+  - object oriented C++ design
+  - simple, common API across all supported platforms
+  - single independent header and source file for easy inclusion in programming projects
+  - blocking functionality
+  - callback functionality
+  - extensive audio device parameter control
+  - audio device capability probing
+  - automatic internal conversion for data format, channel number compensation, de-interleaving, and byte-swapping
+  - control over multiple audio streams and devices with a single instance
+
+RtAudio incorporates the concept of audio streams, which represent audio output (playback) and/or input (recording). Available audio devices and their capabilities can be enumerated and then specified when opening a stream. Multiple streams can run at the same time and, when allowed by the underlying audio API, a single device can serve multiple streams.
+
+The RtAudio API provides both blocking (synchronous) and callback (asyncronous) functionality. Callbacks are typically used in conjunction with graphical user interfaces (GUI). Blocking functionality is often necessary for explicit control of multiple input/output stream synchronization or when audio must be synchronized with other system events. 
+
+
+FURTHER READING:
+
+For complete documentation on RtAudio, see the doc directory of the distribution or surf to http://www-ccrma.stanford.edu/~gary/rtaudio/.
+
+
+LEGAL AND ETHICAL:
+
+The RtAudio license is similar to the the MIT License, with the added "feature" that modifications be sent to the developer.
+
+    RtAudio: a realtime audio i/o C++ class
+    Copyright (c) 2001-2002 Gary P. Scavone
+
+    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.

RtAudio.h

@@ -1,434 +1,525 @@
-/******************************************/
-/*
-  RtAudio - realtime sound I/O C++ class
-  by Gary P. Scavone, 2001-2002.
-*/
-/******************************************/
-
-#if !defined(__RTAUDIO_H)
-#define __RTAUDIO_H
-
-#include <map>
-
-#if defined(__LINUX_ALSA__)
-  #include <alsa/asoundlib.h>
-  #include <pthread.h>
-  #include <unistd.h>
-
-  #define THREAD_TYPE
-  typedef snd_pcm_t *AUDIO_HANDLE;
-  typedef int DEVICE_ID;
-  typedef pthread_t THREAD_HANDLE;
-  typedef pthread_mutex_t MUTEX;
-
-#elif defined(__LINUX_OSS__)
-  #include <pthread.h>
-  #include <unistd.h>
-
-  #define THREAD_TYPE
-  typedef int AUDIO_HANDLE;
-  typedef int DEVICE_ID;
-  typedef pthread_t THREAD_HANDLE;
-  typedef pthread_mutex_t MUTEX;
-
-#elif defined(__WINDOWS_DS__)
-  #include <windows.h>
-  #include <process.h>
-
-  // The following struct is used to hold the extra variables
-  // specific to the DirectSound implementation.
-  typedef struct {
-    void * object;
-    void * buffer;
-    UINT bufferPointer;
-  } AUDIO_HANDLE;
-
-  #define THREAD_TYPE __stdcall
-  typedef LPGUID DEVICE_ID;
-  typedef unsigned long THREAD_HANDLE;
-  typedef CRITICAL_SECTION MUTEX;
-
-#elif defined(__IRIX_AL__)
-  #include <dmedia/audio.h>
-  #include <pthread.h>
-  #include <unistd.h>
-
-  #define THREAD_TYPE
-  typedef ALport AUDIO_HANDLE;
-  typedef int DEVICE_ID;
-  typedef pthread_t THREAD_HANDLE;
-  typedef pthread_mutex_t MUTEX;
-
-#endif
-
-
-// *************************************************** //
-//
-// RtError class declaration.
-//
-// *************************************************** //
-
-class RtError
-{
-public:
-  enum TYPE {
-    WARNING,
-    DEBUG_WARNING,
-    UNSPECIFIED,
-    NO_DEVICES_FOUND,
-    INVALID_DEVICE,
-    INVALID_STREAM,
-    MEMORY_ERROR,
-    INVALID_PARAMETER,
-    DRIVER_ERROR,
-    SYSTEM_ERROR,
-    THREAD_ERROR
-  };
-
-protected:
-  char error_message[256];
-  TYPE type;
-
-public:
-  //! The constructor.
-  RtError(const char *p, TYPE tipe = RtError::UNSPECIFIED);
-
-  //! The destructor.
-  virtual ~RtError(void);
-
-  //! Prints "thrown" error message to stdout.
-  virtual void printMessage(void);
-
-  //! Returns the "thrown" error message TYPE.
-  virtual const TYPE& getType(void) { return type; }
-
-  //! Returns the "thrown" error message string.
-  virtual const char *getMessage(void) { return error_message; }
-};
-
-
-// *************************************************** //
-//
-// RtAudio class declaration.
-//
-// *************************************************** //
-
-class RtAudio
-{
-public:
-
-  // Support for signed integers and floats.  Audio data fed to/from
-  // the tickStream() routine is assumed to ALWAYS be in host
-  // byte order.  The internal routines will automatically take care of
-  // any necessary byte-swapping between the host format and the
-  // soundcard.  Thus, endian-ness is not a concern in the following
-  // format definitions.
-  typedef unsigned long RTAUDIO_FORMAT;
-  static const RTAUDIO_FORMAT RTAUDIO_SINT8;
-  static const RTAUDIO_FORMAT RTAUDIO_SINT16;
-  static const RTAUDIO_FORMAT RTAUDIO_SINT24; /*!< Upper 3 bytes of 32-bit integer. */
-  static const RTAUDIO_FORMAT RTAUDIO_SINT32;
-  static const RTAUDIO_FORMAT RTAUDIO_FLOAT32; /*!< Normalized between plus/minus 1.0. */
-  static const RTAUDIO_FORMAT RTAUDIO_FLOAT64; /*!< Normalized between plus/minus 1.0. */
-
-  //static const int MAX_SAMPLE_RATES = 14;
-  enum { MAX_SAMPLE_RATES = 14 };
-
-  typedef int (*RTAUDIO_CALLBACK)(char *buffer, int bufferSize, void *userData);
-
-  typedef struct {
-    char name[128];
-    DEVICE_ID id[2];  /*!< No value reported by getDeviceInfo(). */
-    bool probed;       /*!< true if the device capabilities were successfully probed. */
-    int maxOutputChannels;
-    int maxInputChannels;
-    int maxDuplexChannels;
-    int minOutputChannels;
-    int minInputChannels;
-    int minDuplexChannels;
-    bool hasDuplexSupport; /*!< true if device supports duplex mode. */
-    int nSampleRates;      /*!< Number of discrete rates or -1 if range supported. */
-    int sampleRates[MAX_SAMPLE_RATES]; /*!< Supported rates or (min, max) if range. */
-    RTAUDIO_FORMAT nativeFormats;     /*!< Bit mask of supported data formats. */
-  } RTAUDIO_DEVICE;
-
-  //! The default constructor.
-  /*!
-    Probes the system to make sure at least one audio
-    input/output device is available and determines
-    the api-specific identifier for each device found.
-    An RtError error can be thrown if no devices are
-    found or if a memory allocation error occurs.
-  */
-  RtAudio();
-
-  //! A constructor which can be used to open a stream during instantiation.
-  /*!
-    The specified output and/or input device identifiers correspond
-    to those enumerated via the getDeviceInfo() method.  If device =
-    0, the default or first available devices meeting the given
-    parameters is selected.  If an output or input channel value is
-    zero, the corresponding device value is ignored.  When a stream is
-    successfully opened, its identifier is returned via the "streamId"
-    pointer.  An RtError can be thrown if no devices are found
-    for the given parameters, if a memory allocation error occurs, or
-    if a driver error occurs. \sa openStream()
-  */
-  RtAudio(int *streamId,
-          int outputDevice, int outputChannels,
-          int inputDevice, int inputChannels,
-          RTAUDIO_FORMAT format, int sampleRate,
-          int *bufferSize, int numberOfBuffers);
-
-  //! The destructor.
-  /*!
-    Stops and closes any open streams and devices and deallocates
-    buffer and structure memory.
-  */
-  ~RtAudio();
-
-  //! A public method for opening a stream with the specified parameters.
-  /*!
-    If successful, the opened stream ID is returned.  Otherwise, an
-    RtError is thrown.
-
-    \param outputDevice: If equal to 0, the default or first device
-           found meeting the given parameters is opened.  Otherwise, the
-           device number should correspond to one of those enumerated via
-           the getDeviceInfo() method.
-    \param outputChannels: The desired number of output channels.  If
-           equal to zero, the outputDevice identifier is ignored.
-    \param inputDevice: If equal to 0, the default or first device
-           found meeting the given parameters is opened.  Otherwise, the
-           device number should correspond to one of those enumerated via
-           the getDeviceInfo() method.
-    \param inputChannels: The desired number of input channels.  If
-           equal to zero, the inputDevice identifier is ignored.
-    \param format: An RTAUDIO_FORMAT specifying the desired sample data format.
-    \param sampleRate: The desired sample rate (sample frames per second).
-    \param *bufferSize: A pointer value indicating the desired internal buffer
-           size in sample frames.  The actual value used by the device is
-           returned via the same pointer.  A value of zero can be specified,
-           in which case the lowest allowable value is determined.
-    \param numberOfBuffers: A value which can be used to help control device
-           latency.  More buffers typically result in more robust performance,
-           though at a cost of greater latency.  A value of zero can be
-           specified, in which case the lowest allowable value is used.
-  */
-  int openStream(int outputDevice, int outputChannels,
-                 int inputDevice, int inputChannels,
-                 RTAUDIO_FORMAT format, int sampleRate,
-                 int *bufferSize, int numberOfBuffers);
-
-  //! A public method which sets a user-defined callback function for a given stream.
-  /*!
-    This method assigns a callback function to a specific,
-    previously opened stream for non-blocking stream functionality.  A
-    separate process is initiated, though the user function is called
-    only when the stream is "running" (between calls to the
-    startStream() and stopStream() methods, respectively).  The
-    callback process remains active for the duration of the stream and
-    is automatically shutdown when the stream is closed (via the
-    closeStream() method or by object destruction).  The callback
-    process can also be shutdown and the user function de-referenced
-    through an explicit call to the cancelStreamCallback() method.
-    Note that a single stream can use only blocking or callback
-    functionality at the same time, though it is possible to alternate
-    modes on the same stream through the use of the
-    setStreamCallback() and cancelStreamCallback() methods (the
-    blocking tickStream() method can be used before a callback is set
-    and/or after a callback is cancelled).  An RtError will be
-    thrown for an invalid device argument.
-  */
-  void setStreamCallback(int streamId, RTAUDIO_CALLBACK callback, void *userData);
-
-  //! A public method which cancels a callback process and function for a given stream.
-  /*!
-    This method shuts down a callback process and de-references the
-    user function for a specific stream.  Callback functionality can
-    subsequently be restarted on the stream via the
-    setStreamCallback() method.  An RtError will be thrown for an
-    invalid device argument.
-   */
-  void cancelStreamCallback(int streamId);
-
-  //! A public method which returns the number of audio devices found.
-  int getDeviceCount(void);
-
-  //! Fill a user-supplied RTAUDIO_DEVICE structure for a specified device.
-  /*!
-    Any device between 0 and getDeviceCount()-1 is valid.  If a
-    device is busy or otherwise unavailable, the structure member
-    "probed" has a value of "false".  The system default input and
-    output devices are referenced by device identifier = 0.  On
-    systems which allow dynamic default device settings, the default
-    devices are not identified by name (specific device enumerations
-    are assigned device identifiers > 0).  An RtError will be
-    thrown for an invalid device argument.
-  */
-  void getDeviceInfo(int device, RTAUDIO_DEVICE *info);
-
-  //! A public method which returns a pointer to the buffer for an open stream.
-  /*!
-    The user should fill and/or read the buffer data in interleaved format
-    and then call the tickStream() method.  An RtError will be
-    thrown for an invalid stream identifier.
-  */
-  char * const getStreamBuffer(int streamId);
-
-  //! Public method used to trigger processing of input/output data for a stream.
-  /*!
-    This method blocks until all buffer data is read/written.  An
-    RtError will be thrown for an invalid stream identifier or if
-    a driver error occurs.
-  */
-  void tickStream(int streamId);
-
-  //! Public method which closes a stream and frees any associated buffers.
-  /*!
-    If an invalid stream identifier is specified, this method
-    issues a warning and returns (an RtError is not thrown).
-  */
-  void closeStream(int streamId);
-
-  //! Public method which starts a stream.
-  /*!
-    An RtError will be thrown for an invalid stream identifier
-    or if a driver error occurs.
-  */
-  void startStream(int streamId);
-
-  //! Stop a stream, allowing any samples remaining in the queue to be played out and/or read in.
-  /*!
-    An RtError will be thrown for an invalid stream identifier
-    or if a driver error occurs.
-  */
-  void stopStream(int streamId);
-
-  //! Stop a stream, discarding any samples remaining in the input/output queue.
-  /*!
-    An RtError will be thrown for an invalid stream identifier
-    or if a driver error occurs.
-  */
-  void abortStream(int streamId);
-
-  //! Queries a stream to determine whether a call to the tickStream() method will block.
-  /*!
-    A return value of 0 indicates that the stream will NOT block.  A positive
-    return value indicates the number of sample frames that cannot yet be
-    processed without blocking.
-  */
-  int streamWillBlock(int streamId);
-
-protected:
-
-private:
-
-  static const unsigned int SAMPLE_RATES[MAX_SAMPLE_RATES];
-
-  enum { FAILURE, SUCCESS };
-
-  enum STREAM_MODE {
-    PLAYBACK,
-    RECORD,
-    DUPLEX,
-    UNINITIALIZED = -75
-  };
-
-  enum STREAM_STATE {
-    STREAM_STOPPED,
-    STREAM_RUNNING
-  };
-
-  typedef struct {
-    int device[2];          // Playback and record, respectively.
-    STREAM_MODE mode;       // PLAYBACK, RECORD, or DUPLEX.
-    AUDIO_HANDLE handle[2]; // Playback and record handles, respectively.
-    STREAM_STATE state;     // STOPPED or RUNNING
-    char *userBuffer;
-    char *deviceBuffer;
-    bool doConvertBuffer[2]; // Playback and record, respectively.
-    bool deInterleave[2];    // Playback and record, respectively.
-    bool doByteSwap[2];      // Playback and record, respectively.
-    int sampleRate;
-    int bufferSize;
-    int nBuffers;
-    int nUserChannels[2];    // Playback and record, respectively.
-    int nDeviceChannels[2];  // Playback and record channels, respectively.
-    RTAUDIO_FORMAT userFormat;
-    RTAUDIO_FORMAT deviceFormat[2]; // Playback and record, respectively.
-    bool usingCallback;
-    THREAD_HANDLE thread;
-    MUTEX mutex;
-    RTAUDIO_CALLBACK callback;
-    void *userData;
-  } RTAUDIO_STREAM;
-
-  typedef signed short INT16;
-  typedef signed int INT32;
-  typedef float FLOAT32;
-  typedef double FLOAT64;
-
-  char message[256];
-  int nDevices;
-  RTAUDIO_DEVICE *devices;
-
-  std::map<int, void *> streams;
-
-  //! Private error method to allow global control over error handling.
-  void error(RtError::TYPE type);
-
-  /*!
-    Private method to count the system audio devices, allocate the
-    RTAUDIO_DEVICE structures, and probe the device capabilities.
-  */
-  void initialize(void);
-
-  //! Private method to clear an RTAUDIO_DEVICE structure.
-  void clearDeviceInfo(RTAUDIO_DEVICE *info);
-
-  /*!
-    Private method which attempts to fill an RTAUDIO_DEVICE
-    structure for a given device.  If an error is encountered during
-    the probe, a "warning" message is reported and the value of
-    "probed" remains false (no exception is thrown).  A successful
-    probe is indicated by probed = true.
-  */
-  void probeDeviceInfo(RTAUDIO_DEVICE *info);
-
-  /*!
-    Private method which attempts to open a device with the given parameters.
-    If an error is encountered during the probe, a "warning" message is
-    reported and FAILURE is returned (no exception is thrown). A
-    successful probe is indicated by a return value of SUCCESS.
-  */
-  bool probeDeviceOpen(int device, RTAUDIO_STREAM *stream,
-                       STREAM_MODE mode, int channels, 
-                       int sampleRate, RTAUDIO_FORMAT format,
-                       int *bufferSize, int numberOfBuffers);
-
-  /*!
-    Private common method used to check validity of a user-passed
-    stream ID.  When the ID is valid, this method returns a pointer to
-    an RTAUDIO_STREAM structure (in the form of a void pointer).
-    Otherwise, an "invalid identifier" exception is thrown.
-  */
-  void *verifyStream(int streamId);
-
-  /*!
-    Private method used to perform format, channel number, and/or interleaving
-    conversions between the user and device buffers.
-  */
-  void convertStreamBuffer(RTAUDIO_STREAM *stream, STREAM_MODE mode);
-
-  //! Private method used to perform byte-swapping on buffers.
-  void byteSwapBuffer(char *buffer, int samples, RTAUDIO_FORMAT format);
-
-  //! Private method which returns the number of bytes for a given format.
-  int formatBytes(RTAUDIO_FORMAT format);
-};
-
-// Uncomment the following definition to have extra information spewed to stderr.
-//#define RTAUDIO_DEBUG
-
-#endif
+/************************************************************************/
+/*! \class RtAudio
+    \brief Realtime audio i/o C++ class.
+
+    RtAudio provides a common API (Application Programming Interface)
+    for realtime audio input/output across Linux (native ALSA and
+    OSS), SGI, Macintosh OS X (CoreAudio), and Windows (DirectSound
+    and ASIO) operating systems.
+
+    RtAudio WWW site: http://www-ccrma.stanford.edu/~gary/rtaudio/
+
+    RtAudio: a realtime audio i/o C++ class
+    Copyright (c) 2001-2002 Gary P. Scavone
+
+    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.
+*/
+/************************************************************************/
+
+#if !defined(__RTAUDIO_H)
+#define __RTAUDIO_H
+
+#include <map>
+
+#if defined(__LINUX_ALSA__)
+  #include <alsa/asoundlib.h>
+  #include <pthread.h>
+  #include <unistd.h>
+
+  typedef snd_pcm_t *AUDIO_HANDLE;
+  typedef int DEVICE_ID;
+  typedef pthread_t THREAD_HANDLE;
+  typedef pthread_mutex_t MUTEX;
+
+#elif defined(__LINUX_OSS__)
+  #include <pthread.h>
+  #include <unistd.h>
+
+  typedef int AUDIO_HANDLE;
+  typedef int DEVICE_ID;
+  typedef pthread_t THREAD_HANDLE;
+  typedef pthread_mutex_t MUTEX;
+
+#elif defined(__WINDOWS_DS__)
+  #include <windows.h>
+  #include <process.h>
+
+  // The following struct is used to hold the extra variables
+  // specific to the DirectSound implementation.
+  typedef struct {
+    void * object;
+    void * buffer;
+    UINT bufferPointer;
+  } AUDIO_HANDLE;
+
+  typedef LPGUID DEVICE_ID;
+  typedef unsigned long THREAD_HANDLE;
+  typedef CRITICAL_SECTION MUTEX;
+
+#elif defined(__WINDOWS_ASIO__)
+  #include <windows.h>
+  #include <process.h>
+
+  typedef int AUDIO_HANDLE;
+  typedef int DEVICE_ID;
+  typedef unsigned long THREAD_HANDLE;
+  typedef CRITICAL_SECTION MUTEX;
+
+#elif defined(__IRIX_AL__)
+  #include <dmedia/audio.h>
+  #include <pthread.h>
+  #include <unistd.h>
+
+  typedef ALport AUDIO_HANDLE;
+  typedef long DEVICE_ID;
+  typedef pthread_t THREAD_HANDLE;
+  typedef pthread_mutex_t MUTEX;
+
+#elif defined(__MACOSX_CORE__)
+
+  #include <CoreAudio/AudioHardware.h>
+  #include <pthread.h>
+
+  typedef unsigned int AUDIO_HANDLE;
+  typedef AudioDeviceID DEVICE_ID;
+  typedef pthread_t THREAD_HANDLE;
+  typedef pthread_mutex_t MUTEX;
+
+#endif
+
+
+/************************************************************************/
+/*! \class RtError
+    \brief Exception handling class for RtAudio.
+
+    The RtError class is quite simple but it does allow errors to be
+    "caught" by RtError::TYPE. Almost all RtAudio methods can "throw"
+    an RtError, most typically if an invalid stream identifier is
+    supplied to a method or a driver error occurs. There are a number
+    of cases within RtAudio where warning messages may be displayed
+    but an exception is not thrown. There is a private RtAudio method,
+    error(), which can be modified to globally control how these
+    messages are handled and reported.
+*/
+/************************************************************************/
+
+class RtError
+{
+public:
+  //! Defined RtError types.
+  enum TYPE {
+    WARNING,
+    DEBUG_WARNING,
+    UNSPECIFIED,
+    NO_DEVICES_FOUND,
+    INVALID_DEVICE,
+    INVALID_STREAM,
+    MEMORY_ERROR,
+    INVALID_PARAMETER,
+    DRIVER_ERROR,
+    SYSTEM_ERROR,
+    THREAD_ERROR
+  };
+
+protected:
+  char error_message[256];
+  TYPE type;
+
+public:
+  //! The constructor.
+  RtError(const char *p, TYPE tipe = RtError::UNSPECIFIED);
+
+  //! The destructor.
+  virtual ~RtError(void);
+
+  //! Prints "thrown" error message to stdout.
+  virtual void printMessage(void);
+
+  //! Returns the "thrown" error message TYPE.
+  virtual const TYPE& getType(void) { return type; }
+
+  //! Returns the "thrown" error message string.
+  virtual const char *getMessage(void) { return error_message; }
+};
+
+
+// This public structure type is used to pass callback information
+// between the private RtAudio stream structure and global callback
+// handling functions.
+typedef struct {
+  void *object;  // Used as a "this" pointer.
+  int streamId;
+  DEVICE_ID device[2];
+  THREAD_HANDLE thread;
+  void *callback;
+  void *buffers;
+  unsigned long waitTime;
+  bool blockTick;
+  bool stopStream;
+  bool usingCallback;
+  void *userData;
+} CALLBACK_INFO;
+
+
+// *************************************************** //
+//
+// RtAudio class declaration.
+//
+// *************************************************** //
+
+class RtAudio
+{
+public:
+
+  // Support for signed integers and floats.  Audio data fed to/from
+  // the tickStream() routine is assumed to ALWAYS be in host
+  // byte order.  The internal routines will automatically take care of
+  // any necessary byte-swapping between the host format and the
+  // soundcard.  Thus, endian-ness is not a concern in the following
+  // format definitions.
+  typedef unsigned long RTAUDIO_FORMAT;
+  static const RTAUDIO_FORMAT RTAUDIO_SINT8; /*!< 8-bit signed integer. */
+  static const RTAUDIO_FORMAT RTAUDIO_SINT16; /*!< 16-bit signed integer. */
+  static const RTAUDIO_FORMAT RTAUDIO_SINT24; /*!< Upper 3 bytes of 32-bit signed integer. */
+  static const RTAUDIO_FORMAT RTAUDIO_SINT32; /*!< 32-bit signed integer. */
+  static const RTAUDIO_FORMAT RTAUDIO_FLOAT32; /*!< Normalized between plus/minus 1.0. */
+  static const RTAUDIO_FORMAT RTAUDIO_FLOAT64; /*!< Normalized between plus/minus 1.0. */
+
+  //static const int MAX_SAMPLE_RATES = 14;
+  enum { MAX_SAMPLE_RATES = 14 };
+
+  typedef int (*RTAUDIO_CALLBACK)(char *buffer, int bufferSize, void *userData);
+
+  //! The public device information structure for passing queried values.
+  typedef struct {
+    char name[128];    /*!< Character string device identifier. */
+    DEVICE_ID id[2];  /* No value reported by getDeviceInfo(). */
+    bool probed;       /*!< true if the device capabilities were successfully probed. */
+    int maxOutputChannels; /*!< Maximum output channels supported by device. */
+    int maxInputChannels;  /*!< Maximum input channels supported by device. */
+    int maxDuplexChannels; /*!< Maximum simultaneous input/output channels supported by device. */
+    int minOutputChannels; /*!< Minimum output channels supported by device. */
+    int minInputChannels;  /*!< Minimum input channels supported by device. */
+    int minDuplexChannels; /*!< Minimum simultaneous input/output channels supported by device. */
+    bool hasDuplexSupport; /*!< true if device supports duplex mode. */
+    bool isDefault;        /*!< true if this is the default output or input device. */
+    int nSampleRates;      /*!< Number of discrete rates or -1 if range supported. */
+    int sampleRates[MAX_SAMPLE_RATES]; /*!< Supported rates or (min, max) if range. */
+    RTAUDIO_FORMAT nativeFormats;     /*!< Bit mask of supported data formats. */
+  } RTAUDIO_DEVICE;
+
+  //! The default constructor.
+  /*!
+    Probes the system to make sure at least one audio input/output
+    device is available and determines the api-specific identifier for
+    each device found.  An RtError error can be thrown if no devices
+    are found or if a memory allocation error occurs.
+  */
+  RtAudio();
+
+  //! A constructor which can be used to open a stream during instantiation.
+  /*!
+    The specified output and/or input device identifiers correspond
+    to those enumerated via the getDeviceInfo() method.  If device =
+    0, the default or first available devices meeting the given
+    parameters is selected.  If an output or input channel value is
+    zero, the corresponding device value is ignored.  When a stream is
+    successfully opened, its identifier is returned via the "streamId"
+    pointer.  An RtError can be thrown if no devices are found
+    for the given parameters, if a memory allocation error occurs, or
+    if a driver error occurs. \sa openStream()
+  */
+  RtAudio(int *streamId,
+          int outputDevice, int outputChannels,
+          int inputDevice, int inputChannels,
+          RTAUDIO_FORMAT format, int sampleRate,
+          int *bufferSize, int numberOfBuffers);
+
+  //! The destructor.
+  /*!
+    Stops and closes any open streams and devices and deallocates
+    buffer and structure memory.
+  */
+  ~RtAudio();
+
+  //! A public method for opening a stream with the specified parameters.
+  /*!
+    If successful, the opened stream ID is returned.  Otherwise, an
+    RtError is thrown.
+
+    \param outputDevice: If equal to 0, the default or first device
+           found meeting the given parameters is opened.  Otherwise, the
+           device number should correspond to one of those enumerated via
+           the getDeviceInfo() method.
+    \param outputChannels: The desired number of output channels.  If
+           equal to zero, the outputDevice identifier is ignored.
+    \param inputDevice: If equal to 0, the default or first device
+           found meeting the given parameters is opened.  Otherwise, the
+           device number should correspond to one of those enumerated via
+           the getDeviceInfo() method.
+    \param inputChannels: The desired number of input channels.  If
+           equal to zero, the inputDevice identifier is ignored.
+    \param format: An RTAUDIO_FORMAT specifying the desired sample data format.
+    \param sampleRate: The desired sample rate (sample frames per second).
+    \param *bufferSize: A pointer value indicating the desired internal buffer
+           size in sample frames.  The actual value used by the device is
+           returned via the same pointer.  A value of zero can be specified,
+           in which case the lowest allowable value is determined.
+    \param numberOfBuffers: A value which can be used to help control device
+           latency.  More buffers typically result in more robust performance,
+           though at a cost of greater latency.  A value of zero can be
+           specified, in which case the lowest allowable value is used.
+  */
+  int openStream(int outputDevice, int outputChannels,
+                 int inputDevice, int inputChannels,
+                 RTAUDIO_FORMAT format, int sampleRate,
+                 int *bufferSize, int numberOfBuffers);
+
+  //! A public method which sets a user-defined callback function for a given stream.
+  /*!
+    This method assigns a callback function to a specific,
+    previously opened stream for non-blocking stream functionality.  A
+    separate process is initiated, though the user function is called
+    only when the stream is "running" (between calls to the
+    startStream() and stopStream() methods, respectively).  The
+    callback process remains active for the duration of the stream and
+    is automatically shutdown when the stream is closed (via the
+    closeStream() method or by object destruction).  The callback
+    process can also be shutdown and the user function de-referenced
+    through an explicit call to the cancelStreamCallback() method.
+    Note that a single stream can use only blocking or callback
+    functionality at the same time, though it is possible to alternate
+    modes on the same stream through the use of the
+    setStreamCallback() and cancelStreamCallback() methods (the
+    blocking tickStream() method can be used before a callback is set
+    and/or after a callback is cancelled).  An RtError will be thrown
+    for an invalid device argument.
+  */
+  void setStreamCallback(int streamId, RTAUDIO_CALLBACK callback, void *userData);
+
+  //! A public method which cancels a callback process and function for a given stream.
+  /*!
+    This method shuts down a callback process and de-references the
+    user function for a specific stream.  Callback functionality can
+    subsequently be restarted on the stream via the
+    setStreamCallback() method.  An RtError will be thrown for an
+    invalid device argument.
+   */
+  void cancelStreamCallback(int streamId);
+
+  //! A public method which returns the number of audio devices found.
+  int getDeviceCount(void);
+
+  //! Fill a user-supplied RTAUDIO_DEVICE structure for a specified device number.
+  /*!
+    Any device integer between 1 and getDeviceCount() is valid.  If
+    a device is busy or otherwise unavailable, the structure member
+    "probed" will have a value of "false" and all other members are
+    undefined.  If the specified device is the current default input
+    or output device, the "isDefault" member will have a value of
+    "true".  An RtError will be thrown for an invalid device argument.
+  */
+  void getDeviceInfo(int device, RTAUDIO_DEVICE *info);
+
+  //! A public method which returns a pointer to the buffer for an open stream.
+  /*!
+    The user should fill and/or read the buffer data in interleaved format
+    and then call the tickStream() method.  An RtError will be
+    thrown for an invalid stream identifier.
+  */
+  char * const getStreamBuffer(int streamId);
+
+  //! Public method used to trigger processing of input/output data for a stream.
+  /*!
+    This method blocks until all buffer data is read/written.  An
+    RtError will be thrown for an invalid stream identifier or if
+    a driver error occurs.
+  */
+  void tickStream(int streamId);
+
+  //! Public method which closes a stream and frees any associated buffers.
+  /*!
+    If an invalid stream identifier is specified, this method
+    issues a warning and returns (an RtError is not thrown).
+  */
+  void closeStream(int streamId);
+
+  //! Public method which starts a stream.
+  /*!
+    An RtError will be thrown for an invalid stream identifier
+    or if a driver error occurs.
+  */
+  void startStream(int streamId);
+
+  //! Stop a stream, allowing any samples remaining in the queue to be played out and/or read in.
+  /*!
+    An RtError will be thrown for an invalid stream identifier
+    or if a driver error occurs.
+  */
+  void stopStream(int streamId);
+
+  //! Stop a stream, discarding any samples remaining in the input/output queue.
+  /*!
+    An RtError will be thrown for an invalid stream identifier
+    or if a driver error occurs.
+  */
+  void abortStream(int streamId);
+
+  //! Queries a stream to determine whether a call to the tickStream() method will block.
+  /*!
+    A return value of 0 indicates that the stream will NOT block.  A positive
+    return value indicates the number of sample frames that cannot yet be
+    processed without blocking.
+  */
+  int streamWillBlock(int streamId);
+
+#if (defined(__MACOSX_CORE__) || defined(__WINDOWS_ASIO__))
+  // This function is intended for internal use only.  It must be
+  // public because it is called by the internal callback handler,
+  // which is not a member of RtAudio.  External use of this function
+  // will most likely produce highly undesireable results!
+  void callbackEvent(int streamId, DEVICE_ID deviceId, void *inData, void *outData);
+#endif
+
+protected:
+
+private:
+
+  static const unsigned int SAMPLE_RATES[MAX_SAMPLE_RATES];
+
+  enum { FAILURE, SUCCESS };
+
+  enum STREAM_MODE {
+    OUTPUT,
+    INPUT,
+    DUPLEX,
+    UNINITIALIZED = -75
+  };
+
+  enum STREAM_STATE {
+    STREAM_STOPPED,
+    STREAM_RUNNING
+  };
+
+  typedef struct {
+    int device[2];          // Playback and record, respectively.
+    STREAM_MODE mode;       // OUTPUT, INPUT, or DUPLEX.
+    AUDIO_HANDLE handle[2]; // Playback and record handles, respectively.
+    STREAM_STATE state;     // STOPPED or RUNNING
+    char *userBuffer;
+    char *deviceBuffer;
+    bool doConvertBuffer[2]; // Playback and record, respectively.
+    bool deInterleave[2];    // Playback and record, respectively.
+    bool doByteSwap[2];      // Playback and record, respectively.
+    int sampleRate;
+    int bufferSize;
+    int nBuffers;
+    int nUserChannels[2];    // Playback and record, respectively.
+    int nDeviceChannels[2];  // Playback and record channels, respectively.
+    RTAUDIO_FORMAT userFormat;
+    RTAUDIO_FORMAT deviceFormat[2]; // Playback and record, respectively.
+    MUTEX mutex;
+    CALLBACK_INFO callbackInfo;
+  } RTAUDIO_STREAM;
+
+  typedef signed short INT16;
+  typedef signed int INT32;
+  typedef float FLOAT32;
+  typedef double FLOAT64;
+
+  char message[256];
+  int nDevices;
+  RTAUDIO_DEVICE *devices;
+
+  std::map<int, void *> streams;
+
+  //! Private error method to allow global control over error handling.
+  void error(RtError::TYPE type);
+
+  /*!
+    Private method to count the system audio devices, allocate the
+    RTAUDIO_DEVICE structures, and probe the device capabilities.
+  */
+  void initialize(void);
+
+  /*!
+    Private method which returns the index in the devices array to
+    the default input device.
+  */
+  int getDefaultInputDevice(void);
+
+  /*!
+    Private method which returns the index in the devices array to
+    the default output device.
+  */
+  int getDefaultOutputDevice(void);
+
+  //! Private method to clear an RTAUDIO_DEVICE structure.
+  void clearDeviceInfo(RTAUDIO_DEVICE *info);
+
+  /*!
+    Private method which attempts to fill an RTAUDIO_DEVICE
+    structure for a given device.  If an error is encountered during
+    the probe, a "warning" message is reported and the value of
+    "probed" remains false (no exception is thrown).  A successful
+    probe is indicated by probed = true.
+  */
+  void probeDeviceInfo(RTAUDIO_DEVICE *info);
+
+  /*!
+    Private method which attempts to open a device with the given parameters.
+    If an error is encountered during the probe, a "warning" message is
+    reported and FAILURE is returned (no exception is thrown). A
+    successful probe is indicated by a return value of SUCCESS.
+  */
+  bool probeDeviceOpen(int device, RTAUDIO_STREAM *stream,
+                       STREAM_MODE mode, int channels, 
+                       int sampleRate, RTAUDIO_FORMAT format,
+                       int *bufferSize, int numberOfBuffers);
+
+  /*!
+    Private common method used to check validity of a user-passed
+    stream ID.  When the ID is valid, this method returns a pointer to
+    an RTAUDIO_STREAM structure (in the form of a void pointer).
+    Otherwise, an "invalid identifier" exception is thrown.
+  */
+  void *verifyStream(int streamId);
+
+  /*!
+    Private method used to perform format, channel number, and/or interleaving
+    conversions between the user and device buffers.
+  */
+  void convertStreamBuffer(RTAUDIO_STREAM *stream, STREAM_MODE mode);
+
+  //! Private method used to perform byte-swapping on buffers.
+  void byteSwapBuffer(char *buffer, int samples, RTAUDIO_FORMAT format);
+
+  //! Private method which returns the number of bytes for a given format.
+  int formatBytes(RTAUDIO_FORMAT format);
+};
+
+// Define the following flag to have extra information spewed to stderr.
+//#define __RTAUDIO_DEBUG__
+
+#endif

configure.ac

@@ -0,0 +1,68 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT(RtAudio, 2.1, gary@ccrma.stanford.edu, rtaudio)
+AC_CONFIG_SRCDIR(RtAudio.cpp)
+AC_CONFIG_FILES(tests/Makefile)
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX(CC g++ c++ cxx)
+
+# Checks for libraries.
+AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR(RtAudio requires the pthread library!))
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+# Check for debug
+AC_MSG_CHECKING(whether to compile debug version)
+AC_ARG_ENABLE(debug,
+  [  --enable-debug = enable various debug output],
+  [AC_SUBST( debug, [-D__RTAUDIO_DEBUG__] ) AC_SUBST( cflags, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
+  [AC_SUBST( debug, [] ) AC_SUBST( cflags, [-O2] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
+
+# Check compiler and use -Wall if gnu.
+if test $GXX = "yes" ; then
+  AC_SUBST( warn, [-Wall] )
+fi
+
+# Checks for package options and external software
+AC_CANONICAL_HOST
+AC_MSG_CHECKING(for audio API)
+case $host in
+  *-*-linux*)
+  AC_ARG_WITH(alsa, [  --with-alsa = choose native ALSA API support (linux only)], [AC_SUBST( sound_api, [-D__LINUX_ALSA__] ) AC_MSG_RESULT(using ALSA) ], [AC_SUBST( sound_api, [-D__LINUX_OSS__] ) AC_MSG_RESULT(using OSS)])
+
+  if test $sound_api = -D__LINUX_ALSA__; then
+    AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))
+  fi
+  ;;
+
+  *-sgi*)
+  AC_SUBST( sound_api, [-D__IRIX_AL__] )
+  AC_MSG_RESULT(using IRIX AL)
+  AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR(IRIX audio support requires the audio library!) )
+  ;;
+
+  *-apple*)
+  # Check for CoreAudio framework
+  AC_CHECK_HEADER(CoreAudio/CoreAudio.h,
+    [AC_SUBST( sound_api, [-D__MACOSX_CORE__] )],
+    [AC_MSG_ERROR(CoreAudio header files not found!)] )
+  AC_SUBST( frameworks, ["-framework CoreAudio"] )
+  AC_CHECK_LIB(stdc++, printf, , AC_MSG_ERROR(RtAudio requires the C++ library!) )
+  ;;
+
+  *)
+  # Default case for unknown realtime systems.
+  AC_MSG_ERROR(Unknown system type for realtime support!)
+  ;;
+esac
+
+# Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+
+AC_OUTPUT

doc/Release.txt

@@ -1,13 +0,0 @@
-RtAudio - a C++ class which provides a common API for realtime audio input/output across Linux (native ALSA and OSS), SGI, and Windows operating systems.
-
-By Gary P. Scavone, 2002.
-
-
-v2.01: (27 April 2002)
-- Windows destructor bug fix when no devices available
-- RtAudioError class renamed to RtError
-- Preprocessor definitions changed slightly (i.e. __LINUX_OSS_ to __LINUX_OSS__) to conform with new Synthesis ToolKit distribution
-
-v2.0: (22 January 2002)
-- first release of new independent class
-

doc/doxygen/Doxyfile

@@ -1,155 +1,155 @@
-# Doxyfile 1.2.6
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = RtAudio
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = .
-OUTPUT_LANGUAGE        = English
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-INTERNAL_DOCS          = NO
-CLASS_DIAGRAMS         = YES
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-VERBATIM_HEADERS       = YES
-SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = NO
-INHERIT_DOCS           = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-ENABLED_SECTIONS       = 
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-ALIASES                = 
-MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = NO
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = tutorial.txt ../../RtAudio.h
-FILE_PATTERNS          = 
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = ../html
-HTML_HEADER            = header.html
-HTML_FOOTER            = footer.html
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = YES
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = letter
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-GRAPHICAL_HIERARCHY    = YES
-DOT_PATH               = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = search.cgi
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = /usr/local/bin/
-EXT_DOC_PATHS          = 
-
+# Doxyfile 1.2.6
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = RtAudio
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+EXTRACT_ALL            = NO
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+HIDE_UNDOC_MEMBERS     = YES
+HIDE_UNDOC_CLASSES     = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+INTERNAL_DOCS          = NO
+CLASS_DIAGRAMS         = YES
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+VERBATIM_HEADERS       = YES
+SHOW_INCLUDE_FILES     = YES
+JAVADOC_AUTOBRIEF      = NO
+INHERIT_DOCS           = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = NO
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ENABLED_SECTIONS       = 
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+ALIASES                = 
+MAX_INITIALIZER_LINES  = 30
+OPTIMIZE_OUTPUT_FOR_C  = NO
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = tutorial.txt ../../RtAudio.h
+FILE_PATTERNS          = 
+RECURSIVE              = NO
+EXCLUDE                = 
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = ../html
+HTML_HEADER            = header.html
+HTML_FOOTER            = footer.html
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = YES
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = letter
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_PATH               = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
+CGI_NAME               = search.cgi
+CGI_URL                = 
+DOC_URL                = 
+DOC_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/
+EXT_DOC_PATHS          = 
+

doc/doxygen/footer.html

@@ -1,9 +1,9 @@
-<HR>
-
-<table><tr><td><img src="../images/ccrma.gif">
-  <td>&copy;2001-2002 CCRMA, Stanford University. All Rights Reserved.<br>
-  Maintained by Gary P. Scavone, <a href="mailto:gary@ccrma.stanford.edu">gary@ccrma.stanford.edu</a><P>
-</table>
-
-</BODY>
+<HR>
+
+<table><tr><td><img src="../images/ccrma.gif">
+  <td>&copy;2001-2002 Gary P. Scavone, CCRMA, Stanford University. All Rights Reserved.<br>
+  Maintained by Gary P. Scavone, <a href="mailto:gary@ccrma.stanford.edu">gary@ccrma.stanford.edu</a><P>
+</table>
+
+</BODY>
 </HTML>

doc/doxygen/header.html

@@ -1,9 +1,9 @@
-<HTML>
-<HEAD>
-<TITLE>The RtAudio Tutorial</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<a class="qindex" href="index.html">Tutorial</a> &nbsp; <a class="qindex" href="annotated.html">Class/Enum List</a> &nbsp; <a class="qindex" href="files.html">File List</a> &nbsp; <a class="qindex" href="functions.html">Compound Members</a> &nbsp; </CENTER>
+<HTML>
+<HEAD>
+<TITLE>The RtAudio Tutorial</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<a class="qindex" href="index.html">Tutorial</a> &nbsp; <a class="qindex" href="annotated.html">Class/Enum List</a> &nbsp; <a class="qindex" href="files.html">File List</a> &nbsp; <a class="qindex" href="functions.html">Compound Members</a> &nbsp; </CENTER>
 <HR>

doc/release.txt

@@ -0,0 +1,20 @@
+RtAudio - a C++ class which provides a common API for realtime audio input/output across Linux (native ALSA and OSS), SGI, Macintosh OS X (CoreAudio), and Windows (DirectSound and ASIO) operating systems.
+
+By Gary P. Scavone, 2002.
+
+v2.1: (7 October 2002)
+- added Mac OS X CoreAudio support
+- added Windows ASIO support
+- API change to getDeviceInfo(): device argument must be an integer between 1 - getDeviceCount().
+- "configure" support added for unix systems
+- adopted MIT-like license
+- various internal structural changes and bug fixes
+
+v2.01: (27 April 2002)
+- Windows destructor bug fix when no devices available
+- RtAudioError class renamed to RtError
+- Preprocessor definitions changed slightly (i.e. __LINUX_OSS_ to __LINUX_OSS__) to conform with new Synthesis ToolKit distribution
+
+v2.0: (22 January 2002)
+- first release of new independent class
+

tests/call_inout.dsp → tests/DirectSound/call_inout.dsp

@@ -32,8 +32,8 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "call_inout___Win32_Release"
-# PROP BASE Intermediate_Dir "call_inout___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -42,22 +42,22 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "call_inout - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "call_inout___Win32_Debug"
-# PROP BASE Intermediate_Dir "call_inout___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ  /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dsound.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -87,11 +87,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\call_inout.cpp
+SOURCE=..\call_inout.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\RtAudio.cpp
+SOURCE=..\..\RtAudio.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -99,7 +99,7 @@ SOURCE=..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\RtAudio.h
+SOURCE=..\..\RtAudio.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"

tests/DirectSound/call_playtwo.dsp

@@ -0,0 +1,110 @@
+# Microsoft Developer Studio Project File - Name="call_playtwo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=call_playtwo - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "call_playtwo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "call_playtwo.mak" CFG="call_playtwo - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "call_playtwo - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "call_playtwo - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "call_playtwo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "call_playtwo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dsound.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "call_playtwo - Win32 Release"
+# Name "call_playtwo - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\call_playtwo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\RtAudio.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\RtAudio.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

tests/call_saw.dsp → tests/DirectSound/call_saw.dsp

@@ -32,8 +32,8 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "call_saw___Win32_Release"
-# PROP BASE Intermediate_Dir "call_saw___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -42,22 +42,22 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "call_saw - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "call_saw___Win32_Debug"
-# PROP BASE Intermediate_Dir "call_saw___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ  /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dsound.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -87,11 +87,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\call_saw.cpp
+SOURCE=..\call_saw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\RtAudio.cpp
+SOURCE=..\..\RtAudio.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -99,7 +99,7 @@ SOURCE=..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\RtAudio.h
+SOURCE=..\..\RtAudio.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"

tests/call_twostreams.dsp → tests/DirectSound/call_twostreams.dsp

@@ -32,8 +32,8 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "call_twostreams___Win32_Release"
-# PROP BASE Intermediate_Dir "call_twostreams___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -42,22 +42,22 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "call_twostreams - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "call_twostreams___Win32_Debug"
-# PROP BASE Intermediate_Dir "call_twostreams___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ  /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dsound.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -87,11 +87,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\call_twostreams.cpp
+SOURCE=..\call_twostreams.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\RtAudio.cpp
+SOURCE=..\..\RtAudio.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -99,7 +99,7 @@ SOURCE=..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\RtAudio.h
+SOURCE=..\..\RtAudio.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"

tests/in_out.dsp → tests/DirectSound/in_out.dsp

@@ -32,8 +32,8 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "in_out___Win32_Release"
-# PROP BASE Intermediate_Dir "in_out___Win32_Release"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
@@ -42,22 +42,22 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "in_out - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "in_out___Win32_Debug"
-# PROP BASE Intermediate_Dir "in_out___Win32_Debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -65,16 +65,16 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_DS__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ  /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib dsound.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 dsound.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -87,11 +87,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\in_out.cpp
+SOURCE=..\in_out.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\RtAudio.cpp
+SOURCE=..\..\RtAudio.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -99,7 +99,7 @@ SOURCE=..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\RtAudio.h
+SOURCE=..\..\RtAudio.h