Fix httpd reference count and deletion

[vlc] / src / input / var.c

diff --git a/src/input/var.c b/src/input/var.c
index dbd7b9a068aa134c11588d4323d8b75f8895e1bc..2d669f882c50ad51ceb466b05d65e61741416bc1 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -397,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 |
@@ -428,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*/
@@ -435,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 );
@@ -475,21 +482,10 @@ static int RateCallback( vlc_object_t *p_this, char const *psz_cmd,
     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
     {
@@ -694,14 +690,16 @@ static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
 {
     input_thread_t *p_input = (input_thread_t*)p_this;
 
-    /*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;
-    }
 
     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;