/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_input.h>
#include <vlc_codec.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define REPLAYGAIN_TYPE_TEXT N_("Replay Gain type" )
-#define REPLAYGAIN_TYPE_LONGTEXT N_( "Musepack can have a title-specific " \
- "replay gain (volume control) or an album-specific one. " \
- "Choose which type you want to use" )
-
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("MusePack demuxer") );
- set_capability( "demux2", 145 );
+ set_description( N_("MusePack demuxer") );
+ set_capability( "demux", 145 );
set_callbacks( Open, Close );
add_shortcut( "mpc" );
mpc_streaminfo info;
/* */
- vlc_meta_t *p_meta;
int64_t i_position;
};
demux_sys_t *p_sys;
es_format_t fmt;
const uint8_t *p_peek;
- module_t *p_id3;
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
return VLC_EGENERIC;
if( !p_demux->b_force )
{
/* Check file name extension */
- if( !demux2_IsPathExtension( p_demux, ".mpc" ) &&
- !demux2_IsPathExtension( p_demux, ".mp+" ) &&
- !demux2_IsPathExtension( p_demux, ".mpp" ) )
+ if( !demux_IsPathExtension( p_demux, ".mpc" ) &&
+ !demux_IsPathExtension( p_demux, ".mp+" ) &&
+ !demux_IsPathExtension( p_demux, ".mpp" ) )
return VLC_EGENERIC;
}
}
fmt.audio.i_bitspersample;
if( p_sys->info.peak_title > 0 )
{
- fmt.audio_replay_gain.pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+ fmt.audio_replay_gain.pb_peak[AUDIO_REPLAY_GAIN_TRACK] = true;
fmt.audio_replay_gain.pf_peak[AUDIO_REPLAY_GAIN_TRACK] = (float)p_sys->info.peak_title / 32767.0;
- fmt.audio_replay_gain.pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+ fmt.audio_replay_gain.pb_gain[AUDIO_REPLAY_GAIN_TRACK] = true;
fmt.audio_replay_gain.pf_gain[AUDIO_REPLAY_GAIN_TRACK] = (float)p_sys->info.gain_title / 100.0;
}
if( p_sys->info.peak_album > 0 )
{
- fmt.audio_replay_gain.pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+ fmt.audio_replay_gain.pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true;
fmt.audio_replay_gain.pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = (float)p_sys->info.peak_album / 32767.0;
- fmt.audio_replay_gain.pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+ fmt.audio_replay_gain.pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = true;
fmt.audio_replay_gain.pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = (float)p_sys->info.gain_album / 100.0;
}
- /* Parse possible id3 header */
- p_demux->p_private = malloc( sizeof( demux_meta_t ) );
- if( !p_demux->p_private )
- return VLC_ENOMEM;
- if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
- {
- demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
- p_sys->p_meta = p_demux_meta->p_meta;
- module_Unneed( p_demux, p_id3 );
- int i;
- for( i = 0; i < p_demux_meta->i_attachments; i++ )
- free( p_demux_meta->attachments[i] );
- TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
- }
- free( p_demux->p_private );
-
- if( !p_sys->p_meta )
- p_sys->p_meta = vlc_meta_New();
-
- vlc_audio_replay_gain_MergeFromMeta( &fmt.audio_replay_gain, p_sys->p_meta );
p_sys->p_es = es_out_Add( p_demux->out, &fmt );
return VLC_SUCCESS;
/* */
p_data->i_buffer = i_ret * sizeof(MPC_SAMPLE_FORMAT) * p_sys->info.channels;
p_data->i_dts = p_data->i_pts =
- 1 + I64C(1000000) * p_sys->i_position / p_sys->info.sample_freq;
+ 1 + INT64_C(1000000) * p_sys->i_position / p_sys->info.sample_freq;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_data->i_dts );
demux_sys_t *p_sys = p_demux->p_sys;
double f, *pf;
int64_t i64, *pi64;
- vlc_meta_t *p_meta;
+ bool *pb_bool;
switch( i_query )
{
- case DEMUX_GET_META:
- p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
- if( p_sys->p_meta )
- vlc_meta_Merge( p_meta, p_sys->p_meta );
- else
- p_meta = NULL;
+ case DEMUX_HAS_UNSUPPORTED_META:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
return VLC_SUCCESS;
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = I64C(1000000) * p_sys->info.pcm_samples /
+ *pi64 = INT64_C(1000000) * p_sys->info.pcm_samples /
p_sys->info.sample_freq;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = I64C(1000000) * p_sys->i_position /
+ *pi64 = INT64_C(1000000) * p_sys->i_position /
p_sys->info.sample_freq;
return VLC_SUCCESS;
mpc_bool_t ReaderCanSeek( void *p_private )
{
demux_t *p_demux = (demux_t*)p_private;
- vlc_bool_t b_canseek;
+ bool b_canseek;
stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_canseek );
return b_canseek;