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

obs-ffmpeg, obs-transitions: Use property suffixes

master
Vainock 2022-08-04 15:10:08 +02:00 committed by Matt Gajownik
parent 405f5123c1
commit e6a03be487
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/obs-ffmpeg/texture-amf.cpp
View File

@ -953,9 +953,10 @@ static obs_properties_t *amf_properties_internal(bool hevc)
obs_properties_add_int(props, "cqp", obs_module_text("NVENC.CQLevel"),
1, 30, 1);
obs_properties_add_int(props, "keyint_sec",
obs_module_text("KeyframeIntervalSec"), 0, 10,
1);
p = obs_properties_add_int(props, "keyint_sec",
obs_module_text("KeyframeIntervalSec"), 0,
10, 1);
obs_property_int_set_suffix(p, " s");
p = obs_properties_add_list(props, "preset", obs_module_text("Preset"),
OBS_COMBO_TYPE_LIST,

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

@ -19,7 +19,7 @@ TransitionPointFrame="Transition Point (frame)"
TransitionPointType="Transition Point Type"
AudioTransitionPointType="Audio Transition Point Type"
TransitionPointTypeFrame="Frame"
TransitionPointTypeTime="Time (milliseconds)"
TransitionPointTypeTime="Time"
TrackMatteEnabled="Use a Track Matte"
InvertTrackMatte="Invert Matte Colors"
TrackMatteVideoFile="Track Matte Video File"

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

@ -671,15 +671,15 @@ static bool transition_point_type_modified(obs_properties_t *ppts,
obs_property_set_description(
prop_transition_point,
obs_module_text("TransitionPoint"));
obs_property_int_set_suffix(prop_transition_point, " ms");
} else {
obs_property_set_description(
prop_transition_point,
obs_module_text("TransitionPointFrame"));
obs_property_int_set_suffix(prop_transition_point, "");
}
bool uses_ms_prefix = (type == TIMING_TIME);
obs_property_int_set_suffix(p, (uses_ms_prefix ? " ms" : ""));
UNUSED_PARAMETER(p);
return true;
}