A few more updates, including new ASIO files (GS).

7 files changed, 327 insertions, 280 deletions

diff --git a/RtAudio.cpp b/RtAudio.cpp
index 3563151..4b600bd 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/

 

     RtAudio: realtime audio i/o C++ classes

-    Copyright (c) 2001-2012 Gary P. Scavone

+    Copyright (c) 2001-2013 Gary P. Scavone

 

     Permission is hereby granted, free of charge, to any person

     obtaining a copy of this software and associated documentation files

@@ -4991,8 +4991,8 @@ static std::string convertTChar( LPCTSTR name )
 {

 #if defined( UNICODE ) || defined( _UNICODE )

   int length = WideCharToMultiByte(CP_UTF8, 0, name, -1, NULL, 0, NULL, NULL);

-  std::string s( length, 0 );

-  length = WideCharToMultiByte(CP_UTF8, 0, name, wcslen(name), &s[0], length, NULL, NULL);

+  std::string s( length-1, '\0' );

+  WideCharToMultiByte(CP_UTF8, 0, name, -1, &s[0], length, NULL, NULL);

 #else

   std::string s( name );

 #endif

diff --git a/RtAudio.h b/RtAudio.h
index 8d827e3..d78c313 100644
--- a/RtAudio.h
+++ b/RtAudio.h
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/
 
     RtAudio: realtime audio i/o C++ classes
-    Copyright (c) 2001-2012 Gary P. Scavone
+    Copyright (c) 2001-2013 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -42,8 +42,6 @@
   \file RtAudio.h
  */
 
-// RtAudio: Version 4.0.12
-
 #ifndef __RTAUDIO_H
 #define __RTAUDIO_H
 
@@ -51,6 +49,9 @@
 #include <vector>
 #include "RtError.h"
 
+// RtAudio version
+static const std::string VERSION( "4.0.12" );
+
 /*! \typedef typedef unsigned long RtAudioFormat;
     \brief RtAudio data format type.
 
@@ -320,6 +321,9 @@ class RtAudio
     : flags(0), numberOfBuffers(0), priority(0) {}
   };
 
+  //! A static function to determine the current RtAudio version.
+  static std::string getVersion( void ) { return VERSION; } 
+
   //! A static function to determine the available compiled audio APIs.
   /*!
     The values returned in the std::vector can be compared against
diff --git a/doc/release.txt b/doc/release.txt
index 3b09e89..1f9957b 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -1,8 +1,9 @@
 RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio, and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.
 
-By Gary P. Scavone, 2001-2012.
+By Gary P. Scavone, 2001-2013.
 
-v4.0.12: (?? December 2012)
+v4.0.12: (?? April 2013)
+- updated RtAudio.cpp and ASIO files for UNICODE support (thanks to Renaud Schoonbroodt)
 - updates to PulseAudio API support (thanks to Peter Meerwald and Tristan Matthews)
 - updates for pkg-config support in configure script
 - 24-bit format changed to true 24-bit format, not sub-bytes of 32-bits (thanks to Marc Britton)
diff --git a/include/asiolist.cpp b/include/asiolist.cpp
index 5a62f5b..e4c73c2 100644
--- a/include/asiolist.cpp
+++ b/include/asiolist.cpp
@@ -1,268 +1,308 @@
-#include <windows.h>

-#include "iasiodrv.h"

-#include "asiolist.h"

-

-#define ASIODRV_DESC		"description"

-#define INPROC_SERVER		"InprocServer32"

-#define ASIO_PATH			"software\\asio"

-#define COM_CLSID			"clsid"

-

-// ******************************************************************

-// Local Functions 

-// ******************************************************************

-static LONG findDrvPath (char *clsidstr,char *dllpath,int dllpathsize)

-{

-	HKEY			hkEnum,hksub,hkpath;

-	char			databuf[512];

-	LONG 			cr,rc = -1;

-	DWORD			datatype,datasize;

-	DWORD			index;

-	OFSTRUCT		ofs;

-	HFILE			hfile;

-	BOOL			found = FALSE;

-

-	CharLowerBuff(clsidstr,strlen(clsidstr));

-	if ((cr = RegOpenKey(HKEY_CLASSES_ROOT,COM_CLSID,&hkEnum)) == ERROR_SUCCESS) {

-

-		index = 0;

-		while (cr == ERROR_SUCCESS && !found) {

-			cr = RegEnumKey(hkEnum,index++,(LPTSTR)databuf,512);

-			if (cr == ERROR_SUCCESS) {

-				CharLowerBuff(databuf,strlen(databuf));

-				if (!(strcmp(databuf,clsidstr))) {

-					if ((cr = RegOpenKeyEx(hkEnum,(LPCTSTR)databuf,0,KEY_READ,&hksub)) == ERROR_SUCCESS) {

-						if ((cr = RegOpenKeyEx(hksub,(LPCTSTR)INPROC_SERVER,0,KEY_READ,&hkpath)) == ERROR_SUCCESS) {

-							datatype = REG_SZ; datasize = (DWORD)dllpathsize;

-							cr = RegQueryValueEx(hkpath,0,0,&datatype,(LPBYTE)dllpath,&datasize);

-							if (cr == ERROR_SUCCESS) {

-								memset(&ofs,0,sizeof(OFSTRUCT));

-								ofs.cBytes = sizeof(OFSTRUCT); 

-								hfile = OpenFile(dllpath,&ofs,OF_EXIST);

-								if (hfile) rc = 0; 

-							}

-							RegCloseKey(hkpath);

-						}

-						RegCloseKey(hksub);

-					}

-					found = TRUE;	// break out 

-				}

-			}

-		}				

-		RegCloseKey(hkEnum);

-	}

-	return rc;

-}

-

-

-static LPASIODRVSTRUCT newDrvStruct (HKEY hkey,char *keyname,int drvID,LPASIODRVSTRUCT lpdrv)

-{

-	HKEY	hksub;

-	char	databuf[256];

-	char	dllpath[MAXPATHLEN];

-	WORD	wData[100];

-	CLSID	clsid;

-	DWORD	datatype,datasize;

-	LONG	cr,rc;

-

-	if (!lpdrv) {

-		if ((cr = RegOpenKeyEx(hkey,(LPCTSTR)keyname,0,KEY_READ,&hksub)) == ERROR_SUCCESS) {

-

-			datatype = REG_SZ; datasize = 256;

-			cr = RegQueryValueEx(hksub,COM_CLSID,0,&datatype,(LPBYTE)databuf,&datasize);

-			if (cr == ERROR_SUCCESS) {

-				rc = findDrvPath (databuf,dllpath,MAXPATHLEN);

-				if (rc == 0) {

-					lpdrv = new ASIODRVSTRUCT[1];

-					if (lpdrv) {

-						memset(lpdrv,0,sizeof(ASIODRVSTRUCT));

-						lpdrv->drvID = drvID;

-						MultiByteToWideChar(CP_ACP,0,(LPCSTR)databuf,-1,(LPWSTR)wData,100);

-						if ((cr = CLSIDFromString((LPOLESTR)wData,(LPCLSID)&clsid)) == S_OK) {

-							memcpy(&lpdrv->clsid,&clsid,sizeof(CLSID));

-						}

-

-						datatype = REG_SZ; datasize = 256;

-						cr = RegQueryValueEx(hksub,ASIODRV_DESC,0,&datatype,(LPBYTE)databuf,&datasize);

-						if (cr == ERROR_SUCCESS) {

-							strcpy(lpdrv->drvname,databuf);

-						}

-						else strcpy(lpdrv->drvname,keyname);

-					}

-				}

-			}

-			RegCloseKey(hksub);

-		}

-	}	

-	else lpdrv->next = newDrvStruct(hkey,keyname,drvID+1,lpdrv->next);

-

-	return lpdrv;

-}

-

-static void deleteDrvStruct (LPASIODRVSTRUCT lpdrv)

-{

-	IASIO	*iasio;

-

-	if (lpdrv != 0) {

-		deleteDrvStruct(lpdrv->next);

-		if (lpdrv->asiodrv) {

-			iasio = (IASIO *)lpdrv->asiodrv;

-			iasio->Release();

-		}

-		delete lpdrv;

-	}

-}

-

-

-static LPASIODRVSTRUCT getDrvStruct (int drvID,LPASIODRVSTRUCT lpdrv)

-{

-	while (lpdrv) {

-		if (lpdrv->drvID == drvID) return lpdrv;

-		lpdrv = lpdrv->next;

-	}

-	return 0;

-}

-// ******************************************************************

-

-

-// ******************************************************************

-//	AsioDriverList

-// ******************************************************************

-AsioDriverList::AsioDriverList ()

-{

-	HKEY			hkEnum = 0;

-	char			keyname[MAXDRVNAMELEN];

-	LPASIODRVSTRUCT	pdl;

-	LONG 			cr;

-	DWORD			index = 0;

-	BOOL			fin = FALSE;

-

-	numdrv		= 0;

-	lpdrvlist	= 0;

-

-	cr = RegOpenKey(HKEY_LOCAL_MACHINE,ASIO_PATH,&hkEnum);

-	while (cr == ERROR_SUCCESS) {

-		if ((cr = RegEnumKey(hkEnum,index++,(LPTSTR)keyname,MAXDRVNAMELEN))== ERROR_SUCCESS) {

-			lpdrvlist = newDrvStruct (hkEnum,keyname,0,lpdrvlist);

-		}

-		else fin = TRUE;

-	}

-	if (hkEnum) RegCloseKey(hkEnum);

-

-	pdl = lpdrvlist;

-	while (pdl) {

-		numdrv++;

-		pdl = pdl->next;

-	}

-

-	if (numdrv) CoInitialize(0);	// initialize COM

-}

-

-AsioDriverList::~AsioDriverList ()

-{

-	if (numdrv) {

-		deleteDrvStruct(lpdrvlist);

-		CoUninitialize();

-	}

-}

-

-

-LONG AsioDriverList::asioGetNumDev (VOID)

-{

-	return (LONG)numdrv;

-}

-

-

-LONG AsioDriverList::asioOpenDriver (int drvID,LPVOID *asiodrv)

-{

-	LPASIODRVSTRUCT	lpdrv = 0;

-	long			rc;

-

-	if (!asiodrv) return DRVERR_INVALID_PARAM;

-

-	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {

-		if (!lpdrv->asiodrv) {

-			rc = CoCreateInstance(lpdrv->clsid,0,CLSCTX_INPROC_SERVER,lpdrv->clsid,asiodrv);

-			if (rc == S_OK) {

-				lpdrv->asiodrv = *asiodrv;

-				return 0;

-			}

-			// else if (rc == REGDB_E_CLASSNOTREG)

-			//	strcpy (info->messageText, "Driver not registered in the Registration Database!");

-		}

-		else rc = DRVERR_DEVICE_ALREADY_OPEN;

-	}

-	else rc = DRVERR_DEVICE_NOT_FOUND;

-	

-	return rc;

-}

-

-

-LONG AsioDriverList::asioCloseDriver (int drvID)

-{

-	LPASIODRVSTRUCT	lpdrv = 0;

-	IASIO			*iasio;

-

-	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {

-		if (lpdrv->asiodrv) {

-			iasio = (IASIO *)lpdrv->asiodrv;

-			iasio->Release();

-			lpdrv->asiodrv = 0;

-		}

-	}

-

-	return 0;

-}

-

-LONG AsioDriverList::asioGetDriverName (int drvID,char *drvname,int drvnamesize)

-{	

-	LPASIODRVSTRUCT			lpdrv = 0;

-

-	if (!drvname) return DRVERR_INVALID_PARAM;

-

-	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {

-		if (strlen(lpdrv->drvname) < (unsigned int)drvnamesize) {

-			strcpy(drvname,lpdrv->drvname);

-		}

-		else {

-			memcpy(drvname,lpdrv->drvname,drvnamesize-4);

-			drvname[drvnamesize-4] = '.';

-			drvname[drvnamesize-3] = '.';

-			drvname[drvnamesize-2] = '.';

-			drvname[drvnamesize-1] = 0;

-		}

-		return 0;

-	}

-	return DRVERR_DEVICE_NOT_FOUND;

-}

-

-LONG AsioDriverList::asioGetDriverPath (int drvID,char *dllpath,int dllpathsize)

-{

-	LPASIODRVSTRUCT			lpdrv = 0;

-

-	if (!dllpath) return DRVERR_INVALID_PARAM;

-

-	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {

-		if (strlen(lpdrv->dllpath) < (unsigned int)dllpathsize) {

-			strcpy(dllpath,lpdrv->dllpath);

-			return 0;

-		}

-		dllpath[0] = 0;

-		return DRVERR_INVALID_PARAM;

-	}

-	return DRVERR_DEVICE_NOT_FOUND;

-}

-

-LONG AsioDriverList::asioGetDriverCLSID (int drvID,CLSID *clsid)

-{

-	LPASIODRVSTRUCT			lpdrv = 0;

-

-	if (!clsid) return DRVERR_INVALID_PARAM;

-

-	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {

-		memcpy(clsid,&lpdrv->clsid,sizeof(CLSID));

-		return 0;

-	}

-	return DRVERR_DEVICE_NOT_FOUND;

-}

-

-

+#include <windows.h>
+#include "iasiodrv.h"
+#include "asiolist.h"
+
+#define ASIODRV_DESC		"description"
+#define INPROC_SERVER		"InprocServer32"
+#define ASIO_PATH			"software\\asio"
+#define COM_CLSID			"clsid"
+
+// ******************************************************************
+// Local Functions 
+// ******************************************************************
+static LONG findDrvPath (char *clsidstr,char *dllpath,int dllpathsize)
+{
+	HKEY			hkEnum,hksub,hkpath;
+	char			databuf[512];
+	LONG 			cr,rc = -1;
+	DWORD			datatype,datasize;
+	DWORD			index;
+	OFSTRUCT		ofs;
+	HFILE			hfile;
+	BOOL			found = FALSE;
+
+#ifdef UNICODE
+	CharLowerBuffA(clsidstr,strlen(clsidstr));
+	if ((cr = RegOpenKeyA(HKEY_CLASSES_ROOT,COM_CLSID,&hkEnum)) == ERROR_SUCCESS) {
+
+		index = 0;
+		while (cr == ERROR_SUCCESS && !found) {
+			cr = RegEnumKeyA(hkEnum,index++,databuf,512);
+			if (cr == ERROR_SUCCESS) {
+				CharLowerBuffA(databuf,strlen(databuf));
+				if (!(strcmp(databuf,clsidstr))) {
+					if ((cr = RegOpenKeyExA(hkEnum,databuf,0,KEY_READ,&hksub)) == ERROR_SUCCESS) {
+						if ((cr = RegOpenKeyExA(hksub,INPROC_SERVER,0,KEY_READ,&hkpath)) == ERROR_SUCCESS) {
+							datatype = REG_SZ; datasize = (DWORD)dllpathsize;
+							cr = RegQueryValueEx(hkpath,0,0,&datatype,(LPBYTE)dllpath,&datasize);
+							if (cr == ERROR_SUCCESS) {
+								memset(&ofs,0,sizeof(OFSTRUCT));
+								ofs.cBytes = sizeof(OFSTRUCT); 
+								hfile = OpenFile(dllpath,&ofs,OF_EXIST);
+								if (hfile) rc = 0; 
+							}
+							RegCloseKey(hkpath);
+						}
+						RegCloseKey(hksub);
+					}
+					found = TRUE;	// break out 
+				}
+			}
+		}				
+		RegCloseKey(hkEnum);
+	}
+#else
+	CharLowerBuff(clsidstr,strlen(clsidstr));
+	if ((cr = RegOpenKey(HKEY_CLASSES_ROOT,COM_CLSID,&hkEnum)) == ERROR_SUCCESS) {
+
+		index = 0;
+		while (cr == ERROR_SUCCESS && !found) {
+			cr = RegEnumKey(hkEnum,index++,databuf,512);
+			if (cr == ERROR_SUCCESS) {
+				CharLowerBuff(databuf,strlen(databuf));
+				if (!(strcmp(databuf,clsidstr))) {
+					if ((cr = RegOpenKeyEx(hkEnum,databuf,0,KEY_READ,&hksub)) == ERROR_SUCCESS) {
+						if ((cr = RegOpenKeyEx(hksub,INPROC_SERVER,0,KEY_READ,&hkpath)) == ERROR_SUCCESS) {
+							datatype = REG_SZ; datasize = (DWORD)dllpathsize;
+							cr = RegQueryValueEx(hkpath,0,0,&datatype,(LPBYTE)dllpath,&datasize);
+							if (cr == ERROR_SUCCESS) {
+								memset(&ofs,0,sizeof(OFSTRUCT));
+								ofs.cBytes = sizeof(OFSTRUCT); 
+								hfile = OpenFile(dllpath,&ofs,OF_EXIST);
+								if (hfile) rc = 0; 
+							}
+							RegCloseKey(hkpath);
+						}
+						RegCloseKey(hksub);
+					}
+					found = TRUE;	// break out 
+				}
+			}
+		}				
+		RegCloseKey(hkEnum);
+	}
+#endif
+	return rc;
+}
+
+
+static LPASIODRVSTRUCT newDrvStruct (HKEY hkey,char *keyname,int drvID,LPASIODRVSTRUCT lpdrv)
+{
+	HKEY	hksub;
+	char	databuf[256];
+	char	dllpath[MAXPATHLEN];
+	WORD	wData[100];
+	CLSID	clsid;
+	DWORD	datatype,datasize;
+	LONG	cr,rc;
+
+	if (!lpdrv) {
+		if ((cr = RegOpenKeyExA(hkey,keyname,0,KEY_READ,&hksub)) == ERROR_SUCCESS) {
+
+			datatype = REG_SZ; datasize = 256;
+			cr = RegQueryValueExA(hksub,COM_CLSID,0,&datatype,(LPBYTE)databuf,&datasize);
+			if (cr == ERROR_SUCCESS) {
+				rc = findDrvPath (databuf,dllpath,MAXPATHLEN);
+				if (rc == 0) {
+					lpdrv = new ASIODRVSTRUCT[1];
+					if (lpdrv) {
+						memset(lpdrv,0,sizeof(ASIODRVSTRUCT));
+						lpdrv->drvID = drvID;
+						MultiByteToWideChar(CP_ACP,0,(LPCSTR)databuf,-1,(LPWSTR)wData,100);
+						if ((cr = CLSIDFromString((LPOLESTR)wData,(LPCLSID)&clsid)) == S_OK) {
+							memcpy(&lpdrv->clsid,&clsid,sizeof(CLSID));
+						}
+
+						datatype = REG_SZ; datasize = 256;
+						cr = RegQueryValueExA(hksub,ASIODRV_DESC,0,&datatype,(LPBYTE)databuf,&datasize);
+						if (cr == ERROR_SUCCESS) {
+							strcpy(lpdrv->drvname,databuf);
+						}
+						else strcpy(lpdrv->drvname,keyname);
+					}
+				}
+			}
+			RegCloseKey(hksub);
+		}
+	}	
+	else lpdrv->next = newDrvStruct(hkey,keyname,drvID+1,lpdrv->next);
+
+	return lpdrv;
+}
+
+static void deleteDrvStruct (LPASIODRVSTRUCT lpdrv)
+{
+	IASIO	*iasio;
+
+	if (lpdrv != 0) {
+		deleteDrvStruct(lpdrv->next);
+		if (lpdrv->asiodrv) {
+			iasio = (IASIO *)lpdrv->asiodrv;
+			iasio->Release();
+		}
+		delete lpdrv;
+	}
+}
+
+
+static LPASIODRVSTRUCT getDrvStruct (int drvID,LPASIODRVSTRUCT lpdrv)
+{
+	while (lpdrv) {
+		if (lpdrv->drvID == drvID) return lpdrv;
+		lpdrv = lpdrv->next;
+	}
+	return 0;
+}
+// ******************************************************************
+
+
+// ******************************************************************
+//	AsioDriverList
+// ******************************************************************
+AsioDriverList::AsioDriverList ()
+{
+	HKEY			hkEnum = 0;
+	char			keyname[MAXDRVNAMELEN];
+	LPASIODRVSTRUCT	pdl;
+	LONG 			cr;
+	DWORD			index = 0;
+	BOOL			fin = FALSE;
+
+	numdrv		= 0;
+	lpdrvlist	= 0;
+
+#ifdef UNICODE
+	cr = RegOpenKeyA(HKEY_LOCAL_MACHINE,ASIO_PATH,&hkEnum);
+#else
+	cr = RegOpenKey(HKEY_LOCAL_MACHINE,ASIO_PATH,&hkEnum);
+#endif
+	while (cr == ERROR_SUCCESS) {
+#ifdef UNICODE
+		if ((cr = RegEnumKeyA(hkEnum,index++,keyname,MAXDRVNAMELEN))== ERROR_SUCCESS) {
+#else
+		if ((cr = RegEnumKey(hkEnum,index++,keyname,MAXDRVNAMELEN))== ERROR_SUCCESS) {
+#endif
+			lpdrvlist = newDrvStruct (hkEnum,keyname,0,lpdrvlist);
+		}
+		else fin = TRUE;
+	}
+	if (hkEnum) RegCloseKey(hkEnum);
+
+	pdl = lpdrvlist;
+	while (pdl) {
+		numdrv++;
+		pdl = pdl->next;
+	}
+
+	if (numdrv) CoInitialize(0);	// initialize COM
+}
+
+AsioDriverList::~AsioDriverList ()
+{
+	if (numdrv) {
+		deleteDrvStruct(lpdrvlist);
+		CoUninitialize();
+	}
+}
+
+
+LONG AsioDriverList::asioGetNumDev (VOID)
+{
+	return (LONG)numdrv;
+}
+
+
+LONG AsioDriverList::asioOpenDriver (int drvID,LPVOID *asiodrv)
+{
+	LPASIODRVSTRUCT	lpdrv = 0;
+	long			rc;
+
+	if (!asiodrv) return DRVERR_INVALID_PARAM;
+
+	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {
+		if (!lpdrv->asiodrv) {
+			rc = CoCreateInstance(lpdrv->clsid,0,CLSCTX_INPROC_SERVER,lpdrv->clsid,asiodrv);
+			if (rc == S_OK) {
+				lpdrv->asiodrv = *asiodrv;
+				return 0;
+			}
+			// else if (rc == REGDB_E_CLASSNOTREG)
+			//	strcpy (info->messageText, "Driver not registered in the Registration Database!");
+		}
+		else rc = DRVERR_DEVICE_ALREADY_OPEN;
+	}
+	else rc = DRVERR_DEVICE_NOT_FOUND;
+	
+	return rc;
+}
+
+
+LONG AsioDriverList::asioCloseDriver (int drvID)
+{
+	LPASIODRVSTRUCT	lpdrv = 0;
+	IASIO			*iasio;
+
+	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {
+		if (lpdrv->asiodrv) {
+			iasio = (IASIO *)lpdrv->asiodrv;
+			iasio->Release();
+			lpdrv->asiodrv = 0;
+		}
+	}
+
+	return 0;
+}
+
+LONG AsioDriverList::asioGetDriverName (int drvID,char *drvname,int drvnamesize)
+{	
+	LPASIODRVSTRUCT			lpdrv = 0;
+
+	if (!drvname) return DRVERR_INVALID_PARAM;
+
+	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {
+		if (strlen(lpdrv->drvname) < (unsigned int)drvnamesize) {
+			strcpy(drvname,lpdrv->drvname);
+		}
+		else {
+			memcpy(drvname,lpdrv->drvname,drvnamesize-4);
+			drvname[drvnamesize-4] = '.';
+			drvname[drvnamesize-3] = '.';
+			drvname[drvnamesize-2] = '.';
+			drvname[drvnamesize-1] = 0;
+		}
+		return 0;
+	}
+	return DRVERR_DEVICE_NOT_FOUND;
+}
+
+LONG AsioDriverList::asioGetDriverPath (int drvID,char *dllpath,int dllpathsize)
+{
+	LPASIODRVSTRUCT			lpdrv = 0;
+
+	if (!dllpath) return DRVERR_INVALID_PARAM;
+
+	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {
+		if (strlen(lpdrv->dllpath) < (unsigned int)dllpathsize) {
+			strcpy(dllpath,lpdrv->dllpath);
+			return 0;
+		}
+		dllpath[0] = 0;
+		return DRVERR_INVALID_PARAM;
+	}
+	return DRVERR_DEVICE_NOT_FOUND;
+}
+
+LONG AsioDriverList::asioGetDriverCLSID (int drvID,CLSID *clsid)
+{
+	LPASIODRVSTRUCT			lpdrv = 0;
+
+	if (!clsid) return DRVERR_INVALID_PARAM;
+
+	if ((lpdrv = getDrvStruct(drvID,lpdrvlist)) != 0) {
+		memcpy(clsid,&lpdrv->clsid,sizeof(CLSID));
+		return 0;
+	}
+	return DRVERR_DEVICE_NOT_FOUND;
+}
+
+
diff --git a/install b/install
index e590d96..f3377c4 100644
--- a/install
+++ b/install
@@ -1,6 +1,6 @@
 RtAudio - a set of C++ classes which provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio, and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.
 
-By Gary P. Scavone, 2001-2012.
+By Gary P. Scavone, 2001-2013.
 
 To configure and compile (on Unix systems and MinGW):
 
diff --git a/readme b/readme
index 2b88884..449d4e7 100644
--- a/readme
+++ b/readme
@@ -1,12 +1,12 @@
 RtAudio - a set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound and ASIO) operating systems.
 
-By Gary P. Scavone, 2001-2012.
+By Gary P. Scavone, 2001-2013.
 
 This distribution of RtAudio contains the following:
 
 doc:      RtAudio documentation (see doc/html/index.html)
 tests:    example RtAudio programs
-asio:     header and source files necessary for ASIO compilation
+include:  header and source files necessary for ASIO & DS compilation
 tests/Windows: Visual C++ .net test program workspace and projects
 
 OVERVIEW:
@@ -34,7 +34,7 @@ LEGAL AND ETHICAL:
 The RtAudio license is similar to the MIT License.
 
     RtAudio: a set of realtime audio i/o C++ classes
-    Copyright (c) 2001-2012 Gary P. Scavone
+    Copyright (c) 2001-2013 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
diff --git a/tests/audioprobe.cpp b/tests/audioprobe.cpp
index 7ec0ec6..a69437f 100644
--- a/tests/audioprobe.cpp
+++ b/tests/audioprobe.cpp
@@ -27,6 +27,8 @@ int main()
   std::vector< RtAudio::Api > apis;
   RtAudio :: getCompiledApi( apis );
 
+  std::cout << "\nRtAudio Version " << RtAudio::getVersion() << std::endl;
+
   std::cout << "\nCompiled APIs:\n";
   for ( unsigned int i=0; i<apis.size(); i++ )
     std::cout << "  " << apiMap[ apis[i] ] << std::endl;