jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-waspi: Make sure to unregister notification obj

Browse Source 
Fixes a bug where the notify object existed after source deletion
This commit is contained in:
jp9000 2021-02-06 10:41:19 -08:00
parent 74e6448195
commit 6cf22c54dc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/win-wasapi/win-wasapi.cpp
View File

@ -27,6 +27,7 @@ class WASAPISource {
ComPtr<IAudioClient> client;
ComPtr<IAudioCaptureClient> capture;
ComPtr<IAudioRenderClient> render;
ComPtr<IMMDeviceEnumerator> enumerator;
ComPtr<IMMNotificationClient> notify;
obs_source_t *source;
@ -62,7 +63,7 @@ class WASAPISource {
inline void Stop();
void Reconnect();
bool InitDevice(IMMDeviceEnumerator *enumerator);
bool InitDevice();
void InitName();
void InitClient();
void InitRender();
@ -180,6 +181,7 @@ inline void WASAPISource::Stop()
inline WASAPISource::~WASAPISource()
{
enumerator->UnregisterEndpointNotificationCallback(notify);
Stop();
}
@ -204,7 +206,7 @@ void WASAPISource::Update(obs_data_t *settings)
Start();
}
bool WASAPISource::InitDevice(IMMDeviceEnumerator *enumerator)
bool WASAPISource::InitDevice()
{
HRESULT res;
@ -362,7 +364,6 @@ void WASAPISource::InitCapture()
void WASAPISource::Initialize()
{
ComPtr<IMMDeviceEnumerator> enumerator;
HRESULT res;
res = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr,
@ -371,7 +372,7 @@ void WASAPISource::Initialize()
if (FAILED(res))
throw HRError("Failed to create enumerator", res);
if (!InitDevice(enumerator))
if (!InitDevice())
return;
device_name = GetDeviceName(device);