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

Load up the lists of audio devices in settings

Browse Source 
It will now load up a the list of audio input/output devices in the
combo boxes in audio settings.
This commit is contained in:
jp9000
2014-03-06 07:02:25 -07:00
parent 4f7ab552df
commit 2448d0f229
6 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/win-wasapi/enum-wasapi.cpp
View File

@@ -76,6 +76,8 @@ void GetWASAPIAudioDevices_(vector<AudioDeviceInfo> &devices, bool input)
size = os_wcs_to_utf8(w_id, 0, nullptr);
info.id.resize(size);
os_wcs_to_utf8(w_id, size, &info.id[0]);
devices.push_back(info);
}
}

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

@@ -431,6 +431,9 @@ static obs_properties_t GetWASAPIProperties(const char *locale, bool input)
GetWASAPIAudioDevices(devices, input);
if (devices.size())
obs_property_list_add_item(device_prop, "Default", "default");
for (size_t i = 0; i < devices.size(); i++) {
AudioDeviceInfo &device = devices[i];
obs_property_list_add_item(device_prop,
@@ -461,9 +464,9 @@ struct obs_source_info wasapiInput {
CreateWASAPIInput,
DestroyWASAPISource,
GetWASAPIPropertiesInput,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
};
struct obs_source_info wasapiOutput {
@@ -474,7 +477,7 @@ struct obs_source_info wasapiOutput {
CreateWASAPIOutput,
DestroyWASAPISource,
GetWASAPIPropertiesOutput,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
};