Merge pull request #4 from Falcosoft/master

Merging version 1.1.7 from https://github.com/Falcosoft/ASIO2WASAPI

Author: Falcosoft

Release/ASIO2WASAPI.dll

@@ -19,6 +19,7 @@
 */
 
 #pragma once
+#pragma warning(disable : 4996)
 
 #include <vector>
 using namespace std;
@@ -29,13 +30,59 @@ struct IMMDevice;
 struct IAudioClient;
 struct IAudioRenderClient;
 
+#define SAFE_RELEASE(punk)  \
+              if ((punk) != NULL)  \
+                { (punk)->Release(); (punk) = NULL; }
+
+#include <Mmdeviceapi.h>
 #include "COMBaseClasses.h"
 #include "asiosys.h"
 #include "iasiodrv.h"
 
 extern CLSID CLSID_ASIO2WASAPI_DRIVER;
 const char * const szDescription = "ASIO2WASAPI";
 
+class ASIO2WASAPI;
+
+class CMMNotificationClient : public IMMNotificationClient
+{
+    LONG _cRef;
+    IMMDeviceEnumerator* _pEnumerator;
+    ASIO2WASAPI* _asio2Wasapi;
+
+public:
+    CMMNotificationClient(ASIO2WASAPI* asio2Wasapi);
+
+    ~CMMNotificationClient();
+
+    // IUnknown methods -- AddRef, Release, and QueryInterface
+
+    ULONG STDMETHODCALLTYPE AddRef();
+
+    ULONG STDMETHODCALLTYPE Release();
+
+    HRESULT STDMETHODCALLTYPE QueryInterface(
+        REFIID riid, VOID** ppvInterface);
+
+    // Callback methods for device-event notifications.
+
+    HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(
+        EDataFlow flow, ERole role,
+        LPCWSTR pwstrDeviceId);
+
+    HRESULT STDMETHODCALLTYPE OnDeviceAdded(LPCWSTR pwstrDeviceId);;
+
+    HRESULT STDMETHODCALLTYPE OnDeviceRemoved(LPCWSTR pwstrDeviceId);
+
+    HRESULT STDMETHODCALLTYPE OnDeviceStateChanged(
+        LPCWSTR pwstrDeviceId,
+        DWORD dwNewState);
+
+    HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(
+        LPCWSTR pwstrDeviceId,
+        const PROPERTYKEY key);
+};
+
 
 class ASIO2WASAPI : public IASIO, public CUnknown
 {
@@ -58,11 +105,15 @@ class ASIO2WASAPI : public IASIO, public CUnknown
 	// IUnknown
 	virtual HRESULT STDMETHODCALLTYPE NonDelegatingQueryInterface(REFIID riid,void **ppvObject);
 
+    
+
 	ASIOBool init (void* sysRef);
 	void getDriverName (char *name);	// max 32 bytes incl. terminating zero
 	long getDriverVersion ();
 	void getErrorMessage (char *string);	// max 128 bytes incl. terminating zero
 
+    ASIOCallbacks* getCallbacks() { return m_callbacks; }
+      
 	ASIOError start ();
 	ASIOError stop ();
 
@@ -87,24 +138,30 @@ class ASIO2WASAPI : public IASIO, public CUnknown
 	ASIOError future (long selector, void *opt);
 	ASIOError outputReady ();
 
+/// WASAPI specific
+    bool getUseDefaultDevice() { return m_useDefaultDevice; };
+    void setUseDefaultDevice(bool value) { m_useDefaultDevice = value; };
 private:
+    //for default device changed notification
+    CMMNotificationClient* pNotificationClient;
 
     static DWORD WINAPI PlayThreadProc(LPVOID pThis);
     static BOOL CALLBACK ControlPanelProc(HWND hwndDlg, 
          UINT message, WPARAM wParam, LPARAM lParam);
     HRESULT LoadData(IAudioRenderClient * pRenderClient);
     long refTimeToBufferSize(LONGLONG time) const;
-    LONGLONG bufferSizeToRefTime(long bufferSize) const;
-    void readFromRegistry();
+    LONGLONG bufferSizeToRefTime(long bufferSize) const;    
     void writeToRegistry();
-    ASIOSampleType getASIOSampleType() const;
+    void readFromRegistry();
     void shutdown();
+    ASIOSampleType getASIOSampleType() const;    
     void clearState();
     void setMostReliableFormat();
 
     //fields valid before initialization
     int m_nChannels;
     int m_nSampleRate;
+    int m_nBufferSize;
     char m_errorMessage[128];
     vector<wchar_t> m_deviceId;
 
@@ -115,10 +172,13 @@ class ASIO2WASAPI : public IASIO, public CUnknown
     WAVEFORMATEXTENSIBLE m_waveFormat;
     int m_bufferSize;           //in audio frames
     HWND m_hAppWindowHandle;
+    
+    //WASAPI specific
+    bool m_useDefaultDevice;
 
     //fields filled by createBuffers()/cleaned by disposeBuffers()
     vector< vector<BYTE> > m_buffers[2];
-	ASIOCallbacks * m_callbacks;
+    ASIOCallbacks* m_callbacks;
 
     //fields filled by start()/cleaned by stop()
     HANDLE m_hPlayThreadIsRunningEvent;

Release/Install.exe

@@ -1,2 +1,2 @@
-#define PRODUCT_VERSION 1,0,0,0
-#define SPRODUCT_VERSION "1.0.0.0"
+#define PRODUCT_VERSION 1,1,7,0
+#define SPRODUCT_VERSION "1.1.7.0"