X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvar.c;h=b2601073a8f2a47e0779bf653bcbff202f515ec8;hb=86682a8d838cd3efe3b6bab6114cdc347a6ab025;hp=cc5f5b928f63f0117c4715c7f8a7575bd74e8eb2;hpb=460b1fca8424088c9e87ca455338e0f446ac2476;p=vlc diff --git a/src/input/var.c b/src/input/var.c index cc5f5b928f..b2601073a8 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 - * $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 *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#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,19 +131,24 @@ 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 ); + text.psz_string = _("Programs"); + var_Change( p_input, "programs", VLC_VAR_SETTEXT, &text, NULL ); /* Title */ 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 ); @@ -151,31 +159,32 @@ 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 ); + p_input->p->pts_adjust.auto_adjust = var_CreateGetBool( + p_input, "auto-adjust-pts-delay" ); /* 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 ); @@ -184,13 +193,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 ); + 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", true ); + var_Create( p_input, "rate-change", VLC_VAR_BOOL ); + var_SetBool( p_input, "rate-change", true ); + } +#undef ADD_CALLBACK } /***************************************************************************** @@ -213,14 +229,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" ); @@ -250,7 +266,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"); @@ -265,7 +281,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; @@ -276,17 +292,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 ); @@ -296,26 +312,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 ); } } @@ -328,7 +344,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; @@ -365,7 +381,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 { @@ -373,11 +389,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 @@ -387,46 +402,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-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_input, "spu-channel", 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-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 ); + 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*/ + val.b_bool = true; /* Fixed later*/ var_Change( p_input, "seekable", VLC_VAR_SETVALUE, &val, NULL ); + var_Create( p_input, "can-pause", VLC_VAR_BOOL ); + val.b_bool = true; /* Fixed later*/ + var_Change( p_input, "can-pause", VLC_VAR_SETVALUE, &val, NULL ); - var_Create( p_input, "input-slave", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + /* */ + 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 ); @@ -447,7 +488,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 ) { @@ -457,32 +498,21 @@ 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" ) ) { input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_SLOWER, NULL ); - - /* Fix "rate" value */ - i_rate = var_GetInteger( p_input, "rate" ) * 2; - if( i_rate < INPUT_RATE_MIN ) i_rate = INPUT_RATE_MIN; - val.i_int = i_rate; - var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); } else if( !strcmp( psz_cmd, "rate-faster" ) ) { input_ControlPush( p_input, INPUT_CONTROL_SET_RATE_FASTER, NULL ); - i_rate = var_GetInteger( p_input, "rate" ) / 2; - - if( i_rate > INPUT_RATE_MAX ) i_rate = INPUT_RATE_MAX; - val.i_int = i_rate; - var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL ); } else { @@ -498,6 +528,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" ) ) { @@ -525,17 +556,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 ? */ @@ -563,6 +593,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 ); @@ -575,6 +606,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" ) ) { @@ -607,6 +639,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" ) ) { @@ -639,9 +672,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 ); @@ -658,6 +692,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 ) { @@ -683,12 +718,20 @@ 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" ) ) + { + /*Change i_pts_delay to make sure es are decoded in time*/ + if (newval.i_int < 0 || oldval.i_int < 0 ) + { + p_input->i_pts_delay -= newval.i_int - oldval.i_int; + } input_ControlPush( p_input, INPUT_CONTROL_SET_AUDIO_DELAY, &newval ); + } else if( !strcmp( psz_cmd, "spu-delay" ) ) input_ControlPush( p_input, INPUT_CONTROL_SET_SPU_DELAY, &newval ); return VLC_SUCCESS; @@ -699,6 +742,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 );