/*****************************************************************************
- * xa.c : xa file input module for vlc
+ * xa.c : xa file demux module for vlc
*****************************************************************************
- * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2005 Rémi Denis-Courmont
* $Id$
*
- * Authors: Remi Denis-Courmont <rem # videolan.org>
+ * Authors: Rémi Denis-Courmont <rem # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/aout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <codecs.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+
+#include <vlc_codecs.h>
/*****************************************************************************
* Module descriptor
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("XA demuxer") );
+ set_description( N_("XA demuxer") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 10 );
+ set_capability( "demux", 10 );
set_callbacks( Open, Close );
vlc_module_end();
typedef struct xa_header_t
{
- uint8_t xa_id[4];
+ char xa_id[4];
uint32_t iSize;
uint16_t wFormatTag;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
xa_header_t p_xa;
- uint8_t *p_buf;
+ const uint8_t *p_buf;
/* XA file heuristic */
if( stream_Peek( p_demux->s, &p_buf, sizeof( p_xa ) )
{
demux_sys_t *p_sys = p_demux->p_sys;
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_offset,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_offset,
p_sys->i_data_size ? p_sys->i_data_offset
+ p_sys->i_data_size : -1,
p_sys->fmt.i_bitrate,