moved and split up the linux xshm and pulseaudio capture plugins

This commit is contained in:
fryshorts
2014-03-10 23:02:37 +01:00
parent f28912101e
commit c0ab8fadda
13 changed files with 79 additions and 38 deletions

View File

@@ -188,8 +188,8 @@ void OBSApp::OBSInit()
#define INPUT_AUDIO_SOURCE "wasapi_input_capture"
#define OUTPUT_AUDIO_SOURCE "wasapi_output_capture"
#else
#define INPUT_AUDIO_SOURCE ""
#define OUTPUT_AUDIO_SOURCE ""
#define INPUT_AUDIO_SOURCE "pulse_input_capture"
#define OUTPUT_AUDIO_SOURCE "pulse_output_capture"
#endif
const char *OBSApp::InputAudioSource() const

View File

@@ -172,6 +172,9 @@ void OBSBasic::OBSInit()
#elif _WIN32
obs_load_module("win-wasapi");
obs_load_module("win-capture");
#else
obs_load_module("linux-xshm");
obs_load_module("linux-pulseaudio");
#endif
ResetAudioDevices();