Removes trailing spaces. Removes tabs.

[vlc] / modules / demux / mpc.c

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index a41fbbc08a2eb3c4c2a1d5264eebe5cb42c847ab..d359cb74a13af0ac5ce803a81c2df550afbc8b38 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -25,7 +25,8 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
+#include <vlc_input.h>
 #include <vlc_codec.h>
 #include <math.h>
 
@@ -51,20 +52,12 @@
 static int  Open  ( vlc_object_t * );
 static void Close ( vlc_object_t * );
 
-static int  pi_replaygain_type[] = { 0, 1, 2 };
-static char *ppsz_replaygain_type[] = { N_("None"), N_("Title"), N_("Album") };
-
 vlc_module_begin();
-    set_shortname( "MPC" );
-    set_description( _("MusePack demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
+    set_description( _("MusePack demuxer") );
     set_capability( "demux2", 145 );
 
-    add_integer( "mpc-replaygain-type", 2, NULL,
-                REPLAYGAIN_TYPE_TEXT, REPLAYGAIN_TYPE_LONGTEXT, VLC_FALSE );
-        change_integer_list( pi_replaygain_type, ppsz_replaygain_type, 0 );
-
     set_callbacks( Open, Close );
     add_shortcut( "mpc" );
 vlc_module_end();
@@ -103,7 +96,6 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    char        psz_info[4096];
     es_format_t fmt;
     uint8_t     *p_peek;
     module_t    *p_id3;
@@ -113,7 +105,7 @@ static int Open( vlc_object_t * p_this )
 
     if( memcmp( p_peek, "MP+", 3 ) )
     {
-        /* for v4..6 we check extention file */
+        /* for v4..6 we check extension file */
         const int i_version = (GetDWLE( p_peek ) >> 11)&0x3ff;
 
         if( i_version  < 4 || i_version > 6 )
@@ -166,41 +158,6 @@ static int Open( vlc_object_t * p_this )
         return VLC_EGENERIC;
     }
 
-    /* Handle reaply gain */
-    if( p_sys->info.peak_title != 32767 )
-    {
-        int i_type = var_CreateGetInteger( p_demux, "mpc-replaygain-type" );
-        int gain;
-        int peak;
-
-        if( i_type == 2 )       // album
-        {
-            gain = p_sys->info.gain_album;
-            peak = p_sys->info.peak_album;
-        }
-        else if( i_type == 1 )  // title
-        {
-            gain = p_sys->info.gain_title;
-            peak = p_sys->info.peak_title;
-        }
-        else
-        {
-            gain = 0;
-            peak = 0;
-        }
-
-        if( gain )
-        {
-            double g = pow( 10, (double)gain / 2000.0 );
-            double gmax = (double)32767.0 / (peak+1);
-            if( g > gmax )
-                g = gmax;
-
-            msg_Dbg( p_demux, "Using reaply gain factor %f", g );
-            mpc_decoder_scale_output( &p_sys->decoder, g );
-        }
-    }
-
     /* Fill p_demux fields */
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
@@ -222,11 +179,23 @@ static int Open( vlc_object_t * p_this )
     fmt.audio.i_bitspersample = 32;
     fmt.i_bitrate = fmt.i_bitrate * fmt.audio.i_channels *
                     fmt.audio.i_bitspersample;
-    p_sys->p_es = es_out_Add( p_demux->out, &fmt );
-
+    if( p_sys->info.peak_title > 0 )
+    {
+        fmt.audio_replay_gain.pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_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.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.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.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, "id3", NULL, 0 ) ) )
+    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;
@@ -236,8 +205,8 @@ static int Open( vlc_object_t * p_this )
     if( !p_sys->p_meta )
         p_sys->p_meta = vlc_meta_New();
 
-    sprintf( psz_info, "Musepack v%d", p_sys->info.stream_version );
-    vlc_meta_Add( p_sys->p_meta, VLC_META_CODEC_NAME, psz_info );
+    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;
 }
@@ -298,16 +267,16 @@ 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 **pp_meta;
+    vlc_meta_t *p_meta;
 
     switch( i_query )
     {
         case DEMUX_GET_META:
-            pp_meta = (vlc_meta_t **)va_arg( args, vlc_meta_t** );
+            p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
             if( p_sys->p_meta )
-                *pp_meta = vlc_meta_Duplicate( p_sys->p_meta );
+                vlc_meta_Merge( p_meta, p_sys->p_meta );
             else
-                *pp_meta = NULL;
+                p_meta = NULL;
             return VLC_SUCCESS;
 
         case DEMUX_GET_LENGTH: