mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #1988 from cg2121/fix-suffix

Browse Source 
obs-transitions: Fix suffix with stinger transition
This commit is contained in:
Jim 2019-08-10 23:28:37 -07:00 committed by GitHub
commit fe56046a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,12 +293,15 @@ static bool transition_point_type_modified(obs_properties_t *ppts,
int64_t type = obs_data_get_int(s, "tp_type");
p = obs_properties_get(ppts, "transition_point");
if (type == TIMING_TIME)
if (type == TIMING_TIME) {
obs_property_set_description(
p, obs_module_text("TransitionPoint"));
else
obs_property_int_set_suffix(p, " ms");
} else {
obs_property_set_description(
p, obs_module_text("TransitionPointFrame"));
obs_property_int_set_suffix(p, "");
}
return true;
}
@ -320,10 +323,9 @@ static obs_properties_t *stinger_properties(void *data)
obs_property_set_modified_callback(p, transition_point_type_modified);
p = obs_properties_add_int(ppts, "transition_point",
obs_module_text("TransitionPoint"), 0,
120000, 1);
obs_property_int_set_suffix(p, " ms");
obs_properties_add_int(ppts, "transition_point",
obs_module_text("TransitionPoint"), 0, 120000,
1);
obs_property_t *monitor_list = obs_properties_add_list(
ppts, "audio_monitoring", obs_module_text("AudioMonitoring"),