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

obs-transitions: Add audio monitoring to stinger

Browse Source 
Closes jp9000/obs-studio#1001
This commit is contained in:
Michel 2017-08-11 17:14:00 +02:00 committed by jp9000
parent 9cba5660e4
commit dab278e1b6
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/obs-transitions/data/locale/en-US.ini
View File

@ -56,3 +56,7 @@ LumaWipe.Type.StripsVertical="Strips Vertical"
LumaWipe.Type.Watercolor="Watercolor"
LumaWipe.Type.ZigzagHorizontal="Zigzag Horizontal"
LumaWipe.Type.ZigzagVertical="Zigzag Vertical"
AudioMonitoring="Audio Monitoring"
AudioMonitoring.None="Monitor Off"
AudioMonitoring.MonitorOnly="Monitor Only (mute output)"
AudioMonitoring.Both="Monitor and Output"

17
plugins/obs-transitions/transition-stinger.c
View File

@ -17,6 +17,7 @@ struct stinger_info {
float transition_b_mul;
bool transitioning;
bool transition_point_is_frame;
int monitoring_type;
};
static const char *stinger_get_name(void *type_data)
@ -47,6 +48,9 @@ static void stinger_update(void *data, obs_data_t *settings)
s->transition_point_frame = (uint64_t)point;
else
s->transition_point_ns = (uint64_t)(point * 1000000LL);
s->monitoring_type = obs_data_get_int(settings,"audio_monitoring");
obs_source_set_monitoring_type(s->media_source, s->monitoring_type);
}
static void *stinger_create(obs_data_t *settings, obs_source_t *source)
@ -279,6 +283,19 @@ static obs_properties_t *stinger_properties(void *data)
obs_module_text("TransitionPoint"),
0, 120000, 1);
obs_property_t *monitor_list = obs_properties_add_list(ppts,
"audio_monitoring", obs_module_text("AudioMonitoring"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_list_add_int(monitor_list,
obs_module_text("AudioMonitoring.None"),
OBS_MONITORING_TYPE_NONE);
obs_property_list_add_int(monitor_list,
obs_module_text("AudioMonitoring.MonitorOnly"),
OBS_MONITORING_TYPE_MONITOR_ONLY);
obs_property_list_add_int(monitor_list,
obs_module_text("AudioMonitoring.Both"),
OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT);
UNUSED_PARAMETER(data);
return ppts;
}