vlc | branch: master | Thomas Guillem <[email protected]> | Wed Oct 17 14:41:56 2018 +0200| [28d124dd6567e120ee730f8a02395089e65ba79f] | committer: Thomas Guillem
subtitle: move "sub-fps" option to libvlc Since this option is now handled by VLC core (from input.c). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=28d124dd6567e120ee730f8a02395089e65ba79f --- modules/demux/subtitle.c | 6 ------ src/libvlc-module.c | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 68361dc861..8fb3e2c451 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -48,9 +48,6 @@ static int Open ( vlc_object_t *p_this ); static void Close( vlc_object_t *p_this ); -#define SUB_FPS_LONGTEXT \ - N_("Override the normal frames per second settings. " \ - "This will only work with MicroDVD and SubRIP (SRT) subtitles.") #define SUB_TYPE_LONGTEXT \ N_("Force the subtiles format. Selecting \"auto\" means autodetection and should always work.") #define SUB_DESCRIPTION_LONGTEXT \ @@ -70,9 +67,6 @@ vlc_module_begin () set_capability( "demux", 0 ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_DEMUX ) - add_float( "sub-fps", 0.0, - N_("Frames per Second"), - SUB_FPS_LONGTEXT, true ) add_string( "sub-type", "auto", N_("Subtitle format"), SUB_TYPE_LONGTEXT, true ) change_string_list( ppsz_sub_type, ppsz_sub_type ) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 7747e286ce..68a04aec71 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -764,6 +764,10 @@ static const char *const ppsz_prefres[] = { "Look for a subtitle file in those paths too, if your subtitle " \ "file was not found in the current directory.") +#define SUB_FPS_TEXT N_("Subtitle Frames per Second") +#define SUB_FPS_LONGTEXT \ + N_("Override the normal frames per second settings. ") + #define SUB_DELAY_TEXT N_("Subtitle delay") #define SUB_DELAY_LONGTEXT \ N_("Apply a delay to all subtitles (in 1/10s, eg 100 means 10s).") @@ -1706,6 +1710,7 @@ vlc_module_begin () TEXTRENDERER_TEXT, TEXTRENDERER_LONGTEXT) set_section( N_("Subtitles") , NULL ) + add_float( "sub-fps", 0.0, SUB_FPS_TEXT, SUB_FPS_LONGTEXT, false ) add_integer( "sub-delay", 0, SUB_DELAY_TEXT, SUB_DELAY_LONGTEXT, false ) add_loadfile("sub-file", NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT) change_safe() _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
