* access.* input/*: added access_filter architecture (same API as a

[vlc] / src / input / var.c

diff --git a/src/input/var.c b/src/input/var.c
index c75933b7c52d84689bde07aff6921558415bf1b5..40127c63c824704cd1e5d939070ad44ad96b92a3 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -130,6 +130,11 @@ void input_ControlVarInit ( input_thread_t *p_input )
     var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL );
     var_AddCallback( p_input, "program", ProgramCallback, NULL );
 
+    /* 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");
@@ -185,12 +190,14 @@ void input_ControlVarInit ( input_thread_t *p_input )
     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 );
 }
 
 /*****************************************************************************
@@ -333,7 +340,12 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title )
     int  i;
 
     /* Create/Destroy command variables */
-    if( t->i_seekpoint > 1 )
+    if( t->i_seekpoint <= 1 )
+    {
+        var_Destroy( p_input, "next-chapter" );
+        var_Destroy( p_input, "prev-chapter" );
+    }
+    else if( var_Get( p_input, "next-chapter", &val ) != VLC_SUCCESS )
     {
         vlc_value_t text;
 
@@ -347,11 +359,6 @@ void input_ControlVarTitle( input_thread_t *p_input, int i_title )
         var_Change( p_input, "prev-chapter", VLC_VAR_SETTEXT, &text, NULL );
         var_AddCallback( p_input, "prev-chapter", SeekpointCallback, NULL );
     }
-    else
-    {
-        var_Destroy( p_input, "next-chapter" );
-        var_Destroy( p_input, "prev-chapter" );
-    }
 
     /* Build chapter list */
     var_Change( p_input, "chapter", VLC_VAR_CLEARCHOICES, NULL, NULL );
@@ -390,8 +397,11 @@ void input_ConfigVarInit ( input_thread_t *p_input )
     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, "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 |
@@ -421,6 +431,7 @@ void input_ConfigVarInit ( input_thread_t *p_input )
     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*/
@@ -428,6 +439,9 @@ void input_ConfigVarInit ( input_thread_t *p_input )
 
     var_Create( p_input, "input-slave", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 
+    /* */
+    var_Create( p_input, "access-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+
     /* Meta */
     var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
@@ -687,8 +701,16 @@ static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
 {
     input_thread_t *p_input = (input_thread_t*)p_this;
 
+
     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;