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

Merge pull request #551 from kazukioishi/master 

win-dshow: Fix audio output mode not showing up
master
Jim 2016-06-05 19:33:38 -07:00
parent 57d580f8a9 7328c2e2d7
commit aded8fccc3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/win-dshow/win-dshow.cpp
View File

@ -1800,8 +1800,6 @@ static obs_properties_t *GetDShowProperties(void *obj)
/* audio settings */
Device::EnumAudioDevices(data->audioDevices);
if (!data->audioDevices.size())
return ppts;
p = obs_properties_add_list(ppts, AUDIO_OUTPUT_MODE, TEXT_AUDIO_MODE,
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
@ -1812,6 +1810,9 @@ static obs_properties_t *GetDShowProperties(void *obj)
obs_property_list_add_int(p, TEXT_MODE_WAVEOUT,
(int64_t)AudioMode::WaveOut);
if (!data->audioDevices.size())
return ppts;
p = obs_properties_add_bool(ppts, USE_CUSTOM_AUDIO, TEXT_CUSTOM_AUDIO);
obs_property_set_modified_callback(p, CustomAudioClicked);