Changeset 88233 in vbox for trunk

Timestamp:

Mar 22, 2021 10:06:14 AM (4 years ago)

Author:

vboxsync

Message:

Audio: VBoxMMNotificationClient.* -> DrvHostAudioDSoundMMNotifClient.* bugref:9890

Location:

trunk/src/VBox/Devices

Files:

• Audio/DrvHostAudioDSound.cpp (modified) (3 diffs)
• Audio/DrvHostAudioDSoundMMNotifClient.cpp (moved) (moved from trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.cpp ) (18 diffs)
• Audio/DrvHostAudioDSoundMMNotifClient.h (moved) (moved from trunk/src/VBox/Devices/Audio/VBoxMMNotificationClient.h ) (4 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp

@@ -36 +36 @@
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
 # include <new> /* For bad_alloc. */
-# include "VBoxMMNotificationClient.h"
+# include "DrvHostAudioDSoundMMNotifClient.h"
 #endif
 
@@ -224 +224 @@
     LPDIRECTSOUNDCAPTURE8       pDSC;
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-    VBoxMMNotificationClient   *m_pNotificationClient;
+    DrvHostAudioDSoundMMNotifClient   *m_pNotificationClient;
 #endif
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
@@ -2713 +2713 @@
         try
         {
-            pThis->m_pNotificationClient = new VBoxMMNotificationClient();
+            pThis->m_pNotificationClient = new DrvHostAudioDSoundMMNotifClient();
 
             hr = pThis->m_pNotificationClient->Initialize();

trunk/src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxMMNotificationClient.cpp - Implementation of the IMMNotificationClient interface
+ * DrvHostAudioDSoundMMNotifClient.cpp - Implementation of the IMMNotificationClient interface
  *                                to detect audio endpoint changes.
  */
@@ -17 +17 @@
  */
 
-#include "VBoxMMNotificationClient.h"
+#include "DrvHostAudioDSoundMMNotifClient.h"
 
 #include <iprt/win/windows.h>
@@ -30 +30 @@
 #include <VBox/log.h>
 
-VBoxMMNotificationClient::VBoxMMNotificationClient(void)
+
+DrvHostAudioDSoundMMNotifClient::DrvHostAudioDSoundMMNotifClient(void)
     : m_fRegisteredClient(false)
     , m_cRef(1)
@@ -36 +37 @@
 }
 
-VBoxMMNotificationClient::~VBoxMMNotificationClient(void)
+DrvHostAudioDSoundMMNotifClient::~DrvHostAudioDSoundMMNotifClient(void)
 {
 }
@@ -43 +44 @@
  * Registers the mulitmedia notification client implementation.
  */
-HRESULT VBoxMMNotificationClient::Register(void)
+HRESULT DrvHostAudioDSoundMMNotifClient::Register(void)
 {
     HRESULT hr = m_pEnum->RegisterEndpointNotificationCallback(this);
@@ -59 +60 @@
  * Unregisters the mulitmedia notification client implementation.
  */
-void VBoxMMNotificationClient::Unregister(void)
+void DrvHostAudioDSoundMMNotifClient::Unregister(void)
 {
     DetachFromEndpoint();
@@ -76 +77 @@
  * @return  HRESULT
  */
-HRESULT VBoxMMNotificationClient::Initialize(void)
+HRESULT DrvHostAudioDSoundMMNotifClient::Initialize(void)
 {
     HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator), 0, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator),
@@ -92 +93 @@
  * @param   pfnCallback         Audio callback to call by the notification client in case of new events.
  */
-int VBoxMMNotificationClient::RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
+int DrvHostAudioDSoundMMNotifClient::RegisterCallback(PPDMDRVINS pDrvIns, PFNPDMHOSTAUDIOCALLBACK pfnCallback)
 {
     this->m_pDrvIns     = pDrvIns;
@@ -104 +105 @@
  * with notifications.
  */
-void VBoxMMNotificationClient::UnregisterCallback(void)
+void DrvHostAudioDSoundMMNotifClient::UnregisterCallback(void)
 {
     this->m_pDrvIns     = NULL;
@@ -114 +115 @@
  * Does nothing at the moment.
  */
-HRESULT VBoxMMNotificationClient::AttachToDefaultEndpoint(void)
+HRESULT DrvHostAudioDSoundMMNotifClient::AttachToDefaultEndpoint(void)
 {
     return S_OK;
@@ -123 +124 @@
  * Does nothing at the moment.
  */
-void VBoxMMNotificationClient::DetachFromEndpoint(void)
+void DrvHostAudioDSoundMMNotifClient::DetachFromEndpoint(void)
 {
 
@@ -131 +132 @@
  * Helper function for invoking the audio connector callback (if any).
  */
-void VBoxMMNotificationClient::doCallback(void)
+void DrvHostAudioDSoundMMNotifClient::doCallback(void)
 {
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
@@ -150 +151 @@
  * @param   dwNewState          New state the device is now in.
  */
-STDMETHODIMP VBoxMMNotificationClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
+STDMETHODIMP DrvHostAudioDSoundMMNotifClient::OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
 {
     char *pszState = "unknown";
@@ -185 +186 @@
  * @param   pwstrDeviceId       Device ID which has been added.
  */
-STDMETHODIMP VBoxMMNotificationClient::OnDeviceAdded(LPCWSTR pwstrDeviceId)
+STDMETHODIMP DrvHostAudioDSoundMMNotifClient::OnDeviceAdded(LPCWSTR pwstrDeviceId)
 {
     LogRel(("Audio: Device '%ls' has been added\n", pwstrDeviceId));
@@ -198 +199 @@
  * @param   pwstrDeviceId       Device ID which has been removed.
  */
-STDMETHODIMP VBoxMMNotificationClient::OnDeviceRemoved(LPCWSTR pwstrDeviceId)
+STDMETHODIMP DrvHostAudioDSoundMMNotifClient::OnDeviceRemoved(LPCWSTR pwstrDeviceId)
 {
     LogRel(("Audio: Device '%ls' has been removed\n", pwstrDeviceId));
@@ -214 +215 @@
  * @param   pwstrDefaultDeviceId      ID of the new default device.
  */
-STDMETHODIMP VBoxMMNotificationClient::OnDefaultDeviceChanged(EDataFlow eFlow, ERole eRole, LPCWSTR pwstrDefaultDeviceId)
+STDMETHODIMP DrvHostAudioDSoundMMNotifClient::OnDefaultDeviceChanged(EDataFlow eFlow, ERole eRole, LPCWSTR pwstrDefaultDeviceId)
 {
     RT_NOREF(eRole);
@@ -232 +233 @@
 }
 
-STDMETHODIMP VBoxMMNotificationClient::QueryInterface(REFIID interfaceID, void **ppvInterface)
+STDMETHODIMP DrvHostAudioDSoundMMNotifClient::QueryInterface(REFIID interfaceID, void **ppvInterface)
 {
     const IID MY_IID_IMMNotificationClient = __uuidof(IMMNotificationClient);
@@ -248 +249 @@
 }
 
-STDMETHODIMP_(ULONG) VBoxMMNotificationClient::AddRef(void)
+STDMETHODIMP_(ULONG) DrvHostAudioDSoundMMNotifClient::AddRef(void)
 {
     return InterlockedIncrement(&m_cRef);
 }
 
-STDMETHODIMP_(ULONG) VBoxMMNotificationClient::Release(void)
+STDMETHODIMP_(ULONG) DrvHostAudioDSoundMMNotifClient::Release(void)
 {
     long lRef = InterlockedDecrement(&m_cRef);

trunk/src/VBox/Devices/Audio/DrvHostAudioDSoundMMNotifClient.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxMMNotificationClient.h - Implementation of the IMMNotificationClient interface
+ * DrvHostAudioDSoundMMNotifClient.h - Implementation of the IMMNotificationClient interface
  *                              to detect audio endpoint changes.
  */
@@ -17 +17 @@
  */
 
-#ifndef VBOX_INCLUDED_SRC_Audio_VBoxMMNotificationClient_h
-#define VBOX_INCLUDED_SRC_Audio_VBoxMMNotificationClient_h
+#ifndef VBOX_INCLUDED_SRC_Audio_DrvHostAudioDSoundMMNotifClient_h
+#define VBOX_INCLUDED_SRC_Audio_DrvHostAudioDSoundMMNotifClient_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -40 +40 @@
 
 
-class VBoxMMNotificationClient : IMMNotificationClient
+class DrvHostAudioDSoundMMNotifClient : IMMNotificationClient
 {
 public:
 
-    VBoxMMNotificationClient();
-    virtual ~VBoxMMNotificationClient();
+    DrvHostAudioDSoundMMNotifClient();
+    virtual ~DrvHostAudioDSoundMMNotifClient();
 
     HRESULT Initialize();
@@ -94 +94 @@
     /** @} */
 };
-#endif /* !VBOX_INCLUDED_SRC_Audio_VBoxMMNotificationClient_h */
+#endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioDSoundMMNotifClient_h */
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -666 +666 @@
         Audio/DrvHostAudioDSound.cpp
   ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
+   VBoxDD_DEFS    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
    VBoxDD_SOURCES += \
-        Audio/VBoxMMNotificationClient.cpp
-   VBoxDD_DEFS    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
+        Audio/DrvHostAudioDSoundMMNotifClient.cpp
   endif
  endif