Remove code killed by previous commit

[vlc] / modules / demux / a52.c

diff --git a/modules/demux/a52.c b/modules/demux/a52.c
index afbd66931b7f94f85a2c94c83bce6a4677d2d1a8..09b8786fa19969551a286cfc1357b84425236f14 100644 (file)
--- a/modules/demux/a52.c
+++ b/modules/demux/a52.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * a52.c : raw A/52 stream input module for vlc
  *****************************************************************************
- * Copyright (C) 2001 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
 #include <vlc_codec.h>
 
 #ifdef HAVE_UNISTD_H
@@ -65,7 +65,7 @@ struct demux_sys_t
     vlc_bool_t b_big_endian;
 };
 
-static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian );
+static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian );
 
 #define PCM_FRAME_SIZE (1536 * 4)
 #define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE)
@@ -79,7 +79,7 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    byte_t      *p_peek;
+    const byte_t*p_peek;
     int         i_peek = 0;
     vlc_bool_t  b_big_endian = 0; /* Arbitrary initialisation */
 
@@ -129,10 +129,8 @@ static int Open( vlc_object_t * p_this )
 
     if( CheckSync( p_peek + i_peek, &b_big_endian ) != VLC_SUCCESS )
     {
-        if( strncmp( p_demux->psz_demux, "a52", 3 ) )
-        {
+        if( !p_demux->b_force )
             return VLC_EGENERIC;
-        }
 
         /* User forced */
         msg_Err( p_demux, "this doesn't look like a A52 audio stream, "
@@ -140,29 +138,14 @@ static int Open( vlc_object_t * p_this )
     }
 
     /* Fill p_demux fields */
-    STANDARD_DEMUX_INIT; p_sys = p_demux->p_sys;
+    DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
     p_sys->b_start = VLC_TRUE;
     p_sys->i_mux_rate = 0;
     p_sys->b_big_endian = b_big_endian;
 
     /* Load the A52 packetizer */
-    p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER );
-    p_sys->p_packetizer->pf_decode_audio = 0;
-    p_sys->p_packetizer->pf_decode_video = 0;
-    p_sys->p_packetizer->pf_decode_sub = 0;
-    p_sys->p_packetizer->pf_packetize = 0;
-
-    /* Initialization of decoder structure */
-    es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
-                    VLC_FOURCC( 'a', '5', '2', ' ' ) );
-
-    p_sys->p_packetizer->p_module =
-        module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
-    if( !p_sys->p_packetizer->p_module )
-    {
-        msg_Err( p_demux, "cannot find A52 packetizer" );
-        return VLC_EGENERIC;
-    }
+    INIT_APACKETIZER( p_sys->p_packetizer, 'a', '5', '2', ' ' );
+    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "A52" );
 
     /* Create one program */
     p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in );
@@ -178,12 +161,7 @@ static void Close( vlc_object_t * p_this )
     demux_t        *p_demux = (demux_t*)p_this;
     demux_sys_t    *p_sys = p_demux->p_sys;
 
-    /* Unneed module */
-    module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
-
-    /* Delete the decoder */
-    vlc_object_destroy( p_sys->p_packetizer );
-
+    DESTROY_PACKETIZER( p_sys->p_packetizer );
     free( p_sys );
 }
 
@@ -267,17 +245,27 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
     if( i_query == DEMUX_SET_TIME )
+    {
         return VLC_EGENERIC;
+    }
+    else if( i_query == DEMUX_HAS_UNSUPPORTED_META )
+    {
+        vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+        *pb_bool = VLC_TRUE;
+        return VLC_SUCCESS;
+    }
     else
+    {
         return demux2_vaControlHelper( p_demux->s,
                                        0, -1,
                                        8*p_sys->i_mux_rate, 1, i_query, args );
+    }
 }
 
 /*****************************************************************************
  * CheckSync: Check if buffer starts with an A52 sync code
  *****************************************************************************/
-static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian )
+static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian )
 {
     /* Little endian version of the bitstream */
     if( p_peek[0] == 0x77 && p_peek[1] == 0x0b &&