* modules/video_output/x11/xcommon.c: reverted sam's last commit which broke the...

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index a8c11fb479f5d6b6786d9d8dc2f574d82ed80134..0429b257bb41a640f5135ebaeb764ec6bdc63dbc 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999-2002 VideoLAN
- * $Id: input_programs.c,v 1.112 2003/05/15 23:05:59 gbazin Exp $
+ * $Id: input_programs.c,v 1.115 2003/07/23 22:01:25 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -97,22 +97,10 @@ int input_InitStream( input_thread_t * p_input, size_t i_data_len )
     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_Create( p_input, "next-title", VLC_VAR_VOID );
-    text.psz_string = _("Next title");
-    var_Change( p_input, "next-title", VLC_VAR_SETTEXT, &text, NULL );
-    var_Create( p_input, "prev-title", VLC_VAR_VOID );
-    text.psz_string = _("Previous title");
-    var_Change( p_input, "prev-title", VLC_VAR_SETTEXT, &text, NULL );
 
     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_Create( p_input, "next-chapter", VLC_VAR_VOID );
-    text.psz_string = _("Next Chapter");
-    var_Change( p_input, "next-chapter", VLC_VAR_SETTEXT, &text, NULL );
-    var_Create( p_input, "prev-chapter", VLC_VAR_VOID );
-    text.psz_string = _("Previous Chapter");
-    var_Change( p_input, "prev-chapter", VLC_VAR_SETTEXT, &text, NULL );
 
     var_Create( p_input, "navigation", VLC_VAR_VARIABLE | VLC_VAR_HASCHOICE );
     text.psz_string = _("Navigation");
@@ -130,11 +118,7 @@ int input_InitStream( input_thread_t * p_input, size_t i_data_len )
 
     var_AddCallback( p_input, "program", ProgramCallback, NULL );
     var_AddCallback( p_input, "title", TitleCallback, NULL );
-    var_AddCallback( p_input, "next-title", TitleCallback, NULL );
-    var_AddCallback( p_input, "prev-title", TitleCallback, NULL );
     var_AddCallback( p_input, "chapter", ChapterCallback, NULL );
-    var_AddCallback( p_input, "next-chapter", ChapterCallback, NULL );
-    var_AddCallback( p_input, "prev-chapter", ChapterCallback, NULL );
     var_AddCallback( p_input, "video-es", ESCallback, NULL );
     var_AddCallback( p_input, "audio-es", ESCallback, NULL );
     var_AddCallback( p_input, "spu-es", ESCallback, NULL );
@@ -389,6 +373,30 @@ input_area_t * input_AddArea( input_thread_t * p_input,
         if( text2.psz_string ) free( text2.psz_string );
     }
 
+    if( p_input->stream.i_area_nb == 2 )
+    {
+        vlc_value_t text;
+
+        /* Add another bunch of navigation object variables */
+        var_Create( p_input, "next-title", VLC_VAR_VOID );
+        text.psz_string = _("Next title");
+        var_Change( p_input, "next-title", VLC_VAR_SETTEXT, &text, NULL );
+        var_Create( p_input, "prev-title", VLC_VAR_VOID );
+        text.psz_string = _("Previous title");
+        var_Change( p_input, "prev-title", VLC_VAR_SETTEXT, &text, NULL );
+        var_AddCallback( p_input, "next-title", TitleCallback, NULL );
+        var_AddCallback( p_input, "prev-title", TitleCallback, NULL );
+
+        var_Create( p_input, "next-chapter", VLC_VAR_VOID );
+        text.psz_string = _("Next Chapter");
+        var_Change( p_input, "next-chapter", VLC_VAR_SETTEXT, &text, NULL );
+        var_Create( p_input, "prev-chapter", VLC_VAR_VOID );
+        text.psz_string = _("Previous Chapter");
+        var_Change( p_input, "prev-chapter", VLC_VAR_SETTEXT, &text, NULL );
+        var_AddCallback( p_input, "next-chapter", ChapterCallback, NULL );
+        var_AddCallback( p_input, "prev-chapter", ChapterCallback, NULL );
+    }
+
     return p_area;
 }
 
@@ -419,11 +427,14 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
 #undef p_es
         }
     }
+
     /* Get the number of the required audio stream */
