Check for '#if defined( WIN32 )' in test apps

[rtaudio-cdist.git] / tests / playraw.cpp

diff --git a/tests/playraw.cpp b/tests/playraw.cpp
index 13e8b4909869c6e1bb3c38cfe39d6b35d71ba0f7..0216f4af0216c201f9bdf6749324a35e9739cb0a 100644 (file)
--- a/tests/playraw.cpp
+++ b/tests/playraw.cpp
@@ -11,6 +11,9 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <stdio.h>
 
 /*
 typedef char  MY_TYPE;
@@ -23,11 +26,11 @@ typedef signed short  MY_TYPE;
 #define SCALE  32767.0
 
 /*
-typedef signed long  MY_TYPE;
+typedef S24 MY_TYPE;
 #define FORMAT RTAUDIO_SINT24
 #define SCALE  8388607.0
 
-typedef signed long  MY_TYPE;
+typedef signed int  MY_TYPE;
 #define FORMAT RTAUDIO_SINT32
 #define SCALE  2147483647.0
 
@@ -41,7 +44,7 @@ typedef double  MY_TYPE;
 */
 
 // Platform-dependent sleep routines.
-#if defined( __WINDOWS_ASIO__ ) || defined( __WINDOWS_DS__ )
+#if defined( WIN32 )
   #include <windows.h>
   #define SLEEP( milliseconds ) Sleep( (DWORD) milliseconds ) 
 #else // Unix variants
@@ -67,8 +70,8 @@ struct OutputData {
 };
 
 // Interleaved buffers
-int output( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
-            double streamTime, RtAudioStreamStatus status, void *data )
+int output( void *outputBuffer, void * /*inputBuffer*/, unsigned int nBufferFrames,
+            double /*streamTime*/, RtAudioStreamStatus /*status*/, void *data )
 {
   OutputData *oData = (OutputData*) data;
 
@@ -122,12 +125,15 @@ int main( int argc, char *argv[] )
   oParams.nChannels = channels;
   oParams.firstChannel = offset;
 
+  if ( device == 0 )
+    oParams.deviceId = dac.getDefaultOutputDevice();
+
   data.channels = channels;
   try {
     dac.openStream( &oParams, NULL, FORMAT, fs, &bufferFrames, &output, (void *)&data );
     dac.startStream();
   }
-  catch ( RtError& e ) {
+  catch ( RtAudioError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
     goto cleanup;
   }