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

Add a way to get default settings

Browse Source 
- Implement a means of obtaining default settings for an
   input/output/encoder.  obs_source_defaults for example will return
   the default settings for a particular source type.

 - Because C++ doesn't have designated initializers, use functions in
   the WASAPI plugin to register the sources instead.
This commit is contained in:
jp9000
2014-03-07 06:55:21 -07:00
parent e88ee06310
commit 7d48dbb1dc
11 changed files with 122 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/win-wasapi/plugin-main.cpp
View File

@@ -2,12 +2,12 @@
OBS_DECLARE_MODULE()
extern struct obs_source_info wasapiInput;
extern struct obs_source_info wasapiOutput;
void RegisterWASAPIInput();
void RegisterWASAPIOutput();
bool obs_module_load(uint32_t libobs_ver)
{
obs_register_source(&wasapiInput);
obs_register_source(&wasapiOutput);
RegisterWASAPIInput();
RegisterWASAPIOutput();
return true;
}

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

@@ -9,6 +9,8 @@
using namespace std;
static void GetWASAPIDefaults(obs_data_t settings);
#define KSAUDIO_SPEAKER_4POINT1 (KSAUDIO_SPEAKER_QUAD|SPEAKER_LOW_FREQUENCY)
#define KSAUDIO_SPEAKER_2POINT1 (KSAUDIO_SPEAKER_STEREO|SPEAKER_LOW_FREQUENCY)
@@ -69,8 +71,7 @@ WASAPISource::WASAPISource(obs_data_t settings, obs_source_t source_,
source (source_),
isInputDevice (input)
{
obs_data_set_default_string(settings, "device_id", "default");
obs_data_set_default_bool(settings, "use_device_timing", true);
GetWASAPIDefaults(settings);
UpdateSettings(settings);
stopSignal = CreateEvent(nullptr, true, false, nullptr);
@@ -392,6 +393,12 @@ static const char *GetWASAPIOutputName(const char *locale)
return "Audio Output Capture (WASAPI)";
}
static void GetWASAPIDefaults(obs_data_t settings)
{
obs_data_set_default_string(settings, "device_id", "default");
obs_data_set_default_bool(settings, "use_device_timing", true);
}
static void *CreateWASAPISource(obs_data_t settings, obs_source_t source,
bool input)
{
@@ -456,28 +463,30 @@ static obs_properties_t GetWASAPIPropertiesOutput(const char *locale)
return GetWASAPIProperties(locale, false);
}
struct obs_source_info wasapiInput {
"wasapi_input_capture",
OBS_SOURCE_TYPE_INPUT,
OBS_SOURCE_AUDIO,
GetWASAPIInputName,
CreateWASAPIInput,
DestroyWASAPISource,
GetWASAPIPropertiesInput,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
};
void RegisterWASAPIInput()
{
obs_source_info info = {};
info.id = "wasapi_input_capture";
info.type = OBS_SOURCE_TYPE_INPUT;
info.output_flags = OBS_SOURCE_AUDIO;
info.getname = GetWASAPIInputName;
info.create = CreateWASAPIInput;
info.destroy = DestroyWASAPISource;
info.defaults = GetWASAPIDefaults;
info.properties = GetWASAPIPropertiesInput;
obs_register_source(&info);
}
struct obs_source_info wasapiOutput {
"wasapi_output_capture",
OBS_SOURCE_TYPE_INPUT,
OBS_SOURCE_AUDIO,
GetWASAPIOutputName,
CreateWASAPIOutput,
DestroyWASAPISource,
GetWASAPIPropertiesOutput,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
};
void RegisterWASAPIOutput()
{
obs_source_info info = {};
info.id = "wasapi_output_capture";
info.type = OBS_SOURCE_TYPE_INPUT;
info.output_flags = OBS_SOURCE_AUDIO;
info.getname = GetWASAPIOutputName;
info.create = CreateWASAPIOutput;
info.destroy = DestroyWASAPISource;
info.defaults = GetWASAPIDefaults;
info.properties = GetWASAPIPropertiesOutput;
obs_register_source(&info);
}