Merge 4.0.3 into releases

14 files changed, 144 insertions, 143 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index be9cc8b..ec41447 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,50 +1,54 @@
-### RtAudio tests Makefile - for various flavors of unix
+### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
+### RtAudio tests Makefile - for various flavors of unix and MinGW
 
-PROGRAMS = probe playsaw playraw record duplex testall
+PROGRAMS = audioprobe playsaw playraw record duplex testall
 RM = /bin/rm
-SRC_PATH = ../
-INCLUDE = ../
+SRC_PATH = ..
+INCLUDE = ..
 OBJECT_PATH = @object_path@
 vpath %.o $(OBJECT_PATH)
 
-OBJECTS	=	RtAudio.o
+OBJECTS	=	RtAudio.o @objects@
 
 CC       = @CXX@
 DEFS     = @debug@
 DEFS    += @audio_apis@
 CFLAGS   = @cflags@
-CFLAGS  += @warn@ -I$(INCLUDE)
+CFLAGS  += @warn@ -I$(INCLUDE) -I../include
 LIBRARY  = @LIBS@
 LIBRARY += @frameworks@
 
 %.o : $(SRC_PATH)/%.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
 
+%.o : ../include/%.cpp
+	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
+
 all : $(PROGRAMS)
 
-probe : probe.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o probe probe.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+audioprobe : audioprobe.cpp $(OBJECTS)
+	$(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 playsaw : playsaw.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o playsaw playsaw.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(CFLAGS) $(DEFS) -o playsaw playsaw.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 playraw : playraw.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o playraw playraw.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(CFLAGS) $(DEFS) -o playraw playraw.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 record : record.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 duplex : duplex.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 testall : testall.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o testall testall.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(CFLAGS) $(DEFS) -o testall testall.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 
 clean : 
 	-rm $(OBJECT_PATH)/*.o
 	-rm $(PROGRAMS)
-	-rm -f *.raw *~
+	-rm -f *.raw *~ *.exe
 
 strip : 
 	strip $(PROGRAMS)
diff --git a/tests/Windows/probe.dsp b/tests/Windows/audioprobe.dsp
index d7464a3..679bf9a 100755
--- a/tests/Windows/probe.dsp
+++ b/tests/Windows/audioprobe.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="probe" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="audioprobe" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=probe - Win32 Debug

+CFG=audioprobe - 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 "probe.mak".

+!MESSAGE NMAKE /f "audioprobe.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 "probe.mak" CFG="probe - Win32 Debug"

+!MESSAGE NMAKE /f "audioprobe.mak" CFG="audioprobe - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "probe - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "probe - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "audioprobe - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "audioprobe - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,12 +28,12 @@ CFG=probe - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "probe - Win32 Release"

+!IF  "$(CFG)" == "audioprobe - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "probe___Win32_Release"

-# PROP BASE Intermediate_Dir "probe___Win32_Release"

+# PROP BASE Output_Dir "audioprobe___Win32_Release"

+# PROP BASE Intermediate_Dir "audioprobe___Win32_Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

@@ -42,7 +42,7 @@ 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "__WINDOW_DS__" /D "__WINDOWS_DS__" /D "__WINDOWS_ASIO__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -52,12 +52,12 @@ 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)" == "probe - Win32 Debug"

+!ELSEIF  "$(CFG)" == "audioprobe - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "probe___Win32_Debug"

-# PROP BASE Intermediate_Dir "probe___Win32_Debug"

+# PROP BASE Output_Dir "audioprobe___Win32_Debug"

+# PROP BASE Intermediate_Dir "audioprobe___Win32_Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "__WINDOWS_DS__" /D "__WINDOWS_ASIO__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -80,30 +80,30 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "probe - Win32 Release"

-# Name "probe - Win32 Debug"

+# Name "audioprobe - Win32 Release"

+# Name "audioprobe - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.cpp

+SOURCE=..\audioprobe.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\probe.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/Windows/duplex.dsp b/tests/Windows/duplex.dsp
index 8f34614..c9ba294 100755
--- a/tests/Windows/duplex.dsp
+++ b/tests/Windows/duplex.dsp
@@ -42,7 +42,7 @@ 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 "__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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 "__WINDOWS_ASIO__.__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "__WINDOWS_ASIO__.__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,15 +87,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

@@ -103,7 +103,7 @@ SOURCE=..\duplex.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\iasiothiscallresolver.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\newrtaudio\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/Windows/playraw.dsp b/tests/Windows/playraw.dsp
index 0c31402..849890d 100755
--- a/tests/Windows/playraw.dsp
+++ b/tests/Windows/playraw.dsp
@@ -42,7 +42,7 @@ 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/Windows/playsaw.dsp b/tests/Windows/playsaw.dsp
index 5a755a2..7923c1c 100755
--- a/tests/Windows/playsaw.dsp
+++ b/tests/Windows/playsaw.dsp
@@ -42,7 +42,7 @@ 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/Windows/record.dsp b/tests/Windows/record.dsp
index 526cc87..9ba312c 100755
--- a/tests/Windows/record.dsp
+++ b/tests/Windows/record.dsp
@@ -42,7 +42,7 @@ 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/Windows/rtaudio.dsw b/tests/Windows/rtaudio.dsw
index ee73090..fe5f324 100755
--- a/tests/Windows/rtaudio.dsw
+++ b/tests/Windows/rtaudio.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "duplex"=".\duplex.dsp" - Package Owner=<4>

+Project: "audioprobe"=.\audioprobe.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "playraw"=".\playraw.dsp" - Package Owner=<4>

+Project: "duplex"=.\duplex.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -27,7 +27,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "playsaw"=".\playsaw.dsp" - Package Owner=<4>

+Project: "playraw"=.\playraw.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +39,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "probe"=".\probe.dsp" - Package Owner=<4>

+Project: "playsaw"=.\playsaw.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -51,7 +51,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "record"=".\record.dsp" - Package Owner=<4>

+Project: "record"=.\record.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "testall"=".\testall.dsp" - Package Owner=<4>

+Project: "testall"=.\testall.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/tests/Windows/testall.dsp b/tests/Windows/testall.dsp
index 8824b93..72b6259 100755
--- a/tests/Windows/testall.dsp
+++ b/tests/Windows/testall.dsp
@@ -42,7 +42,7 @@ 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.cpp

+SOURCE=..\..\include\asio.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.cpp

+SOURCE=..\..\include\asiodrivers.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.cpp

+SOURCE=..\..\include\asiolist.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.cpp

+SOURCE=..\..\include\iasiothiscallresolver.cpp

 # End Source File

 # Begin Source File

 

@@ -115,35 +115,35 @@ SOURCE=..\testall.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\asio\asio.h

+SOURCE=..\..\include\asio.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrivers.h

+SOURCE=..\..\include\asiodrivers.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiodrvr.h

+SOURCE=..\..\include\asiodrvr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiolist.h

+SOURCE=..\..\include\asiolist.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\asiosys.h

+SOURCE=..\..\include\asiosys.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\ginclude.h

+SOURCE=..\..\include\ginclude.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiodrv.h

+SOURCE=..\..\include\iasiodrv.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\asio\iasiothiscallresolver.h

+SOURCE=..\..\include\iasiothiscallresolver.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/probe.cpp b/tests/audioprobe.cpp
index e756346..f7246fb 100644
--- a/tests/probe.cpp
+++ b/tests/audioprobe.cpp
@@ -1,6 +1,6 @@
 /******************************************/
 /*
-  probe.cpp
+  audioprobe.cpp
   by Gary P. Scavone, 2001
 
   Probe audio system and prints device info.
diff --git a/tests/duplex.cpp b/tests/duplex.cpp
index 5e63cd7..f416bad 100644
--- a/tests/duplex.cpp
+++ b/tests/duplex.cpp
@@ -56,7 +56,7 @@ int inout( void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
   return 0;
 }
 
-int main(int argc, char *argv[])
+int main( int argc, char *argv[] )
 {
   unsigned int channels, fs, bufferBytes, oDevice = 0, iDevice = 0, iOffset = 0, oOffset = 0;
 
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
   RtAudio adac;
   if ( adac.getDeviceCount() < 1 ) {
     std::cout << "\nNo audio devices found!\n";
-    exit( 0 );
+    exit( 1 );
   }
 
   channels = (unsigned int) atoi(argv[1]);
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
   }
   catch ( RtError& e ) {
     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
-    exit( 0 );
+    exit( 1 );
   }
 
   bufferBytes = bufferFrames * channels * sizeof( MY_TYPE );
diff --git a/tests/playraw.cpp b/tests/playraw.cpp
index 3b70cdb..a9e4db1 100644
--- a/tests/playraw.cpp
+++ b/tests/playraw.cpp
@@ -58,7 +58,7 @@ void usage( void ) {
   std::cout << "    file = the raw file to play,\n";
   std::cout << "    device = optional device to use (default = 0),\n";
   std::cout << "    and channelOffset = an optional channel offset on the device (default = 0).\n\n";
-  exit(0);
+  exit( 0 );
 }
 
 struct OutputData {
@@ -106,13 +106,13 @@ int main( int argc, char *argv[] )
   if ( argc > 4 )
     device = (unsigned int) atoi( argv[4] );
   if ( argc > 5 )
-    offset = (unsigned int) atoi(argv[5]);
+    offset = (unsigned int) atoi( argv[5] );
 
   OutputData data;
   data.fd = fopen( file, "rb" );
   if ( !data.fd ) {
     std::cout << "Unable to find or open file!\n";
-    exit( 0 );
+    exit( 1 );
   }
 
   // Set our stream parameters for output only.
diff --git a/tests/playsaw.cpp b/tests/playsaw.cpp
index cbe4203..c39bcb4 100644
--- a/tests/playsaw.cpp
+++ b/tests/playsaw.cpp
@@ -119,18 +119,17 @@ int main( int argc, char *argv[] )
   RtAudio dac;
   if ( dac.getDeviceCount() < 1 ) {
     std::cout << "\nNo audio devices found!\n";
-    exit( 0 );
+    exit( 1 );
   }
 
-  channels = (unsigned int) atoi(argv[1]);
-  fs = (unsigned int) atoi(argv[2]);
+  channels = (unsigned int) atoi( argv[1] );
+  fs = (unsigned int) atoi( argv[2] );
   if ( argc > 3 )
-    device = (unsigned int) atoi(argv[3]);
+    device = (unsigned int) atoi( argv[3] );
   if ( argc > 4 )
-    offset = (unsigned int) atoi(argv[4]);
+    offset = (unsigned int) atoi( argv[4] );
 
-  double *data;
-  data = (double *) calloc( channels, sizeof( double ) );
+  double *data = (double *) calloc( channels, sizeof( double ) );
 
   // Let RtAudio print messages to stderr.
   dac.showWarnings( true );
@@ -142,7 +141,6 @@ int main( int argc, char *argv[] )
   oParams.nChannels = channels;
   oParams.firstChannel = offset;
 
-
   options.flags |= RTAUDIO_HOG_DEVICE;
 #if !defined( USE_INTERLEAVED )
   options.flags |= RTAUDIO_NONINTERLEAVED;
diff --git a/tests/record.cpp b/tests/record.cpp
index f43db19..7fb1317 100644
--- a/tests/record.cpp
+++ b/tests/record.cpp
@@ -96,7 +96,7 @@ int main( int argc, char *argv[] )
   RtAudio adc;
   if ( adc.getDeviceCount() < 1 ) {
     std::cout << "\nNo audio devices found!\n";
-    exit( 0 );
+    exit( 1 );
   }
 
   channels = (unsigned int) atoi( argv[1] );
@@ -159,7 +159,7 @@ int main( int argc, char *argv[] )
   // Now write the entire data to the file.
   fd = fopen( "record.raw", "wb" );
   fwrite( data.buffer, sizeof( MY_TYPE ), data.totalFrames * channels, fd );
-  fclose(fd);
+  fclose( fd );
 
  cleanup:
   if ( adc.isStreamOpen() ) adc.closeStream();
diff --git a/tests/testall.cpp b/tests/testall.cpp
index af14809..2eeb330 100644
--- a/tests/testall.cpp
+++ b/tests/testall.cpp
@@ -98,18 +98,17 @@ int main( int argc, char *argv[] )
   RtAudio dac;
   if ( dac.getDeviceCount() < 1 ) {
     std::cout << "\nNo audio devices found!\n";
-    exit( 0 );
+    exit( 1 );
   }
 
-  channels = (unsigned int) atoi(argv[1]);
-  fs = (unsigned int) atoi(argv[2]);
+  channels = (unsigned int) atoi( argv[1] );
+  fs = (unsigned int) atoi( argv[2] );
   if ( argc > 3 )
-    device = (unsigned int) atoi(argv[3]);
+    device = (unsigned int) atoi( argv[3] );
   if ( argc > 4 )
-    offset = (unsigned int) atoi(argv[4]);
+    offset = (unsigned int) atoi( argv[4] );
 
-  double *data;
-  data = (double *) calloc( channels, sizeof( double ) );
+  double *data = (double *) calloc( channels, sizeof( double ) );
 
   // Let RtAudio print messages to stderr.
   dac.showWarnings( true );