* 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>
/*****************************************************************************
vlc_module_begin();
set_shortname( "DV" );
- set_description( _("DV (Digital Video) demuxer") );
- set_capability( "demux2", 3 );
+ set_description( N_("DV (Digital Video) demuxer") );
+ set_capability( "demux", 3 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, VLC_FALSE );
+ add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false );
set_callbacks( Open, Close );
add_shortcut( "rawdv" );
vlc_module_end();
/* program clock reference (in units of 90kHz) */
mtime_t i_pcr;
- vlc_bool_t b_hurry_up;
+ bool b_hurry_up;
};
/*****************************************************************************
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- const byte_t *p_peek, *p_peek_backup;
+ const uint8_t *p_peek, *p_peek_backup;
uint32_t i_dword;
dv_header_t dv_header;
* it is possible to force this demux. */
/* Check for DV file extension */
- if( !demux2_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force )
+ if( !demux_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force )
return VLC_EGENERIC;
if( stream_Peek( p_demux->s, &p_peek, DV_PAL_FRAME_SIZE ) <
{
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
- vlc_bool_t b_audio = VLC_FALSE;
+ bool b_audio = false;
if( p_sys->b_hurry_up )
{
if( !p_sys->b_hurry_up )
{
- p_sys->i_pcr += ( I64C(1000000) / p_sys->f_rate );
+ p_sys->i_pcr += ( INT64_C(1000000) / p_sys->f_rate );
}
return 1;
demux_sys_t *p_sys = p_demux->p_sys;
/* XXX: DEMUX_SET_TIME is precise here */
- return demux2_vaControlHelper( p_demux->s,
+ return demux_vaControlHelper( p_demux->s,
0, -1,
p_sys->frame_size * p_sys->f_rate * 8,
p_sys->frame_size, i_query, args );