mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 05:22:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

win-wasapi: Make InitDevice throw to log errors

Browse Source
This commit is contained in:
jpark37
2021-09-25 11:47:24 -07:00
parent 8f33e01b84
commit 12442c3e57
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ class WASAPISource {
inline void Stop();
void Reconnect();
bool InitDevice();
void InitDevice();
void InitName();
void InitClient();
void InitRender();
@@ -204,32 +204,35 @@ void WASAPISource::Update(obs_data_t *settings)
Start();
}
bool WASAPISource::InitDevice()
void WASAPISource::InitDevice()
{
HRESULT res;
if (isDefaultDevice) {
res = enumerator->GetDefaultAudioEndpoint(
HRESULT res = enumerator->GetDefaultAudioEndpoint(
isInputDevice ? eCapture : eRender,
isInputDevice ? eCommunications : eConsole,
device.Assign());
if (FAILED(res))
return false;
throw HRError("Failed GetDefaultAudioEndpoint", res);
CoTaskMemPtr<wchar_t> id;
res = device->GetId(&id);
if (FAILED(res))
throw HRError("Failed to get default id", res);
default_id = id;
} else {
wchar_t *w_id;
os_utf8_to_wcs_ptr(device_id.c_str(), device_id.size(), &w_id);
if (!w_id)
throw "Failed to widen device id string";
res = enumerator->GetDevice(w_id, device.Assign());
const HRESULT res =
enumerator->GetDevice(w_id, device.Assign());
bfree(w_id);
}
return SUCCEEDED(res);
if (FAILED(res))
throw HRError("Failed to enumerate device", res);
}
}
#define BUFFER_TIME_100NS (5 * 10000000)
@@ -370,8 +373,7 @@ void WASAPISource::Initialize()
if (FAILED(res))
throw HRError("Failed to create enumerator", res);
if (!InitDevice())
return;
InitDevice();
device_name = GetDeviceName(device);