* plugins/vcd/* : vcd access plugin now uses mpeg_ps demux instead

                     of its own one.

plugins/mpeg_system/mpeg_ps.c

@@ -2,7 +2,7 @@
  * mpeg_ps.c : Program Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ps.c,v 1.13 2002/04/23 14:16:20 sam Exp $
+ * $Id: mpeg_ps.c,v 1.14 2002/05/15 22:53:10 jobi Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -273,7 +273,6 @@ static int PSInit( input_thread_t * p_input )
     {
         /* The programs will be added when we read them. */
         vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_input->stream.i_method = INPUT_METHOD_FILE;
         p_input->stream.pp_programs[0]->b_is_ok = 0;
         vlc_mutex_unlock( &p_input->stream.stream_lock );
     }

plugins/vcd/input_vcd.c

@@ -64,10 +64,6 @@
  * Local prototypes
  *****************************************************************************/
 /* called from outside */
-static int  VCDInit         ( struct input_thread_s * );
-static void VCDEnd          ( struct input_thread_s * );
-static int  VCDDemux        ( struct input_thread_s * );
-static int  VCDRewind       ( struct input_thread_s * );
 
 static int  VCDOpen         ( struct input_thread_s *);
 static void VCDClose        ( struct input_thread_s *);
@@ -92,17 +88,6 @@ void _M( access_getfunctions )( function_list_t * p_function_list )
 #undef access
 }
 
-
-void _M( demux_getfunctions )( function_list_t * p_function_list )
-{
-#define demux p_function_list->functions.demux
-    demux.pf_init             = VCDInit;
-    demux.pf_end              = VCDEnd;
-    demux.pf_demux            = VCDDemux;
-    demux.pf_rewind           = VCDRewind;
-#undef demux
-}
-
 /*
  * Data reading functions
  */
@@ -277,7 +262,7 @@ static int VCDOpen( struct input_thread_s *p_input )
 
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    p_input->psz_demux = "vcd";
+    p_input->psz_demux = "ps";
 
     return 0;
 }
@@ -415,14 +400,6 @@ static int VCDSetArea( input_thread_t * p_input, input_area_t * p_area )
 }
 
 
-/*****************************************************************************
- * VCDRewind : reads a stream backward
- *****************************************************************************/
-static int VCDRewind( input_thread_t * p_input )
-{
-    return( -1 );
-}
-
 /****************************************************************************
  * VCDSeek
  ****************************************************************************/
@@ -439,93 +416,3 @@ static void VCDSeek( input_thread_t * p_input, off_t i_off )
         (off_t)p_vcd->i_sector * (off_t)VCD_DATA_SIZE
          - p_input->stream.p_selected_area->i_start;
 }
-
-/*
- * Demux functions
- */
-
-
-/*****************************************************************************
- * VCDInit: initializes VCD structures
- *****************************************************************************/
-static int VCDInit( input_thread_t * p_input )
-{
-    es_descriptor_t *       p_es;
-    
-    if( p_input->stream.i_method != INPUT_METHOD_VCD )
-    {
-        return -1;
-    }
-
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    
-    /* Set program information. */
-    input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
-    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
-    /* No PSM to read in disc mode, we already have all the information */
-    p_input->stream.p_selected_program->b_is_ok = 1;
-
-    p_es = input_AddES( p_input, p_input->stream.p_selected_program, 0xe0, 0 );
-    p_es->i_stream_id = 0xe0;
-    p_es->i_type = MPEG1_VIDEO_ES;
-    p_es->i_cat = VIDEO_ES;
-
-    if( p_main->b_video )
-    {
-        input_SelectES( p_input, p_es );
-    }
-
-    p_es = input_AddES( p_input, p_input->stream.p_selected_program, 0xc0, 0 );
-    p_es->i_stream_id = 0xc0;
-    p_es->i_type = MPEG1_AUDIO_ES;
-    p_es->b_audio = 1;
-    p_es->i_cat = AUDIO_ES;
-
-    if( p_main->b_audio )
-    {
-        input_SelectES( p_input, p_es );
-    }
-
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-    
-    return 0;
-}
-
-/*****************************************************************************
- * VCDEnd: frees unused data
- *****************************************************************************/
-static void VCDEnd( input_thread_t * p_input )
-{
-    ;
-}
-
-
-/*****************************************************************************
- * VCDDemux: reads and demuxes data packets
- *****************************************************************************
- * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
- * packets.
- *****************************************************************************/
-static int VCDDemux( input_thread_t * p_input )
-{
-    int                 i;
-
-    for( i = 0; i < VCD_BLOCKS_ONCE; i++ )
-    {
-        data_packet_t *     p_data;
-        ssize_t             i_result;
-
-        i_result = input_ReadPS( p_input, &p_data );
-
-        if( i_result <= 0 )
-        {
-            return( i_result );
-        }
-
-        input_DemuxPS( p_input, p_data );
-    }
-
-    return( i );
-}
-

plugins/vcd/vcd.c

@@ -2,7 +2,7 @@
  * vcd.c : VCD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vcd.c,v 1.9 2002/04/19 13:56:11 sam Exp $
+ * $Id: vcd.c,v 1.10 2002/05/15 22:53:10 jobi Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -33,7 +33,6 @@
  * Capabilities defined in the other files.
  *****************************************************************************/
 void _M( access_getfunctions )( function_list_t * p_function_list );
-void _M( demux_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
  * Build configuration tree.
@@ -43,14 +42,12 @@ MODULE_CONFIG_STOP
 
 MODULE_INIT_START
     SET_DESCRIPTION( _("VCD input module") )
-    ADD_CAPABILITY( DEMUX, 0 )
     ADD_CAPABILITY( ACCESS, 80 )
     ADD_SHORTCUT( "vcd" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START
     _M( access_getfunctions )( &p_module->p_functions->access );
-    _M( demux_getfunctions )( &p_module->p_functions->demux );
 MODULE_ACTIVATE_STOP
 
 MODULE_DEACTIVATE_START