* cdg.c : cdg file demux module for vlc
*****************************************************************************
* Copyright (C) 2007 Laurent Aimar
- * $Id: $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir # via.ecp.fr>
*
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codecs.h>
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("CDG demuxer") );
+ set_description( N_("CDG demuxer") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 2 );
+ set_capability( "demux", 3 );
set_callbacks( Open, Close );
add_shortcut( "cdg" );
add_shortcut( "subtitle" );
/* Identify cdg file by extension, as there is no simple way to
* detect it */
- if( !demux2_IsPathExtension( p_demux, ".cdg" ) && !p_demux->b_force )
+ if( !demux_IsPathExtension( p_demux, ".cdg" ) && !demux_IsForced( p_demux, "cdg" ) )
return VLC_EGENERIC;
/* CDG file size has to be multiple of CDG_FRAME_SIZE (it works even
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
- demux_sys_t *p_sys = p_demux->p_sys;
- int64_t *pi64;
-
switch( i_query )
{
-#if 0
- case DEMUX_GET_TIME:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = date_Get( &p_sys->pts );
- return VLC_SUCCESS;
-#endif
default:
- return demux2_vaControlHelper( p_demux->s, 0, -1,
+ return demux_vaControlHelper( p_demux->s, 0, -1,
8*CDG_FRAME_SIZE*CDG_FRAME_RATE, CDG_FRAME_SIZE, i_query, args );
}
}