Changeset 391

Timestamp:

04/05/08 20:33:01 (16 years ago)

Author:

r2d

Message:

xmms-musepack cleanup

Location:

xmms-musepack/branches/r2d/src

Files:

• libmpc.cpp (modified) (6 diffs)
• libmpc.h (modified) (2 diffs)

xmms-musepack/branches/r2d/src/libmpc.cpp

@@ -102 +102 @@
     xmms_cfg_read_boolean(cfg, "musepack", "dynamicBitrate", &pluginConfig.dynamicBitrate);
     xmms_cfg_read_boolean(cfg, "musepack", "replaygain",     &pluginConfig.replaygain);
-    xmms_cfg_read_boolean(cfg, "musepack", "fastSeek",       &pluginConfig.fastSeek);
     xmms_cfg_free(cfg);
 }
@@ -153 +152 @@
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bitrateCheck), pluginConfig.dynamicBitrate);
         gtk_box_pack_start(GTK_BOX(gSvbox), bitrateCheck, FALSE, FALSE, 0);
-
-        GtkWidget* seekCheck = gtk_check_button_new_with_label("Enable Fast Seeking");
-        widgets.seekCheck = seekCheck;
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(seekCheck), pluginConfig.fastSeek);
-        gtk_box_pack_start(GTK_BOX(gSvbox), seekCheck, FALSE, FALSE, 0);
         gtk_notebook_append_page(GTK_NOTEBOOK(notebook), generalSet, gtk_label_new("Plugin"));
 
@@ -234 +228 @@
     tb = GTK_TOGGLE_BUTTON(widgets.bitrateCheck);
     pluginConfig.dynamicBitrate = gtk_toggle_button_get_active(tb);
-    tb = GTK_TOGGLE_BUTTON(widgets.seekCheck);
-    pluginConfig.fastSeek = gtk_toggle_button_get_active(tb);
     tb = GTK_TOGGLE_BUTTON(widgets.albumCheck);
     pluginConfig.albumGain = gtk_toggle_button_get_active(tb);
@@ -245 +237 @@
     xmms_cfg_write_boolean (cfg, "musepack", "dynamicBitrate", pluginConfig.dynamicBitrate);
     xmms_cfg_write_boolean (cfg, "musepack", "replaygain",     pluginConfig.replaygain);
-    xmms_cfg_write_boolean (cfg, "musepack", "fastSeek",       pluginConfig.fastSeek);
     xmms_cfg_write_default_file (cfg);
 
@@ -781 +772 @@
     MpcPlugin.set_info(track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
 
-//      mpc_decoder_set_seeking(decoder, &info, pluginConfig.fastSeek);
     setReplaygain(demux);
 
@@ -869 +859 @@
 static void setReplaygain(mpc_demux * d)
 {
-        mpc_set_replay_level(d, 64.82, pluginConfig.replaygain,
+        mpc_set_replay_level(d, MPC_OLD_GAIN_REF, pluginConfig.replaygain,
                                                  !pluginConfig.albumGain, pluginConfig.clipPrevention);
 }

xmms-musepack/branches/r2d/src/libmpc.h

@@ -81 +81 @@
     gboolean albumGain;
     gboolean isEq;
-    gboolean fastSeek;
     iconv_t  iFromUTF8;
     iconv_t  iToUTF8;
@@ -91 +90 @@
     GtkWidget* configBox;
     GtkWidget* bitrateCheck;
-    GtkWidget* seekCheck;
     GtkWidget* clippingCheck;
     GtkWidget* replaygainCheck;