Version 3.0

44 files changed, 618 insertions, 1766 deletions

diff --git a/tests/DirectSound/play_saw.dsp b/tests/DirectSound/play_saw.dsp
deleted file mode 100755
index bbe59b4..0000000
--- a/tests/DirectSound/play_saw.dsp
+++ /dev/null
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="play_saw" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=play_saw - 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 "play_saw.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 "play_saw.mak" CFG="play_saw - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "play_saw - 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)" == "play_saw - 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)" == "play_saw - 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 "play_saw - Win32 Release"

-# Name "play_saw - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\play_saw.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

diff --git a/tests/DirectSound/rtaudio.dsw b/tests/DirectSound/rtaudio.dsw
deleted file mode 100755
index f276a43..0000000
--- a/tests/DirectSound/rtaudio.dsw
+++ /dev/null
@@ -1,137 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3bacb8c..54f4d4a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 ### RtAudio tests Makefile - for various flavors of unix
 
-PROGRAMS = info play_saw record_raw in_out play_raw twostreams call_saw call_inout call_twostreams call_playtwo
+PROGRAMS = info play_saw record_raw in_out play_raw twostreams call_saw call_inout
 RM = /bin/rm
 SRC_PATH = ../
 INCLUDE = ../
@@ -11,7 +11,7 @@ OBJECTS	=	RtAudio.o
 
 CC       = @CXX@
 DEFS     = @debug@
-DEFS    += @sound_api@
+DEFS    += @audio_apis@
 CFLAGS   = @cflags@
 CFLAGS  += @warn@ -I$(INCLUDE)
 LIBRARY  = @LIBS@
@@ -46,12 +46,6 @@ call_saw : call_saw.cpp $(OBJECTS)
 call_inout : call_inout.cpp $(OBJECTS)
 	$(CC) $(CFLAGS) $(DEFS) -o call_inout call_inout.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
