* fixed a bug in input_SetProgram, that made the ps file input

launch without video. Sorry about this.

diff --git a/plugins/access/file.c b/plugins/access/file.c
index 917bdc5c76e4a8a2c56357c46facabf93ffd94e7..8b0fabcb264109671a9c43c516c7031872e01aa9 100644 (file)
--- a/plugins/access/file.c
+++ b/plugins/access/file.c
@@ -2,7 +2,7 @@
  * file.c: file input (file: access plug-in)
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.3 2002/04/08 14:53:05 jobi Exp $
+ * $Id: file.c,v 1.4 2002/04/10 16:26:21 jobi Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -49,7 +49,6 @@
  *****************************************************************************/
 static void input_getfunctions( function_list_t * );
 static int  FileOpen       ( struct input_thread_s * );
-static int  FileSetProgram ( struct input_thread_s * , pgrm_descriptor_t * );  
 
 /*****************************************************************************
  * Build configuration tree.
@@ -181,13 +180,3 @@ static int FileOpen( input_thread_t * p_input )
 
     return( 0 );
 }
-
-/*****************************************************************************
- * FileSetProgram: Do nothing
- *****************************************************************************/
-static int FileSetProgram( input_thread_t * p_input,
-                           pgrm_descriptor_t * p_program )
-{
-    return( 0 );
-}
-

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 06a34b2819eba3ae813ab8aed7063bc0cea1824e..3d7d52af64fd505919055075c97697d0427ba516 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-2001 VideoLAN
- * $Id: input_programs.c,v 1.78 2002/04/08 14:53:05 jobi Exp $
+ * $Id: input_programs.c,v 1.79 2002/04/10 16:26:21 jobi Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -347,17 +347,15 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
     {
         switch( p_new_prg->pp_es[i_es_index]->i_cat )
                     {
-                       case MPEG1_VIDEO_ES:
-                       case MPEG2_VIDEO_ES:
+                       case VIDEO_ES:
                            intf_WarnMsg( 4, "Selecting ES %x",
                                     p_new_prg->pp_es[i_es_index]->i_id );
                             input_SelectES( p_input,
                                    p_new_prg->pp_es[i_es_index] );
                             break;
-                        case MPEG1_AUDIO_ES:
-                        case MPEG2_AUDIO_ES:
+                        case AUDIO_ES:
                             i_audio_es += 1;
-                            if( i_audio_es == i_required_audio_es )
+                            if( i_audio_es <= i_required_audio_es )
                             {
                                 intf_WarnMsg( 4, "Selecting ES %x",
                                     p_new_prg->pp_es[i_es_index]->i_id );
@@ -365,21 +363,10 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
                                     p_new_prg->pp_es[i_es_index]);
                             }
                             break;
-                        case LPCM_AUDIO_ES :
-                        case AC3_AUDIO_ES :
-                            i_audio_es += 1;
-                            if( i_audio_es == i_required_audio_es )
-                            {
-                                intf_WarnMsg( 4, "Selecting ES %x",
-                                    p_new_prg->pp_es[i_es_index]->i_id );
-                                input_SelectES( p_input,
-                                    p_new_prg->pp_es[i_es_index] );
-                            }
-                            break;
                         /* Not sure this one is fully specification-compliant */
-                        case DVD_SPU_ES :
+                        case SPU_ES :
                             i_spu_es += 1;
-                            if( i_spu_es == i_required_spu_es )
+                            if( i_spu_es <= i_required_spu_es )
                             {
                                 intf_WarnMsg( 4, "Selecting ES %x",
                                     p_new_prg->pp_es[i_es_index]->i_id );