-    if( config_GetInt( p_input, "audio" ) )
+    var_Get( p_input, "audio", &val );
+    if( val.b_bool )
     {
         /* Default is the first one */
-        i_required_audio_es = config_GetInt( p_input, "audio-channel" );
+        var_Get( p_input, "audio-channel", &val );
+        i_required_audio_es = val.i_int;
         if( i_required_audio_es < 0 )
         {
             i_required_audio_es = 1;
@@ -435,10 +446,12 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
     }
 
     /* Same thing for subtitles */
-    if( config_GetInt( p_input, "video" ) )
+    var_Get( p_input, "video", &val );
+    if( val.b_bool )
     {
         /* for spu, default is none */
-        i_required_spu_es = config_GetInt( p_input, "spu-channel" );
+        var_Get( p_input, "spu-channel", &val );
+        i_required_spu_es = val.i_int;
         if( i_required_spu_es < 0 )
         {
             i_required_spu_es = 0;
@@ -536,6 +549,15 @@ void input_DelArea( input_thread_t * p_input, input_area_t * p_area )
 
     /* Free the description of this area */
     free( p_area );
+
+    if( p_input->stream.i_area_nb == 1 )
+    {
+        /* Del unneeded navigation object variables */
+        var_Destroy( p_input, "next-title" );
+        var_Destroy( p_input, "prev-title" );
+        var_Destroy( p_input, "next-chapter" );
+        var_Destroy( p_input, "prev-chapter" );
+    }
 }
 
 
@@ -730,7 +752,7 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
     /* Kill associated decoder, if any. */
     if( p_es->p_decoder_fifo != NULL )
     {
-        input_EndDecoder( p_input, p_es );
+        input_UnselectES( p_input, p_es );
     }
 
     /* Remove this ES from the description of the program if it is associated
@@ -804,19 +826,26 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         return -1;
     }
 
-    if( ((p_es->i_cat == VIDEO_ES) || (p_es->i_cat == SPU_ES))
-        && !config_GetInt( p_input, "video" ) )
+    if( p_es->i_cat == VIDEO_ES || p_es->i_cat == SPU_ES )
     {
-        msg_Dbg( p_input,
-                 "video is disabled, not selecting ES 0x%x", p_es->i_id );
-        return -1;
+        var_Get( p_input, "video", &val );
+        if( !val.b_bool )
+        {
+            msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x",
+                     p_es->i_id );
+            return -1;
+        }
     }
 
-    if( (p_es->i_cat == AUDIO_ES) && !config_GetInt( p_input, "audio" ) )
+    if( p_es->i_cat == AUDIO_ES )
     {
-        msg_Dbg( p_input,
-                 "audio is disabled, not selecting ES 0x%x", p_es->i_id );
-        return -1;
+        var_Get( p_input, "audio", &val );
+        if( !val.b_bool )
+        {
+            msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x",
+                     p_es->i_id );
+            return -1;
+        }
     }
 
     msg_Dbg( p_input, "selecting ES 0x%x", p_es->i_id );
@@ -981,15 +1010,15 @@ static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd,
     {
         var_Get( p_this, "title", &newval );
         var_Change( p_this, "title", VLC_VAR_GETCHOICES, &val_list, NULL );
-       for( i = 0; i < val_list.p_list->i_count; i++ )
-       {
-           if( val_list.p_list->p_values[i].i_int == newval.i_int &&
-               i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
-           {
-               newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
-               break;
-           }
-       }
+        for( i = 0; i < val_list.p_list->i_count; i++ )
+        {
+            if( val_list.p_list->p_values[i].i_int == newval.i_int &&
+                i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
+            {
+                newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
+                break;
+            }
+        }
         var_Change( p_this, "title", VLC_VAR_FREELIST, &val_list, NULL );
     }
 
@@ -1027,15 +1056,15 @@ static int ChapterCallback( vlc_object_t *p_this, char const *psz_cmd,
     {
         var_Get( p_this, "chapter", &newval );
         var_Change( p_this, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL );
-       for( i = 0; i < val_list.p_list->i_count; i++ )
-       {
-           if( val_list.p_list->p_values[i].i_int == newval.i_int &&
-               i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
-           {
-               newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
-               break;
-           }
-       }
+        for( i = 0; i < val_list.p_list->i_count; i++ )
+        {
+            if( val_list.p_list->p_values[i].i_int == newval.i_int &&
+                i + i_step >= 0 && i + i_step < val_list.p_list->i_count )
+            {
+                newval.i_int = val_list.p_list->p_values[i + i_step].i_int;
+                break;
+            }
+        }
         var_Change( p_this, "chapter", VLC_VAR_FREELIST, &val_list, NULL );
     }