X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmpc.c;h=d6d4ed3ea4378a28be242009694cd1cb0b7044e4;hb=5eea1626ff7256bfa96de800770342880ad60e33;hp=d359cb74a13af0ac5ce803a81c2df550afbc8b38;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c index d359cb74a1..d6d4ed3ea4 100644 --- a/modules/demux/mpc.c +++ b/modules/demux/mpc.c @@ -24,7 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -44,19 +49,14 @@ /***************************************************************************** * 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" ); @@ -79,7 +79,6 @@ struct demux_sys_t mpc_streaminfo info; /* */ - vlc_meta_t *p_meta; int64_t i_position; }; @@ -97,8 +96,7 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; es_format_t fmt; - uint8_t *p_peek; - module_t *p_id3; + const uint8_t *p_peek; if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; @@ -111,18 +109,12 @@ static int Open( vlc_object_t * p_this ) if( i_version < 4 || i_version > 6 ) return VLC_EGENERIC; - if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, "mpc" ) ) + if( !p_demux->b_force ) { /* Check file name extension */ - int i_len; - if( !p_demux->psz_path ) - return VLC_EGENERIC; - - i_len = strlen( p_demux->psz_path ); - if( i_len < 4 || - ( strcasecmp( &p_demux->psz_path[i_len-4], ".mpc" ) && - strcasecmp( &p_demux->psz_path[i_len-4], ".mp+" ) && - strcasecmp( &p_demux->psz_path[i_len-4], ".mpp" ) ) ) + if( !demux_IsPathExtension( p_demux, ".mpc" ) && + !demux_IsPathExtension( p_demux, ".mp+" ) && + !demux_IsPathExtension( p_demux, ".mpp" ) ) return VLC_EGENERIC; } } @@ -181,31 +173,19 @@ static int Open( vlc_object_t * p_this ) 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 */ - if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) ) - { - p_sys->p_meta = (vlc_meta_t *)p_demux->p_private; - p_demux->p_private = NULL; - module_Unneed( p_demux, p_id3 ); - } - - 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; @@ -247,7 +227,7 @@ static int Demux( demux_t *p_demux ) /* */ 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 ); @@ -267,21 +247,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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; @@ -296,7 +273,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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; @@ -351,7 +328,7 @@ mpc_int32_t ReaderGetSize( void *p_private ) 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;