-call_twostreams : call_twostreams.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o call_twostreams call_twostreams.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
-
-call_playtwo : call_playtwo.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o call_playtwo call_playtwo.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
-
 clean : 
 	-rm $(OBJECT_PATH)/*.o
 	-rm $(PROGRAMS)
diff --git a/tests/DirectSound/Debug/.placeholder b/tests/Windows/Debug/.placeholder
index e69de29..e69de29 100644
--- a/tests/DirectSound/Debug/.placeholder
+++ b/tests/Windows/Debug/.placeholder
diff --git a/tests/DirectSound/Release/.placeholder b/tests/Windows/Release/.placeholder
index e69de29..e69de29 100644
--- a/tests/DirectSound/Release/.placeholder
+++ b/tests/Windows/Release/.placeholder
diff --git a/tests/asio/asio.cpp b/tests/Windows/asio.cpp
index b241663..b241663 100644
--- a/tests/asio/asio.cpp
+++ b/tests/Windows/asio.cpp
diff --git a/tests/asio/asio.h b/tests/Windows/asio.h
index 3003130..3003130 100644
--- a/tests/asio/asio.h
+++ b/tests/Windows/asio.h
diff --git a/tests/asio/asiodrivers.cpp b/tests/Windows/asiodrivers.cpp
index 5f56454..5f56454 100644
--- a/tests/asio/asiodrivers.cpp
+++ b/tests/Windows/asiodrivers.cpp
diff --git a/tests/asio/asiodrivers.h b/tests/Windows/asiodrivers.h
index 2ddf7ad..2ddf7ad 100644
--- a/tests/asio/asiodrivers.h
+++ b/tests/Windows/asiodrivers.h
diff --git a/tests/asio/asiodrvr.h b/tests/Windows/asiodrvr.h
index 663f75a..663f75a 100644
--- a/tests/asio/asiodrvr.h
+++ b/tests/Windows/asiodrvr.h
diff --git a/tests/asio/asiolist.cpp b/tests/Windows/asiolist.cpp
index 5a62f5b..5a62f5b 100644
--- a/tests/asio/asiolist.cpp
+++ b/tests/Windows/asiolist.cpp
diff --git a/tests/asio/asiolist.h b/tests/Windows/asiolist.h
index 01c64f0..01c64f0 100644
--- a/tests/asio/asiolist.h
+++ b/tests/Windows/asiolist.h
diff --git a/tests/asio/asiosys.h b/tests/Windows/asiosys.h
index 37f7a48..37f7a48 100644
--- a/tests/asio/asiosys.h
+++ b/tests/Windows/asiosys.h
diff --git a/tests/DirectSound/call_inout.dsp b/tests/Windows/call_inout.dsp
index fdebf94..6af5e2e 100755..100644
--- a/tests/DirectSound/call_inout.dsp
+++ b/tests/Windows/call_inout.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\call_inout.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/DirectSound/call_playtwo.dsp b/tests/Windows/call_playtwo.dsp
index 1c9966b..1c9966b 100755..100644
--- a/tests/DirectSound/call_playtwo.dsp
+++ b/tests/Windows/call_playtwo.dsp
diff --git a/tests/DirectSound/call_saw.dsp b/tests/Windows/call_saw.dsp
index 1e3b866..8db91ca 100755..100644
--- a/tests/DirectSound/call_saw.dsp
+++ b/tests/Windows/call_saw.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\call_saw.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/DirectSound/call_twostreams.dsp b/tests/Windows/call_twostreams.dsp
index 16da2e5..16da2e5 100755..100644
--- a/tests/DirectSound/call_twostreams.dsp
+++ b/tests/Windows/call_twostreams.dsp
diff --git a/tests/asio/ginclude.h b/tests/Windows/ginclude.h
index b627dc2..b627dc2 100644
--- a/tests/asio/ginclude.h
+++ b/tests/Windows/ginclude.h
diff --git a/tests/asio/iasiodrv.h b/tests/Windows/iasiodrv.h
index 64d2dbb..64d2dbb 100644
--- a/tests/asio/iasiodrv.h
+++ b/tests/Windows/iasiodrv.h
diff --git a/tests/DirectSound/in_out.dsp b/tests/Windows/in_out.dsp
index f8585e6..4113ca1 100755..100644
--- a/tests/DirectSound/in_out.dsp
+++ b/tests/Windows/in_out.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\in_out.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/DirectSound/info.dsp b/tests/Windows/info.dsp
index 3bf97c6..02facd8 100755..100644
--- a/tests/DirectSound/info.dsp
+++ b/tests/Windows/info.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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)" == "info - Win32 Debug"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\info.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/DirectSound/play_raw.dsp b/tests/Windows/play_raw.dsp
index 7915897..5f3eba9 100755..100644
--- a/tests/DirectSound/play_raw.dsp
+++ b/tests/Windows/play_raw.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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)" == "play_raw - Win32 Debug"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\play_raw.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/asio/play_saw.dsp b/tests/Windows/play_saw.dsp
index 7aab9f1..92bff12 100755..100644
--- a/tests/asio/play_saw.dsp
+++ b/tests/Windows/play_saw.dsp
@@ -39,9 +39,10 @@ RSC=rc.exe
 # 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 /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /YX /FD /c

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

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

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

 BSC32=bscmake.exe

@@ -49,7 +50,7 @@ BSC32=bscmake.exe
 # 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 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)" == "play_saw - Win32 Debug"

 

@@ -62,9 +63,10 @@ LINK32=link.exe
 # 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /D "__RTAUDIO_DEBUG__" /YX /FD /GZ /c

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

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

 BSC32=bscmake.exe

@@ -72,7 +74,7 @@ BSC32=bscmake.exe
 # 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 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 

 

diff --git a/tests/DirectSound/record_raw.dsp b/tests/Windows/record_raw.dsp
index 18e66bc..65f8285 100755..100644
--- a/tests/DirectSound/record_raw.dsp
+++ b/tests/Windows/record_raw.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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)" == "record_raw - Win32 Debug"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,6 +87,18 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\record_raw.cpp

 # End Source File

 # Begin Source File

@@ -99,6 +111,34 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/asio/rtaudio.dsw b/tests/Windows/rtaudio.dsw
index c070e92..26b9d4f 100755..100644
--- a/tests/asio/rtaudio.dsw
+++ b/tests/Windows/rtaudio.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

@@ -75,7 +75,19 @@ Package=<4>
 

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

 

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

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

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

 

 Package=<5>

 {{{

diff --git a/tests/DirectSound/twostreams.dsp b/tests/Windows/twostreams.dsp
index 54c9bc6..9e67e02 100755..100644
--- a/tests/DirectSound/twostreams.dsp
+++ b/tests/Windows/twostreams.dsp
@@ -42,14 +42,14 @@ 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__" /D "__WINDOWS_ASIO__" /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)" == "twostreams - Win32 Debug"

@@ -65,15 +65,15 @@ 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__" /D "__RTAUDIO_DEBUG__" /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 "__WINDOWS_ASIO__" /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 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,18 +87,58 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\twostreams.cpp

+SOURCE=.\asio.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=..\..\RtAudio.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=..\twostreams.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=.\asio.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrivers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiodrvr.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiolist.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\asiosys.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ginclude.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iasiodrv.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\RtAudio.h

 # End Source File

 # End Group

diff --git a/tests/asio/Debug/.placeholder b/tests/asio/Debug/.placeholder
deleted file mode 100644
index e69de29..0000000
--- a/tests/asio/Debug/.placeholder
+++ /dev/null
diff --git a/tests/asio/Release/.placeholder b/tests/asio/Release/.placeholder
deleted file mode 100644
index e69de29..0000000
--- a/tests/asio/Release/.placeholder
+++ /dev/null
diff --git a/tests/asio/call_inout.dsp b/tests/asio/call_inout.dsp
deleted file mode 100755
index 97cc4d9..0000000
--- a/tests/asio/call_inout.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="call_inout" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=call_inout - 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_inout.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_inout.mak" CFG="call_inout - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "call_inout - 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_inout - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "call_inout - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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_inout - Win32 Release"

-# Name "call_inout - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\call_inout.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/asio/call_saw.dsp b/tests/asio/call_saw.dsp
deleted file mode 100755
index 09fff2d..0000000
--- a/tests/asio/call_saw.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="call_saw" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=call_saw - 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_saw.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_saw.mak" CFG="call_saw - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "call_saw - 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_saw - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "call_saw - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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_saw - Win32 Release"

-# Name "call_saw - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\call_saw.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/asio/in_out.dsp b/tests/asio/in_out.dsp
deleted file mode 100755
index a1036bc..0000000
--- a/tests/asio/in_out.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="in_out" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=in_out - 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 "in_out.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 "in_out.mak" CFG="in_out - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "in_out - 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)" == "in_out - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "in_out - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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 "in_out - Win32 Release"

-# Name "in_out - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\in_out.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/asio/info.dsp b/tests/asio/info.dsp
deleted file mode 100755
index 1d18051..0000000
--- a/tests/asio/info.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="info" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=info - 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 "info.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 "info.mak" CFG="info - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "info - 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)" == "info - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "info - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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 "info - Win32 Release"

-# Name "info - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\info.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/asio/play_raw.dsp b/tests/asio/play_raw.dsp
deleted file mode 100755
index 96ddffb..0000000
--- a/tests/asio/play_raw.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="play_raw" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=play_raw - 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 "play_raw.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 "play_raw.mak" CFG="play_raw - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "play_raw - 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)" == "play_raw - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "play_raw - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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 "play_raw - Win32 Release"

-# Name "play_raw - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\play_raw.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/asio/record_raw.dsp b/tests/asio/record_raw.dsp
deleted file mode 100755
index f39827a..0000000
--- a/tests/asio/record_raw.dsp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Microsoft Developer Studio Project File - Name="record_raw" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=record_raw - 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 "record_raw.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 "record_raw.mak" CFG="record_raw - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "record_raw - 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)" == "record_raw - 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 Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../" /D "NDEBUG" /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

-# 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  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

-

-!ELSEIF  "$(CFG)" == "record_raw - 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 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 /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /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  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 "record_raw - Win32 Release"

-# Name "record_raw - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\asio.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\record_raw.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=.\asio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrivers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiodrvr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiolist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\asiosys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ginclude.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iasiodrv.h

-# End Source File

-# 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

diff --git a/tests/call_inout.cpp b/tests/call_inout.cpp
index 787a856..e941e1e 100644
--- a/tests/call_inout.cpp
+++ b/tests/call_inout.cpp
@@ -1,6 +1,6 @@
 /******************************************/
 /*
-  call_inout.c
+  call_inout.cpp
   by Gary P. Scavone, 2001
 
   Records from default input and passes it
@@ -11,36 +11,36 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 */
 
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 
 void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: call_inout N fs device\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: call_inout N fs device\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
