Commit 750ec8a0 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* subtitle.c: const warning fixes

parent e55c4747
...@@ -56,7 +56,7 @@ static void Close( vlc_object_t *p_this ); ...@@ -56,7 +56,7 @@ static void Close( vlc_object_t *p_this );
"\"subrip\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \ "\"subrip\", \"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" " \
"\"sami\", \"dvdsubtitle\" and \"auto\" (meaning autodetection, this " \ "\"sami\", \"dvdsubtitle\" and \"auto\" (meaning autodetection, this " \
"should always work).") "should always work).")
static char *ppsz_sub_type[] = static const char *ppsz_sub_type[] =
{ {
"auto", "microdvd", "subrip", "subviewer", "ssa1", "auto", "microdvd", "subrip", "subviewer", "ssa1",
"ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle" "ssa2-4", "ass", "vplayer", "sami", "dvdsubtitle"
...@@ -76,7 +76,7 @@ vlc_module_begin(); ...@@ -76,7 +76,7 @@ vlc_module_begin();
SUB_DELAY_LONGTEXT, VLC_TRUE ); SUB_DELAY_LONGTEXT, VLC_TRUE );
add_string( "sub-type", "auto", NULL, N_("Subtitles format"), add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
SUB_TYPE_LONGTEXT, VLC_TRUE ); SUB_TYPE_LONGTEXT, VLC_TRUE );
change_string_list( ppsz_sub_type, 0, 0 ); change_string_list( ppsz_sub_type, NULL, NULL );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
add_shortcut( "subtitle" ); add_shortcut( "subtitle" );
...@@ -144,9 +144,9 @@ static int ParseDVDSubtitle( demux_t *, subtitle_t * ); ...@@ -144,9 +144,9 @@ static int ParseDVDSubtitle( demux_t *, subtitle_t * );
static struct static struct
{ {
char *psz_type_name; const char *psz_type_name;
int i_type; int i_type;
char *psz_name; const char *psz_name;
int (*pf_read)( demux_t *, subtitle_t* ); int (*pf_read)( demux_t *, subtitle_t* );
} sub_read_subtitle_function [] = } sub_read_subtitle_function [] =
{ {
...@@ -1084,7 +1084,7 @@ static int ParseVplayer( demux_t *p_demux, subtitle_t *p_subtitle ) ...@@ -1084,7 +1084,7 @@ static int ParseVplayer( demux_t *p_demux, subtitle_t *p_subtitle )
return( 0 ); return( 0 );
} }
static char *ParseSamiSearch( text_t *txt, char *psz_start, char *psz_str ) static char *ParseSamiSearch( text_t *txt, char *psz_start, const char *psz_str )
{ {
if( psz_start ) if( psz_start )
{ {
......
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