vlc_module_begin();
set_description( _("FLAC demuxer") );
- set_capability( "demux2", 155 );
+ set_capability( "demux", 155 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_callbacks( Open, Close );
struct demux_sys_t
{
- vlc_bool_t b_start;
+ bool b_start;
es_out_id_t *p_es;
/* Packetizer */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->b_start = VLC_TRUE;
+ p_sys->b_start = true;
p_sys->p_meta = NULL;
memset( &p_sys->replay_gain, 0, sizeof(p_sys->replay_gain) );
p_sys->i_length = 0;
module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
if( !p_sys->p_packetizer->p_module )
{
- if( p_sys->p_packetizer->fmt_in.p_extra )
- free( p_sys->p_packetizer->fmt_in.p_extra );
+ free( p_sys->p_packetizer->fmt_in.p_extra );
vlc_object_release( p_sys->p_packetizer );
msg_Err( p_demux, "cannot find flac packetizer" );
/* Unneed module */
module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
- if( p_sys->p_packetizer->fmt_in.p_extra )
- free( p_sys->p_packetizer->fmt_in.p_extra );
+ free( p_sys->p_packetizer->fmt_in.p_extra );
/* Delete the decoder */
vlc_object_release( p_sys->p_packetizer );
return 0;
p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? 1 : 0;
- p_sys->b_start = VLC_FALSE;
+ p_sys->b_start = false;
while( (p_block_out = p_sys->p_packetizer->pf_packetize(
p_sys->p_packetizer, &p_block_in )) )
if( p_sys->p_es == NULL )
{
- p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+ p_sys->p_packetizer->fmt_out.b_packetized = true;
p_sys->p_packetizer->fmt_out.audio_replay_gain = p_sys->replay_gain;
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
}
int64_t i_next_offset;
int64_t i_delta_time;
int64_t i_delta_offset;
- vlc_bool_t b_seekable;
+ bool b_seekable;
int i;
/* */
}
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;
+ bool *pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
return VLC_SUCCESS;
}
else if( i_query == DEMUX_GET_LENGTH )
return VLC_SUCCESS;
}
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
8*0, 1, i_query, args );
}
demux_sys_t *p_sys = p_demux->p_sys;
int i_peek;
const uint8_t *p_peek;
- vlc_bool_t b_last;
+ bool b_last;
int i_sample_rate;
int64_t i_sample_count;
seekpoint_t *s;
p_sys->i_cover_score = pi_cover_score[i_type];
}
error:
- if( psz_mime )
- free( psz_mime );
- if( psz_description )
- free( psz_description );
+ free( psz_mime );
+ free( psz_description );
}
#undef RM