X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvar.c;h=05ec7cc6f66e4b4aec1d8e8cc9b05f4eb9500ee0;hb=5b3a2948fe225056508a3420fff1da95a373e7af;hp=960803fc5ab55b5a1fa67a5f91e4e9592e7a43d9;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/src/input/var.c b/src/input/var.c index 960803fc5a..05ec7cc6f6 100644 --- a/src/input/var.c +++ b/src/input/var.c @@ -1,8 +1,8 @@ /***************************************************************************** * var.c: object variables for input thread ***************************************************************************** - * Copyright (C) 2004 VideoLAN (Centrale Réseaux) and its contributors - * $Id: input.c 7955 2004-06-07 22:21:33Z fenrir $ + * Copyright (C) 2004-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,15 +18,19 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include +#include #include "input_internal.h" @@ -40,7 +44,6 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title ); void input_ConfigVarInit ( input_thread_t *p_input ); - /***************************************************************************** * Callbacks *****************************************************************************/ @@ -76,49 +79,49 @@ void input_ControlVarInit ( input_thread_t *p_input ) { vlc_value_t val, text; + /* XXX we put callback only in non preparsing mode. We need to create the variable + * unless someone want to check all var_Get/var_Change return value ... */ +#define ADD_CALLBACK( name, callback ) do { if( !p_input->b_preparsing ) { var_AddCallback( p_input, name, callback, NULL ); } } while(0) /* State */ var_Create( p_input, "state", VLC_VAR_INTEGER ); val.i_int = p_input->i_state; var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "state", StateCallback, NULL ); + ADD_CALLBACK( "state", StateCallback ); /* Rate */ var_Create( p_input, "rate", VLC_VAR_INTEGER ); - val.i_int = p_input->i_rate; + val.i_int = p_input->p->i_rate; var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "rate", RateCallback, NULL ); + ADD_CALLBACK( "rate", RateCallback ); var_Create( p_input, "rate-slower", VLC_VAR_VOID ); - var_AddCallback( p_input, "rate-slower", RateCallback, NULL ); + ADD_CALLBACK( "rate-slower", RateCallback ); var_Create( p_input, "rate-faster", VLC_VAR_VOID ); - var_AddCallback( p_input, "rate-faster", RateCallback, NULL ); - + ADD_CALLBACK( "rate-faster", RateCallback ); /* Position */ var_Create( p_input, "position", VLC_VAR_FLOAT ); var_Create( p_input, "position-offset", VLC_VAR_FLOAT ); val.f_float = 0.0; var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "position", PositionCallback, NULL ); - var_AddCallback( p_input, "position-offset", PositionCallback, NULL ); + ADD_CALLBACK( "position", PositionCallback ); + ADD_CALLBACK( "position-offset", PositionCallback ); /* Time */ var_Create( p_input, "time", VLC_VAR_TIME ); var_Create( p_input, "time-offset", VLC_VAR_TIME ); /* relative */ val.i_time = 0; var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "time", TimeCallback, NULL ); - var_AddCallback( p_input, "time-offset", TimeCallback, NULL ); - + ADD_CALLBACK( "time", TimeCallback ); + ADD_CALLBACK( "time-offset", TimeCallback ); /* Bookmark */ var_Create( p_input, "bookmark", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND ); val.psz_string = _("Bookmark"); var_Change( p_input, "bookmark", VLC_VAR_SETTEXT, &val, NULL ); - var_AddCallback( p_input, "bookmark", BookmarkCallback, NULL ); - + ADD_CALLBACK( "bookmark", BookmarkCallback ); /* Program */ var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | @@ -128,7 +131,7 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL ); text.psz_string = _("Program"); var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "program", ProgramCallback, NULL ); + ADD_CALLBACK( "program", ProgramCallback ); /* Programs */ var_Create( p_input, "programs", VLC_VAR_LIST | VLC_VAR_DOINHERIT ); @@ -139,13 +142,13 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Create( p_input, "title", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Title"); var_Change( p_input, "title", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "title", TitleCallback, NULL ); + ADD_CALLBACK( "title", TitleCallback ); /* Chapter */ var_Create( p_input, "chapter", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Chapter"); var_Change( p_input, "chapter", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "chapter", SeekpointCallback, NULL ); + ADD_CALLBACK( "chapter", SeekpointCallback ); /* Navigation The callback is added after */ var_Create( p_input, "navigation", VLC_VAR_VARIABLE | VLC_VAR_HASCHOICE ); @@ -156,31 +159,29 @@ void input_ControlVarInit ( input_thread_t *p_input ) var_Create( p_input, "audio-delay", VLC_VAR_TIME ); val.i_time = 0; var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "audio-delay", EsDelayCallback, NULL ); + ADD_CALLBACK( "audio-delay", EsDelayCallback ); var_Create( p_input, "spu-delay", VLC_VAR_TIME ); val.i_time = 0; var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL ); - var_AddCallback( p_input, "spu-delay", EsDelayCallback, NULL ); - + ADD_CALLBACK( "spu-delay", EsDelayCallback ); /* Video ES */ var_Create( p_input, "video-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Video Track"); var_Change( p_input, "video-es", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "video-es", ESCallback, NULL ); + ADD_CALLBACK( "video-es", ESCallback ); /* Audio ES */ var_Create( p_input, "audio-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Audio Track"); var_Change( p_input, "audio-es", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "audio-es", ESCallback, NULL ); + ADD_CALLBACK( "audio-es", ESCallback ); /* Spu ES */ var_Create( p_input, "spu-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); text.psz_string = _("Subtitles Track"); var_Change( p_input, "spu-es", VLC_VAR_SETTEXT, &text, NULL ); - var_AddCallback( p_input, "spu-es", ESCallback, NULL ); - + ADD_CALLBACK( "spu-es", ESCallback ); /* Special read only objects variables for intf */ var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -189,15 +190,20 @@ void input_ControlVarInit ( input_thread_t *p_input ) val.i_time = 0; var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL ); - - /* Special "intf-change" variable, it allows intf to set up a callback - * to be notified of some changes. - * TODO list all changes warn by this callbacks */ - var_Create( p_input, "intf-change", VLC_VAR_BOOL ); - var_SetBool( p_input, "intf-change", VLC_TRUE ); - - /* item-change variable */ - var_Create( p_input, "item-change", VLC_VAR_INTEGER ); + if( !p_input->b_preparsing ) + { + /* Special "intf-change" variable, it allows intf to set up a callback + * to be notified of some changes. + * + * Add rate-change to inform about rate changin + * + * TODO list all changes warn by this callbacks */ + var_Create( p_input, "intf-change", VLC_VAR_BOOL ); + var_SetBool( p_input, "intf-change", VLC_TRUE ); + var_Create( p_input, "rate-change", VLC_VAR_BOOL ); + var_SetBool( p_input, "rate-change", VLC_TRUE ); + } +#undef ADD_CALLBACK } /***************************************************************************** @@ -220,14 +226,14 @@ void input_ControlVarClean( input_thread_t *p_input ) var_Destroy( p_input, "bookmark" ); var_Destroy( p_input, "program" ); - if( p_input->i_title > 1 ) + if( p_input->p->i_title > 1 ) { /* TODO Destroy sub navigation var ? */ var_Destroy( p_input, "next-title" ); var_Destroy( p_input, "prev-title" ); } - if( p_input->i_title > 0 ) + if( p_input->p->i_title > 0 ) { /* FIXME title > 0 doesn't mean current title has more than 1 seekpoint */ var_Destroy( p_input, "next-chapter" ); @@ -257,7 +263,7 @@ void input_ControlVarNavigation( input_thread_t *p_input ) int i; /* Create more command variables */ - if( p_input->i_title > 1 ) + if( p_input->p->i_title > 1 ) { var_Create( p_input, "next-title", VLC_VAR_VOID ); text.psz_string = _("Next title"); @@ -272,7 +278,7 @@ void input_ControlVarNavigation( input_thread_t *p_input ) /* Create title and navigation */ val.psz_string = malloc( sizeof("title ") + 5 ); - for( i = 0; i < p_input->i_title; i++ ) + for( i = 0; i < p_input->p->i_title; i++ ) { vlc_value_t val2, text, text2; int j; @@ -283,17 +289,17 @@ void input_ControlVarNavigation( input_thread_t *p_input ) var_Create( p_input, val.psz_string, VLC_VAR_INTEGER|VLC_VAR_HASCHOICE|VLC_VAR_ISCOMMAND ); var_AddCallback( p_input, val.psz_string, - NavigationCallback, (void *)i ); + NavigationCallback, (void *)(intptr_t)i ); - if( p_input->title[i]->psz_name == NULL || - *p_input->title[i]->psz_name == '\0' ) + if( p_input->p->title[i]->psz_name == NULL || + *p_input->p->title[i]->psz_name == '\0' ) { asprintf( &text.psz_string, _("Title %i"), - i + p_input->i_title_offset ); + i + p_input->p->i_title_offset ); } else { - text.psz_string = strdup( p_input->title[i]->psz_name ); + text.psz_string = strdup( p_input->p->title[i]->psz_name ); } var_Change( p_input, "navigation", VLC_VAR_ADDCHOICE, &val, &text ); @@ -303,26 +309,26 @@ void input_ControlVarNavigation( input_thread_t *p_input ) free( text.psz_string ); - for( j = 0; j < p_input->title[i]->i_seekpoint; j++ ) + for( j = 0; j < p_input->p->title[i]->i_seekpoint; j++ ) { val2.i_int = j; - if( p_input->title[i]->seekpoint[j]->psz_name == NULL || - *p_input->title[i]->seekpoint[j]->psz_name == '\0' ) + if( p_input->p->title[i]->seekpoint[j]->psz_name == NULL || + *p_input->p->title[i]->seekpoint[j]->psz_name == '\0' ) { /* Default value */ asprintf( &text2.psz_string, _("Chapter %i"), - j + p_input->i_seekpoint_offset ); + j + p_input->p->i_seekpoint_offset ); } else { text2.psz_string = - strdup( p_input->title[i]->seekpoint[j]->psz_name ); + strdup( p_input->p->title[i]->seekpoint[j]->psz_name ); } var_Change( p_input, val.psz_string, VLC_VAR_ADDCHOICE, &val2, &text2 ); - if( text2.psz_string ) free( text2.psz_string ); + free( text2.psz_string ); } } @@ -335,7 +341,7 @@ void input_ControlVarNavigation( input_thread_t *p_input ) *****************************************************************************/ void input_ControlVarTitle( input_thread_t *p_input, int i_title ) { - input_title_t *t = p_input->title[i_title]; + input_title_t *t = p_input->p->title[i_title]; vlc_value_t val; int i; @@ -372,7 +378,7 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title ) { /* Default value */ asprintf( &text.psz_string, _("Chapter %i"), - i + p_input->i_seekpoint_offset ); + i + p_input->p->i_seekpoint_offset ); } else { @@ -380,11 +386,10 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title ) } var_Change( p_input, "chapter", VLC_VAR_ADDCHOICE, &val, &text ); - if( text.psz_string ) free( text.psz_string ); + free( text.psz_string ); } } - /***************************************************************************** * input_ConfigVarInit: * Create all config object variables @@ -394,53 +399,72 @@ void input_ConfigVarInit ( input_thread_t *p_input ) vlc_value_t val; /* Create Object Variables for private use only */ - var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - - var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); - - var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL | - VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING | - VLC_VAR_DOINHERIT ); - var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER | - VLC_VAR_DOINHERIT ); - - var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-all", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_input, "sout-keep", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - - var_Create( p_input, "input-repeat", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - - var_Create( p_input, "start-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "stop-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - - var_Create( p_input, "minimize-threads", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - - var_Create( p_input, "demuxed-id3", VLC_VAR_BOOL ); /* FIXME beurk */ - val.b_bool = VLC_FALSE; - var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL ); - - var_Create( p_input, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - var_Create( p_input, "cr-average", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_input, "clock-synchro", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + if( !p_input->b_preparsing ) + { + var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + + var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + + var_Create( p_input, "audio-language", + VLC_VAR_STRING|VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-language", + VLC_VAR_STRING|VLC_VAR_DOINHERIT ); + + var_Create( p_input, "audio-track-id", + VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-track-id", + VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + + var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL | + VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING | + VLC_VAR_DOINHERIT ); + var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER | + VLC_VAR_DOINHERIT ); + + var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-all", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_input, "sout-keep", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + + var_Create( p_input, "input-repeat", + VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "start-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "stop-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Create( p_input, "run-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + + var_Create( p_input, "input-slave", + VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + + var_Create( p_input, "minimize-threads", + VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + + var_Create( p_input, "audio-desync", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_input, "cr-average", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_input, "clock-synchro", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + } var_Create( p_input, "seekable", VLC_VAR_BOOL ); val.b_bool = VLC_TRUE; /* Fixed later*/ var_Change( p_input, "seekable", VLC_VAR_SETVALUE, &val, NULL ); - - var_Create( p_input, "input-slave", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "can-pause", VLC_VAR_BOOL ); + val.b_bool = VLC_TRUE; /* Fixed later*/ + var_Change( p_input, "can-pause", VLC_VAR_SETVALUE, &val, NULL ); /* */ var_Create( p_input, "access-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "access", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_input, "demux", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); /* Meta */ var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -461,7 +485,7 @@ static int StateCallback( vlc_object_t *p_this, char const *psz_cmd, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; - + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S ) { @@ -471,12 +495,12 @@ static int StateCallback( vlc_object_t *p_this, char const *psz_cmd, return VLC_EGENERIC; } + static int RateCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; - vlc_value_t val; - int i_rate; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); /* Problem with this way: the "rate" variable is update after the input thread do the change */ if( !strcmp( psz_cmd, "rate-slower" ) ) @@ -501,6 +525,7 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, { input_thread_t *p_input = (input_thread_t*)p_this; vlc_value_t val, length; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( !strcmp( psz_cmd, "position-offset" ) ) { @@ -528,17 +553,16 @@ static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } - static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; vlc_value_t val, length; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( !strcmp( psz_cmd, "time-offset" ) ) { input_ControlPush( p_input, INPUT_CONTROL_SET_TIME_OFFSET, &newval ); - val.i_time = var_GetTime( p_input, "time" ) + newval.i_time; if( val.i_time < 0 ) val.i_time = 0; /* TODO maybe test against i_length ? */ @@ -566,6 +590,7 @@ static int ProgramCallback( vlc_object_t *p_this, char const *psz_cmd, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); input_ControlPush( p_input, INPUT_CONTROL_SET_PROGRAM, &newval ); @@ -578,6 +603,7 @@ static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd, { input_thread_t *p_input = (input_thread_t*)p_this; vlc_value_t val, count; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( !strcmp( psz_cmd, "next-title" ) ) { @@ -610,6 +636,7 @@ static int SeekpointCallback( vlc_object_t *p_this, char const *psz_cmd, { input_thread_t *p_input = (input_thread_t*)p_this; vlc_value_t val, count; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( !strcmp( psz_cmd, "next-chapter" ) ) { @@ -642,9 +669,10 @@ static int NavigationCallback( vlc_object_t *p_this, char const *psz_cmd, { input_thread_t *p_input = (input_thread_t*)p_this; vlc_value_t val; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); /* Issue a title change */ - val.i_int = (int)p_data; + val.i_int = (intptr_t)p_data; input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val ); var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL ); @@ -661,6 +689,7 @@ static int ESCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( newval.i_int < 0 ) { @@ -686,10 +715,10 @@ static int ESCallback( vlc_object_t *p_this, char const *psz_cmd, } static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p ) + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; - + VLC_UNUSED(oldval); VLC_UNUSED(p_data); if( !strcmp( psz_cmd, "audio-delay" ) ) { @@ -710,6 +739,7 @@ static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd, void *p_data ) { input_thread_t *p_input = (input_thread_t*)p_this; + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); input_ControlPush( p_input, INPUT_CONTROL_SET_BOOKMARK, &newval );