Commit 40fafab2 authored by hartman's avatar hartman
Browse files

* added a "auto" mode to sub-type. This is because the wxwin intf doesn't

  like dropdown lists, with no selection. it therefore selects the first item
  in this case microdvd, which then has the potential that you can save and
  set this sub-type accidently.
parent 5120576e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sub.c * sub.c
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2003 VideoLAN * Copyright (C) 1999-2003 VideoLAN
* $Id: sub.c,v 1.28 2003/10/11 22:40:04 hartman Exp $ * $Id: sub.c,v 1.29 2003/10/12 21:53:58 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -51,7 +51,7 @@ static void sub_close( subtitle_demux_t *p_sub ); ...@@ -51,7 +51,7 @@ static void sub_close( subtitle_demux_t *p_sub );
static void sub_fix( subtitle_demux_t *p_sub ); static void sub_fix( subtitle_demux_t *p_sub );
static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", "vplayer", "sami", NULL }; static char *ppsz_sub_type[] = { "auto", "microdvd", "subrip", "ssa1", "ssa2-4", "vplayer", "sami", NULL };
/***************************************************************************** /*****************************************************************************
...@@ -64,7 +64,7 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", "vplaye ...@@ -64,7 +64,7 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", "vplaye
"It will only work with MicroDVD subtitles." "It will only work with MicroDVD subtitles."
#define SUB_TYPE_LONGTEXT \ #define SUB_TYPE_LONGTEXT \
"One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\", \"vplayer\" " \ "One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\", \"vplayer\" " \
"\"sami\" (nothing for autodetection, it should always work)." "\"sami\" (auto for autodetection, it should always work)."
vlc_module_begin(); vlc_module_begin();
set_description( _("Text subtitles demux") ); set_description( _("Text subtitles demux") );
...@@ -76,7 +76,7 @@ vlc_module_begin(); ...@@ -76,7 +76,7 @@ vlc_module_begin();
add_integer( "sub-delay", 0, NULL, add_integer( "sub-delay", 0, NULL,
"Delay subtitles (in 1/10s)", "Delay subtitles (in 1/10s)",
SUB_DELAY_LONGTEXT, VLC_TRUE ); SUB_DELAY_LONGTEXT, VLC_TRUE );
add_string_from_list( "sub-type", NULL, ppsz_sub_type, NULL, add_string_from_list( "sub-type", "auto", ppsz_sub_type, NULL,
"subtitles type", "subtitles type",
SUB_TYPE_LONGTEXT, VLC_TRUE ); SUB_TYPE_LONGTEXT, VLC_TRUE );
set_callbacks( Open, NULL ); set_callbacks( Open, NULL );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment