Some more demux and access code factorization

[vlc] / modules / demux / mpeg / m4a.c

diff --git a/modules/demux/mpeg/m4a.c b/modules/demux/mpeg/m4a.c
index efed0426bd7fcabd0ac2a2da7638f890038fbb36..c5e23e86748dd5cea43d2f49c13c8cb64604a305 100644 (file)
--- a/modules/demux/mpeg/m4a.c
+++ b/modules/demux/mpeg/m4a.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * m4a.c : MPEG-4 audio demuxer
  *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
- * $Id: m4v.c 7754 2004-05-23 14:43:14Z fenrir $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -94,7 +94,7 @@ static int Open( vlc_object_t * p_this )
         msg_Err( p_demux, "cannot peek" );
         return VLC_EGENERIC;
     }
-    if( !strncmp( p_peek, "ADIF", 4 ) )
+    if( !strncmp( (char *)p_peek, "ADIF", 4 ) )
     {
         msg_Err( p_demux, "ADIF file. Not yet supported. (Please report)" );
         return VLC_EGENERIC;
@@ -106,27 +106,10 @@ static int Open( vlc_object_t * p_this )
     p_sys->p_es        = NULL;
     p_sys->b_start     = VLC_TRUE;
 
-    /*
-     * Load the mpeg 4 audio packetizer
-     */
-    p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER );
-    p_sys->p_packetizer->pf_decode_audio = NULL;
-    p_sys->p_packetizer->pf_decode_video = NULL;
-    p_sys->p_packetizer->pf_decode_sub = NULL;
-    p_sys->p_packetizer->pf_packetize = NULL;
-    es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
-                    VLC_FOURCC( 'm', 'p', '4', 'a' ) );
+    /* Load the mpeg 4 audio packetizer */
+    INIT_APACKETIZER( p_sys->p_packetizer,  'm', 'p', '4', 'a'  );
     es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
-    p_sys->p_packetizer->p_module =
-        module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
-
-    if( p_sys->p_packetizer->p_module == NULL)
-    {
-        vlc_object_destroy( p_sys->p_packetizer );
-        msg_Err( p_demux, "cannot find mp4a packetizer" );
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
+    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mp4 audio" );
 
     return VLC_SUCCESS;
 }
@@ -139,8 +122,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;
 
-    module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
-    vlc_object_destroy( p_sys->p_packetizer );
+    DESTROY_PACKETIZER( p_sys->p_packetizer );
 
     free( p_sys );
 }