@@ -52,7 +52,7 @@ int inout(char *buffer, int buffer_size, void *)
 
 int main(int argc, char *argv[])
 {
-  int stream, chans, fs, device = 0;
+  int chans, fs, device = 0;
   RtAudio *audio;
   char input;
 
@@ -67,32 +67,35 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   int buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, device, chans, device, chans,
+    audio = new RtAudio(device, chans, device, chans,
                         FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   try {
-    audio->setStreamCallback(stream, &inout, NULL);
-    audio->startStream(stream);
+    audio->setStreamCallback(&inout, NULL);
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nRunning ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
-  cin.get(input);
+  std::cout << "\nRunning ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
+  std::cin.get(input);
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
 
   return 0;
diff --git a/tests/call_playtwo.cpp b/tests/call_playtwo.cpp
deleted file mode 100644
index 4364262..0000000
--- a/tests/call_playtwo.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/******************************************/
-/*
-  call_playtwo.cpp
-  by Gary P. Scavone, 2002.
-
-  Test executable using two streams with
-  callbacks.
-*/
-/******************************************/
-
-#include "RtAudio.h"
-#include <iostream.h>
-
-/*
-typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
-#define SCALE  2147483647.0
-
-typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
-#define SCALE  127.0
-
-typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
-#define SCALE  32767.0
-
-typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
-#define SCALE  2147483647.0
-
-typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
-#define SCALE  1.0
-*/
-
-typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
-#define SCALE  1.0
-#define BASE_RATE1 0.005
-#define BASE_RATE2 0.004
-
-void usage(void) {
-  /* Error function in case of incorrect command-line
-     argument specifications
-  */
-  cout << "\nuseage: call_twostreams N fs\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    and fs = the sample rate.\n\n";
-  exit(0);
-}
-
-int chans;
-
-int saw1(char *buffer, int buffer_size, void *data)
-{
-  int i, j;
-  extern int chans;
-  MY_TYPE *my_buffer = (MY_TYPE *) buffer;
-  double *my_data = (double *) data;
-
-  for (i=0; i<buffer_size; i++) {
-    for (j=0; j<chans; j++) {
-      *my_buffer++ = (MY_TYPE) (my_data[j] * SCALE);
-      my_data[j] += BASE_RATE1 * (j+1+(j*0.1));
-      if (my_data[j] >= 1.0) my_data[j] -= 2.0;
-    }
-  }
-
-  return 0;
-}
-
-int saw2(char *buffer, int buffer_size, void *data)
-{
-  int i, j;
-  extern int chans;
-  MY_TYPE *my_buffer = (MY_TYPE *) buffer;
-  double *my_data = (double *) data;
-
-  for (i=0; i<buffer_size; i++) {
-    for (j=0; j<chans; j++) {
-      *my_buffer++ = (MY_TYPE) (my_data[j] * SCALE);
-      my_data[j] += BASE_RATE2 * (j+1+(j*0.1));
-      if (my_data[j] >= 1.0) my_data[j] -= 2.0;
-    }
-  }
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  int device, buffer_size, stream1 = 0, stream2 = 0, fs;
-  double *data1 = 0;
-  double *data2 = 0;
-  RtAudio *audio;
-  char input;
-
-  // minimal command-line checking
-  if (argc != 3) usage();
-
-  chans = (int) atoi(argv[1]);
-  fs = (int) atoi(argv[2]);
-
-  // Open the realtime output device
-  buffer_size = 512;
-  device = 0; // default device
-  try {
-    audio = new RtAudio();
-  }
-  catch (RtError &) {
-    exit(EXIT_FAILURE);
-  }
-
-  try {
-    stream1 = audio->openStream(device, chans, 0, 0,
-                                FORMAT, fs, &buffer_size, 8);
-    stream2 = audio->openStream(device, chans, 0, 0,
-                                FORMAT, fs, &buffer_size, 8);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  data1 = (double *) calloc(chans, sizeof(double));
-  data2 = (double *) calloc(chans, sizeof(double));
-
-  try {
-    audio->setStreamCallback(stream1, &saw1, (void *)data1);
-    audio->setStreamCallback(stream2, &saw2, (void *)data2);
-    audio->startStream(stream1);
-    audio->startStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nRunning two streams ... press <enter> to quit.\n";
-  cin.get(input);
-
-  cout << "\nStopping both streams.\n";
-  try {
-    audio->stopStream(stream1);
-    audio->stopStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nPress <enter> to restart streams:\n";
-  cin.get(input);
-
-  try {
-    audio->startStream(stream1);
-    audio->startStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nRunning two streams (quasi-duplex) ... press <enter> to quit.\n";
-  cin.get(input);
-
-  try {
-    audio->stopStream(stream1);
-    audio->stopStream(stream2);
-  }
-  catch (RtError &) {
-  }
-
- cleanup:
-  audio->closeStream(stream1);
-  audio->closeStream(stream2);
-  delete audio;
-  if (data1) free(data1);
-  if (data2) free(data2);
-
-  return 0;
-}
diff --git a/tests/call_saw.cpp b/tests/call_saw.cpp
index fa1ca65..57f225c 100644
--- a/tests/call_saw.cpp
+++ b/tests/call_saw.cpp
@@ -10,32 +10,32 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 #define SCALE  2147483647.0
 
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 #define SCALE  127.0
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 #define SCALE  32767.0
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 #define SCALE  2147483647.0
 */
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 #define SCALE  1.0
 
 /*
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 #define SCALE  1.0
 */
 
@@ -46,10 +46,10 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: call_saw N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: call_saw N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
@@ -75,7 +75,7 @@ int saw(char *buffer, int buffer_size, void *data)
 
 int main(int argc, char *argv[])
 {
-  int stream, buffer_size, fs, device = 0;
+  int buffer_size, fs, device = 0;
   RtAudio *audio;
   double *data;
   char input;
@@ -91,35 +91,38 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 1024;
   try {
-    audio = new RtAudio(&stream, device, chans, 0, 0,
+    audio = new RtAudio(device, chans, 0, 0,
                         FORMAT, fs, &buffer_size, 4);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   data = (double *) calloc(chans, sizeof(double));
 
   try {
-    audio->setStreamCallback(stream, &saw, (void *)data);
-    audio->startStream(stream);
+    audio->setStreamCallback(&saw, (void *)data);
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nPlaying ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
-  cin.get(input);
+  std::cout << "\nPlaying ... press <enter> to quit (buffer size = " << buffer_size << ").\n";
+  std::cin.get(input);
 
   // Stop the stream.
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
   if (data) free(data);
 
diff --git a/tests/call_twostreams.cpp b/tests/call_twostreams.cpp
deleted file mode 100644
index 4af0eac..0000000
--- a/tests/call_twostreams.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/******************************************/
-/*
-  twostreams.cpp
-  by Gary P. Scavone, 2001
-
-  Test executable using two streams with
-  callbacks.
-*/
-/******************************************/
-
-#include "RtAudio.h"
-#include <iostream.h>
-
-/*
-typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
-#define SCALE  2147483647.0
-
-typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
-#define SCALE  127.0
-
-typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
-#define SCALE  32767.0
-
-typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
-#define SCALE  2147483647.0
-
-typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
-#define SCALE  1.0
-*/
-
-typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
-#define SCALE  1.0
-
-void usage(void) {
-  /* Error function in case of incorrect command-line
-     argument specifications
-  */
-  cout << "\nuseage: call_twostreams N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
-  exit(0);
-}
-
-int chans;
-
-int in(char *buffer, int buffer_size, void *data)
-{
-  extern int chans;
-  MY_TYPE *my_buffer = (MY_TYPE *) buffer;
-  MY_TYPE *my_data = (MY_TYPE *) data;
-  long buffer_bytes = buffer_size * chans * sizeof(MY_TYPE);
-
-  memcpy(my_data, my_buffer, buffer_bytes);
-
-  return 0;
-}
-
-int out(char *buffer, int buffer_size, void *data)
-{
-  extern int chans;
-  MY_TYPE *my_buffer = (MY_TYPE *) buffer;
-  MY_TYPE *my_data = (MY_TYPE *) data;
-  long buffer_bytes = buffer_size * chans * sizeof(MY_TYPE);
-
-  memcpy(my_buffer, my_data, buffer_bytes);
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  int buffer_size, stream1 = 0, stream2 = 0, fs, device = 0;
-  MY_TYPE *data = 0;
-  RtAudio *audio;
-  char input;
-
-  // minimal command-line checking
-  if (argc != 3 && argc != 4 ) usage();
-
-  chans = (int) atoi(argv[1]);
-  fs = (int) atoi(argv[2]);
-  if ( argc == 4 )
-    device = (int) atoi(argv[3]);
-
-  // Open the realtime output device
-  buffer_size = 512;
-  try {
-    audio = new RtAudio();
-  }
-  catch (RtError &) {
-    exit(EXIT_FAILURE);
-  }
-
-  try {
-    stream1 = audio->openStream(0, 0, device, chans,
-                                FORMAT, fs, &buffer_size, 8);
-    stream2 = audio->openStream(device, chans, 0, 0,
-                                FORMAT, fs, &buffer_size, 8);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  data = (MY_TYPE *) calloc(chans*buffer_size, sizeof(MY_TYPE));
-  try {
-    audio->setStreamCallback(stream1, &in, (void *)data);
-    audio->setStreamCallback(stream2, &out, (void *)data);
-    audio->startStream(stream1);
-    audio->startStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nRunning two streams (quasi-duplex) ... press <enter> to quit.\n";
-  cin.get(input);
-
-  cout << "\nStopping both streams.\n";
-  try {
-    audio->stopStream(stream1);
-    audio->stopStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nPress <enter> to restart streams:\n";
-  cin.get(input);
-
-  try {
-    audio->startStream(stream1);
-    audio->startStream(stream2);
-  }
-  catch (RtError &) {
-    goto cleanup;
-  }
-
-  cout << "\nRunning two streams (quasi-duplex) ... press <enter> to quit.\n";
-  cin.get(input);
-
-  try {
-    audio->stopStream(stream1);
-    audio->stopStream(stream2);
-  }
-  catch (RtError &) {
-  }
-
- cleanup:
-  audio->closeStream(stream1);
-  audio->closeStream(stream2);
-  delete audio;
-  if (data) free(data);
-
-  return 0;
-}
diff --git a/tests/in_out.cpp b/tests/in_out.cpp
index 053f620..bba4d73 100644
--- a/tests/in_out.cpp
+++ b/tests/in_out.cpp
@@ -11,27 +11,27 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 */
 
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 
 #define TIME   4.0
 
@@ -39,16 +39,16 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: in_out N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: in_out N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, stream, device = 0;
+  int chans, fs, buffer_size, device = 0;
   long frames, counter = 0;
   MY_TYPE *buffer;
   RtAudio *audio;
@@ -64,43 +64,47 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, device, chans, device, chans,
+    audio = new RtAudio(device, chans, device, chans,
                         FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   frames = (long) (fs * TIME);
 
   try {
-    buffer = (MY_TYPE *) audio->getStreamBuffer(stream);
-    audio->startStream(stream);
+    buffer = (MY_TYPE *) audio->getStreamBuffer();
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nRunning for " << TIME << " seconds ... fragment_size = " << buffer_size << endl;
+  std::cout << "\nRunning for " << TIME << " seconds ... fragment_size = " << buffer_size << std::endl;
   while (counter < frames) {
 
     try {
-      audio->tickStream(stream);
+      audio->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
     counter += buffer_size;
   }
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
 
   return 0;
diff --git a/tests/info.cpp b/tests/info.cpp
index fdde049..81a4234 100644
--- a/tests/info.cpp
+++ b/tests/info.cpp
@@ -8,61 +8,70 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 int main(int argc, char *argv[])
 {
   RtAudio *audio;
-  RtAudio::RTAUDIO_DEVICE my_info;
+  RtAudioDeviceInfo info;
   try {
     audio = new RtAudio();
   }
-  catch (RtError &m) {
-    m.printMessage();
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   int devices = audio->getDeviceCount();
-  cout << "\nFound " << devices << " devices ...\n";
+  std::cout << "\nFound " << devices << " device(s) ...\n";
 
   for (int i=1; i<=devices; i++) {
     try {
-      audio->getDeviceInfo(i, &my_info);
+      info = audio->getDeviceInfo(i);
     }
-    catch (RtError &m) {
-      m.printMessage();
+    catch (RtError &error) {
+      error.printMessage();
       break;
     }
 
-    cout << "\nname = " << my_info.name << '\n';
-    if (my_info.probed == true) {
-      cout << "probe successful\n";
-      cout << "maxOutputChans = " << my_info.maxOutputChannels << '\n';
-      cout << "minOutputChans = " << my_info.minOutputChannels << '\n';
-      cout << "maxInputChans = " << my_info.maxInputChannels << '\n';
-      cout << "minInputChans = " << my_info.minInputChannels << '\n';
-      cout << "maxDuplexChans = " << my_info.maxDuplexChannels << '\n';
-      cout << "minDuplexChans = " << my_info.minDuplexChannels << '\n';
-      if (my_info.hasDuplexSupport) cout << "duplex support = true\n";
-      else cout << "duplex support = false\n";
-      if (my_info.isDefault) cout << "is default device = true\n";
-      else cout << "is default device = false\n";
-      cout << "format = " << my_info.nativeFormats << '\n';
-      if (my_info.nSampleRates == -1) {
-        cout << "min_srate = " << my_info.sampleRates[0];
-        cout << ", max_srate = " << my_info.sampleRates[1] << '\n';
+    std::cout << "\nDevice Name = " << info.name << '\n';
+    if (info.probed == false)
+      std::cout << "Probe Status = UNsuccessful\n";
+    else {
+      std::cout << "Probe Status = Successful\n";
+      std::cout << "Output Channels = " << info.outputChannels << '\n';
+      std::cout << "Input Channels = " << info.inputChannels << '\n';
+      std::cout << "Duplex Channels = " << info.duplexChannels << '\n';
+      if (info.isDefault) std::cout << "This is the default device.\n";
+      else std::cout << "This is NOT the default device.\n";
+      if ( info.nativeFormats == 0 )
+        std::cout << "No natively supported data formats(?)!";
+      else {
+        std::cout << "Natively supported data formats:\n";
+        if ( info.nativeFormats & RTAUDIO_SINT8 )
+          std::cout << "  8-bit int\n";
+        if ( info.nativeFormats & RTAUDIO_SINT16 )
+          std::cout << "  16-bit int\n";
+        if ( info.nativeFormats & RTAUDIO_SINT24 )
+          std::cout << "  24-bit int\n";
+        if ( info.nativeFormats & RTAUDIO_SINT32 )
+          std::cout << "  32-bit int\n";
+        if ( info.nativeFormats & RTAUDIO_FLOAT32 )
+          std::cout << "  32-bit float\n";
+        if ( info.nativeFormats & RTAUDIO_FLOAT64 )
+          std::cout << "  64-bit float\n";
       }
+      if ( info.sampleRates.size() < 1 )
+        std::cout << "No supported sample rates found!";
       else {
-        cout << "sample rates = ";
-        for (int j=0; j<my_info.nSampleRates; j++)
-          cout << my_info.sampleRates[j] << " ";
-        cout << endl;
+        std::cout << "Supported sample rates = ";
+        for (unsigned int j=0; j<info.sampleRates.size(); j++)
+          std::cout << info.sampleRates[j] << " ";
       }
+      std::cout << std::endl;
     }
-    else
-      cout << "probe unsuccessful\n";
   }
-  cout << endl;
+  std::cout << std::endl;
 
   delete audio;
   return 0;
diff --git a/tests/play_raw.cpp b/tests/play_raw.cpp
index f103474..fcc921f 100644
--- a/tests/play_raw.cpp
+++ b/tests/play_raw.cpp
@@ -10,34 +10,34 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 #include <stdio.h>
 
 /*
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 #define SCALE  127.0
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 #define SCALE  32767.0
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 #define SCALE  8388607.0
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 #define SCALE  2147483647.0
 */
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 #define SCALE  1.0;
 
 /*
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 #define SCALE  1.0;
 */
 
@@ -45,17 +45,17 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: play_raw N fs file <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate, \n";
-  cout << "    file = the raw file to play,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: play_raw N fs file <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate, \n";
+  std::cout << "    file = the raw file to play,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, count, stream, device = 0;
+  int chans, fs, buffer_size, count, device = 0;
   long counter = 0;
   MY_TYPE *buffer;
   char *file;
@@ -73,26 +73,28 @@ int main(int argc, char *argv[])
 
   fd = fopen(file,"rb");
   if (!fd) {
-    cout << "can't find file!\n";
+    std::cout << "can't find file!\n";
     exit(0);
   }
 
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, device, chans, 0, 0,
+    audio = new RtAudio(device, chans, 0, 0,
                         FORMAT, fs, &buffer_size, 2);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
     fclose(fd);
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   try {
-    buffer = (MY_TYPE *) audio->getStreamBuffer(stream);
-    audio->startStream(stream);
+    buffer = (MY_TYPE *) audio->getStreamBuffer();
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
@@ -101,9 +103,10 @@ int main(int argc, char *argv[])
 
     if (count == buffer_size) {
       try {
-        audio->tickStream(stream);
+        audio->tickStream();
       }
-      catch (RtError &) {
+      catch (RtError &error) {
+        error.printMessage();
         goto cleanup;
       }
     }
@@ -114,13 +117,14 @@ int main(int argc, char *argv[])
   }
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
   fclose(fd);
 
diff --git a/tests/play_saw.cpp b/tests/play_saw.cpp
index d028be5..4b2cbdd 100644
--- a/tests/play_saw.cpp
+++ b/tests/play_saw.cpp
@@ -10,57 +10,56 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 #define SCALE  2147483647.0
-*/
 
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 #define SCALE  127.0
+*/
 
-/*
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 #define SCALE  32767.0
 
-
+/*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 #define SCALE  2147483647.0
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 #define SCALE  1.0
 
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 #define SCALE  1.0
 */
 
 #define BASE_RATE 0.005
-#define TIME   1.0
+#define TIME   4.0
 
 void usage(void) {
   // Error function in case of incorrect command-line
   // argument specifications.
-  cout << "\nuseage: play_saw N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: play_saw N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, stream, device = 0;
+  int chans, fs, buffer_size, device = 0;
   long frames, counter = 0, i, j;
   MY_TYPE *buffer;
   RtAudio *audio;
-  double *data;
+  double *data = 0;
 
   // minimal command-line checking
   if (argc != 3 && argc != 4 ) usage();
@@ -73,10 +72,11 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, device, chans, 0, 0,
+    audio = new RtAudio(device, chans, 0, 0,
                         FORMAT, fs, &buffer_size, 4);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
@@ -84,14 +84,15 @@ int main(int argc, char *argv[])
   data = (double *) calloc(chans, sizeof(double));
 
   try {
-    buffer = (MY_TYPE *) audio->getStreamBuffer(stream);
-    audio->startStream(stream);
+    buffer = (MY_TYPE *) audio->getStreamBuffer();
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nPlaying for " << TIME << " seconds ... buffer size = " << buffer_size << "." << endl;
+  std::cout << "\nPlaying for " << TIME << " seconds ... buffer size = " << buffer_size << "." << std::endl;
   while (counter < frames) {
     for (i=0; i<buffer_size; i++) {
       for (j=0; j<chans; j++) {
@@ -102,10 +103,10 @@ int main(int argc, char *argv[])
     }
 
     try {
-      //cout << "frames until no block = " << audio->streamWillBlock(stream) << endl;
-      audio->tickStream(stream);
+      audio->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
@@ -113,13 +114,14 @@ int main(int argc, char *argv[])
   }
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
   if (data) free(data);
 
diff --git a/tests/record_raw.cpp b/tests/record_raw.cpp
index 1b79644..717ce2c 100644
--- a/tests/record_raw.cpp
+++ b/tests/record_raw.cpp
@@ -10,29 +10,29 @@
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
+#include <iostream>
 #include <stdio.h>
 
 /*
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 */
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 
 /*
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 */
 
 #define TIME   2.0
@@ -41,16 +41,16 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: record_raw N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: record_raw N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, stream, device = 0;
+  int chans, fs, buffer_size, device = 0;
   long frames, counter = 0;
   MY_TYPE *buffer;
   FILE *fd;
@@ -67,10 +67,11 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio(&stream, 0, 0, device, chans,
+    audio = new RtAudio(0, 0, device, chans,
                         FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
@@ -78,20 +79,22 @@ int main(int argc, char *argv[])
   frames = (long) (fs * TIME);
 
   try {
-    buffer = (MY_TYPE *) audio->getStreamBuffer(stream);
-    audio->startStream(stream);
+    buffer = (MY_TYPE *) audio->getStreamBuffer();
+    audio->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nRecording for " << TIME << " seconds ... writing file test.raw (buffer size = " << buffer_size << ")." << endl;
+  std::cout << "\nRecording for " << TIME << " seconds ... writing file test.raw (buffer size = " << buffer_size << ")." << std::endl;
   while (counter < frames) {
 
     try {
-      audio->tickStream(stream);
+      audio->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
@@ -100,13 +103,14 @@ int main(int argc, char *argv[])
   }
 
   try {
-    audio->stopStream(stream);
+    audio->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream);
+  audio->closeStream();
   delete audio;
   fclose(fd);
 
diff --git a/tests/twostreams.cpp b/tests/twostreams.cpp
index 94a036c..508cf4d 100644
--- a/tests/twostreams.cpp
+++ b/tests/twostreams.cpp
@@ -3,45 +3,43 @@
   twostreams.cpp
   by Gary P. Scavone, 2001
 
-  Test executable for audio playback,
-  recording, duplex operation, stopping,
-  starting, and aborting operations.
-  Takes number of channels and sample
-  rate as input arguments.  Runs input
-  and output through two separate streams.
+  Test executable for audio playback, recording,
+  duplex operation, stopping, starting, and
+  aborting operations.  Takes number of channels
+  and sample rate as input arguments.  Runs input
+  and output through two separate instances of RtAudio.
   Uses blocking functionality.
 */
 /******************************************/
 
 #include "RtAudio.h"
-#include <iostream.h>
-#include <stdio.h>
+#include <iostream>
 
 /*
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT24
+#define FORMAT RTAUDIO_SINT24
 #define SCALE  2147483647.0
 
 typedef char  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT8
+#define FORMAT RTAUDIO_SINT8
 #define SCALE  127.0
 
 typedef signed short  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT16
+#define FORMAT RTAUDIO_SINT16
 #define SCALE  32767.0
 
 typedef signed long  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_SINT32
+#define FORMAT RTAUDIO_SINT32
 #define SCALE  2147483647.0
 */
 
 typedef float  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT32
+#define FORMAT RTAUDIO_FLOAT32
 #define SCALE  1.0
 
 /*
 typedef double  MY_TYPE;
-#define FORMAT RtAudio::RTAUDIO_FLOAT64
+#define FORMAT RTAUDIO_FLOAT64
 #define SCALE  1.0
 */
 
@@ -52,19 +50,19 @@ void usage(void) {
   /* Error function in case of incorrect command-line
      argument specifications
   */
-  cout << "\nuseage: twostreams N fs <device>\n";
-  cout << "    where N = number of channels,\n";
-  cout << "    fs = the sample rate,\n";
-  cout << "    and device = the device to use (default = 0).\n\n";
+  std::cout << "\nuseage: twostreams N fs <device>\n";
+  std::cout << "    where N = number of channels,\n";
+  std::cout << "    fs = the sample rate,\n";
+  std::cout << "    and device = the device to use (default = 0).\n\n";
   exit(0);
 }
 
 int main(int argc, char *argv[])
 {
-  int chans, fs, buffer_size, stream1 = 0, stream2 = 0, device = 0;
+  int chans, fs, buffer_size, device = 0;
   long frames, counter = 0, i, j;
   MY_TYPE *buffer1, *buffer2;
-  RtAudio *audio;
+  RtAudio *stream1, *stream2;
   FILE *fd;
   double *data = 0;
 
@@ -79,27 +77,30 @@ int main(int argc, char *argv[])
   // Open the realtime output device
   buffer_size = 512;
   try {
-    audio = new RtAudio();
+    stream1 = new RtAudio(device, chans, 0, 0,
+                          FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     exit(EXIT_FAILURE);
   }
 
   try {
-    stream1 = audio->openStream(device, chans, 0, 0,
-                                FORMAT, fs, &buffer_size, 8);
-    stream2 = audio->openStream(0, 0, device, chans,
-                                FORMAT, fs, &buffer_size, 8);
+    stream2 = new RtAudio(0, 0, device, chans,
+                          FORMAT, fs, &buffer_size, 8);
   }
-  catch (RtError &) {
-    goto cleanup;
+  catch (RtError &error) {
+    delete stream1;
+    error.printMessage();
+    exit(EXIT_FAILURE);
   }
 
   try {
-    buffer1 = (MY_TYPE *) audio->getStreamBuffer(stream1);
-    buffer2 = (MY_TYPE *) audio->getStreamBuffer(stream2);
+    buffer1 = (MY_TYPE *) stream1->getStreamBuffer();
+    buffer2 = (MY_TYPE *) stream2->getStreamBuffer();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
@@ -107,13 +108,14 @@ int main(int argc, char *argv[])
   data = (double *) calloc(chans, sizeof(double));
 
   try {
-    audio->startStream(stream1);
+    stream1->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
-  cout << "\nStarting sawtooth playback stream for " << TIME << " seconds." << endl;
+  std::cout << "\nStarting sawtooth playback stream for " << TIME << " seconds." << std::endl;
   while (counter < frames) {
     for (i=0; i<buffer_size; i++) {
       for (j=0; j<chans; j++) {
@@ -124,40 +126,44 @@ int main(int argc, char *argv[])
     }
 
     try {
-      audio->tickStream(stream1);
+      stream1->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
     counter += buffer_size;
   }
 
-  cout << "\nStopping playback stream." << endl;
+  std::cout << "\nStopping playback stream." << std::endl;
   try {
-    audio->stopStream(stream1);
+    stream1->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
   fd = fopen("test.raw","wb");
 
   try {
-    audio->startStream(stream2);
+    stream2->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
   counter = 0;
-  cout << "\nStarting recording stream for " << TIME << " seconds." << endl;
+  std::cout << "\nStarting recording stream for " << TIME << " seconds." << std::endl;
   while (counter < frames) {
 
     try {
-      audio->tickStream(stream2);
+      stream2->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
@@ -166,45 +172,49 @@ int main(int argc, char *argv[])
   }
 
   fclose(fd);
-  cout << "\nAborting recording." << endl;
+  std::cout << "\nAborting recording." << std::endl;
 
   try {
-    audio->abortStream(stream2);
-    audio->startStream(stream1);
-    audio->startStream(stream2);
+    stream2->abortStream();
+    stream1->startStream();
+    stream2->startStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
     goto cleanup;
   }
 
   counter = 0;
-  cout << "\nStarting playback and record streams (quasi-duplex) for " << TIME << " seconds." << endl;
+  std::cout << "\nStarting playback and record streams (quasi-duplex) for " << TIME << " seconds." << std::endl;
   while (counter < frames) {
 
     try {
-      audio->tickStream(stream2);
+      stream2->tickStream();
       memcpy(buffer1, buffer2, sizeof(MY_TYPE) * chans * buffer_size);
-      audio->tickStream(stream1);
+      stream1->tickStream();
     }
-    catch (RtError &) {
+    catch (RtError &error) {
+      error.printMessage();
       goto cleanup;
     }
 
     counter += buffer_size;
   }
 
-  cout << "\nStopping both streams." << endl;
+  std::cout << "\nStopping both streams." << std::endl;
   try {
-    audio->stopStream(stream1);
-    audio->stopStream(stream2);
+    stream1->stopStream();
+    stream2->stopStream();
   }
-  catch (RtError &) {
+  catch (RtError &error) {
+    error.printMessage();
   }
 
  cleanup:
-  audio->closeStream(stream1);
-  audio->closeStream(stream2);
-  delete audio;
+  stream1->closeStream();
+  stream2->closeStream();
+  delete stream1;
+  delete stream2;
   if (data) free(data);
 
   return 0;