changeset 293:9b191695629c trunk

[svn] Add musepack input plugin & hook into build system.
author chainsaw
date Fri, 16 Dec 2005 16:08:46 -0800
parents f99bf98118fc
children 84b0ee2970d9
files Plugins/Input/Makefile.am Plugins/Input/musepack/Makefile.am Plugins/Input/musepack/config.h.in Plugins/Input/musepack/equalizer.cpp Plugins/Input/musepack/equalizer.h Plugins/Input/musepack/libmpc.cpp Plugins/Input/musepack/libmpc.h configure.ac
diffstat 8 files changed, 1396 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/Makefile.am	Fri Dec 16 12:17:53 2005 -0800
+++ b/Plugins/Input/Makefile.am	Fri Dec 16 16:08:46 2005 -0800
@@ -1,2 +1,2 @@
-ALL_PLUGINS = mpg123 aac modplug vorbis tonegen cdaudio sid wav flac console wma timidity
+ALL_PLUGINS = mpg123 aac modplug vorbis tonegen cdaudio sid wav flac console wma timidity musepack
 SUBDIRS = $(INPUT_PLUGINS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/Makefile.am	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,15 @@
+if ENABLE_MUSEPACK
+
+lib_LTLIBRARIES = libmpc.la
+
+endif
+
+libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+libmpc_la_LIBADD = @GTK_LIBS@ @TAGLIB_LIBS@
+
+libmpc_la_SOURCES = equalizer.cpp libmpc.cpp
+libmpc_la_LDFLAGS = -lmpcdec -avoid-version
+noinst_HEADERS = equalizer.h libmpc.h
+
+INCLUDES = $(GTK_CFLAGS) $(TAGLIB_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/config.h.in	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,82 @@
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <mpcdec/config_types.h> header file. */
+#undef HAVE_MPCDEC_CONFIG_TYPES_H
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Have TagLib */
+#undef HAVE_TAGLIB
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/equalizer.cpp	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,209 @@
+/*
+ *   Thanks to Felipe Rivera for letting us use some code from his
+ *   EQU-Plugin (http://equ.sourceforge.net/) for our Equalizer.
+ */
+
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include <glib.h>
+#include "equalizer.h"
+
+// Fixed Point Fractional bits
+#define FP_FRBITS 28
+
+// Conversions
+#define EQ_REAL(x) ((gint)((x) * (1 << FP_FRBITS)))
+
+/* Floating point */
+typedef struct {
+    float beta;
+    float alpha;
+    float gamma;
+} sIIRCoefficients;
+
+/* Coefficient history for the IIR filter */
+typedef struct {
+    float x[3];                 /* x[n], x[n-1], x[n-2] */
+    float y[3];                 /* y[n], y[n-1], y[n-2] */
+} sXYData;
+
+/* BETA, ALPHA, GAMMA */
+static sIIRCoefficients iir_cforiginal10[] = {
+    {(9.9421504945e-01), (2.8924752745e-03), (1.9941421835e+00)},   /*    60.0 Hz */
+    {(9.8335039428e-01), (8.3248028618e-03), (1.9827686547e+00)},   /*   170.0 Hz */
+    {(9.6958094144e-01), (1.5209529281e-02), (1.9676601546e+00)},   /*   310.0 Hz */
+    {(9.4163923306e-01), (2.9180383468e-02), (1.9345490229e+00)},   /*   600.0 Hz */
+    {(9.0450844499e-01), (4.7745777504e-02), (1.8852109613e+00)},   /*  1000.0 Hz */
+    {(7.3940088234e-01), (1.3029955883e-01), (1.5829158753e+00)},   /*  3000.0 Hz */
+    {(5.4697667908e-01), (2.2651166046e-01), (1.0153238114e+00)},   /*  6000.0 Hz */
+    {(3.1023210589e-01), (3.4488394706e-01), (-1.8142472036e-01)},  /* 12000.0 Hz */
+    {(2.6718639778e-01), (3.6640680111e-01), (-5.2117742267e-01)},  /* 14000.0 Hz */
+    {(2.4201241845e-01), (3.7899379077e-01), (-8.0847117831e-01)},  /* 16000.0 Hz */
+};
+
+/* History for two filters */
+static sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS];
+static sXYData data_history2[EQ_MAX_BANDS][EQ_CHANNELS];
+
+/* Coefficients */
+static sIIRCoefficients *iir_cf;
+
+/* Gain for each band
+ * values should be between -0.2 and 1.0 */
+static float gain[10];
+static float preamp;
+
+int round_trick(float floatvalue_to_round);
+
+
+static void
+output_set_eq(gboolean active, gfloat pre, gfloat * bands)
+{
+    int i;
+
+    preamp = 1.0 + 0.0932471 * pre + 0.00279033 * pre * pre;
+    for (i = 0; i < 10; ++i)
+        gain[i] = 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i];
+}
+
+/* Init the filter */
+void
+init_iir(int on, float preamp_ctrl, float *eq_ctrl)
+{
+    iir_cf = iir_cforiginal10;
+
+    /* Zero the history arrays */
+    memset(data_history, 0, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+    memset(data_history2, 0, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+
+    output_set_eq(on, preamp_ctrl, eq_ctrl);
+}
+
+int
+iir(char *d, gint length)
+{
+    gint16 *data = (gint16 *) d;
+
+    /* Indexes for the history arrays
+     * These have to be kept between calls to this function
+     * hence they are static */
+    static gint i = 0, j = 2, k = 1;
+
+    gint index, band, channel;
+    gint tempgint, halflength;
+    float out[EQ_CHANNELS], pcm[EQ_CHANNELS];
+
+    /**
+	 * IIR filter equation is
+	 * y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
+	 *
+	 * NOTE: The 2 factor was introduced in the coefficients to save
+	 * 			a multiplication
+	 *
+	 * This algorithm cascades two filters to get nice filtering
+	 * at the expense of extra CPU cycles
+	 */
+    /* 16bit, 2 bytes per sample, so divide by two the length of
+     * the buffer (length is in bytes)
+     */
+    halflength = (length >> 1);
+    for (index = 0; index < halflength; index += 2) {
+        /* For each channel */
+        for (channel = 0; channel < EQ_CHANNELS; channel++) {
+            /* No need to scale when processing the PCM with the filter */
+            pcm[channel] = data[index + channel];
+            /* Preamp gain */
+            pcm[channel] *= preamp;
+
+            out[channel] = 0;
+            /* For each band */
+            for (band = 0; band < 10; band++) {
+                /* Store Xi(n) */
+                data_history[band][channel].x[i] = pcm[channel];
+                /* Calculate and store Yi(n) */
+                data_history[band][channel].y[i] =
+                    (iir_cf[band].alpha * (data_history[band][channel].x[i]
+                                           - data_history[band][channel].x[k])
+                     + iir_cf[band].gamma * data_history[band][channel].y[j]
+                     - iir_cf[band].beta * data_history[band][channel].y[k]
+                    );
+                /*
+                 * The multiplication by 2.0 was 'moved' into the coefficients to save
+                 * CPU cycles here */
+                /* Apply the gain  */
+                out[channel] += data_history[band][channel].y[i] * gain[band];  // * 2.0;
+            }                   /* For each band */
+
+            if (false) {
+                /* Filter the sample again */
+                for (band = 0; band < 10; band++) {
+                    /* Store Xi(n) */
+                    data_history2[band][channel].x[i] = out[channel];
+                    /* Calculate and store Yi(n) */
+                    data_history2[band][channel].y[i] =
+                        (iir_cf[band].alpha *
+                         (data_history2[band][channel].x[i]
+                          - data_history2[band][channel].x[k])
+                         +
+                         iir_cf[band].gamma *
+                         data_history2[band][channel].y[j]
+                         -
+                         iir_cf[band].beta * data_history2[band][channel].y[k]
+                        );
+                    /* Apply the gain */
+                    out[channel] +=
+                        data_history2[band][channel].y[i] * gain[band];
+                }               /* For each band */
+            }
+
+            /* Volume stuff
+               Scale down original PCM sample and add it to the filters
+               output. This substitutes the multiplication by 0.25
+             */
+
+            out[channel] += (data[index + channel] >> 2);
+
+            //printf("out[channel] = %f\n", out[channel]);
+            /* Round and convert to integer */
+#if 0
+#ifdef PPC
+            tempgint = round_ppc(out[channel]);
+#else
+# ifdef X86
+            tempgint = round_trick(out[channel]);
+# else
+            tempgint = (int) lroundf(out[channel]);
+# endif
+#endif
+#endif
+            //tempgint = (int) lroundf(out[channel]);
+            tempgint = (int) out[channel];
+
+            //printf("iir: old=%d new=%d\n", data[index+channel], tempgint);
+            /* Limit the output */
+            if (tempgint < -32768)
+                data[index + channel] = -32768;
+            else if (tempgint > 32767)
+                data[index + channel] = 32767;
+            else
+                data[index + channel] = tempgint;
+        }                       /* For each channel */
+
+        i++;
+        j++;
+        k++;
+
+        /* Wrap around the indexes */
+        if (i == 3)
+            i = 0;
+        else if (j == 3)
+            j = 0;
+        else
+            k = 0;
+
+
+    }                           /* For each pair of samples */
+
+    return length;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/equalizer.h	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,11 @@
+#ifndef IIR_H
+#define IIR_H
+
+#define EQ_MAX_BANDS 10
+#define EQ_CHANNELS 2
+
+int iir(char * d, gint length);
+void init_iir(int on , float preamp_ctrl, float*  eq_ctrl);
+
+
+#endif                          /* #define IIR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/libmpc.cpp	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,870 @@
+#include "libmpc.h"
+
+#define FORCED_THREAD_STACKSIZE 1024 * 1000
+
+
+using TagLib::MPC::File;
+using TagLib::Tag;
+using TagLib::String;
+using TagLib::APE::ItemListMap;
+
+InputPlugin MpcPlugin = {
+    NULL,           //File Handle               FILE* handle
+    NULL,           //Filename                  char* filename
+    NULL,           //Name of Plugin            char* filename
+    mpcOpenPlugin,  //Open Plugin               [CALLBACK]
+    mpcAboutBox,    //Show About box            [CALLBACK]
+    mpcConfigBox,   //Show Configure box        [CALLBACK]
+    mpcIsOurFile,   //Check if it's our file    [CALLBACK]
+    NULL,           //Scan the directory        [UNUSED]
+    mpcPlay,        //Play                      [CALLBACK]
+    mpcStop,        //Stop                      [CALLBACK]
+    mpcPause,       //Pause                     [CALLBACK]
+    mpcSeek,        //Seek                      [CALLBACK]
+    mpcSetEq,       //Set EQ                    [CALLBACK]
+    mpcGetTime,     //Get Time                  [CALLBACK]
+    NULL,           //Get Volume                [UNUSED]
+    NULL,           //Set Volume                [UNUSED]
+    mpcClosePlugin, //Close Plugin              [CALLBACK]
+    NULL,           //Obsolete                  [UNUSED]
+    NULL,           //Visual plugins            add_vis_pcm(int time, AFormat fmt, int nch, int length, void *ptr)
+    NULL,           //Set Info Settings         set_info(char *title, int length, int rate, int freq, int nch)
+    NULL,           //set Info Text             set_info_text(char* text)
+    mpcGetSongInfo, //Get Title String callback [CALLBACK]
+    mpcFileInfoBox, //Show File Info Box        [CALLBACK]
+    NULL,           //Output Plugin Handle      OutputPlugin output
+};
+
+extern "C"
+InputPlugin* get_iplugin_info()
+{
+    MpcPlugin.description = g_strdup_printf("Musepack Audio Plugin 1.2");
+    return &MpcPlugin;
+}
+
+static PluginConfig pluginConfig = {0};
+static Widgets      widgets      = {0};
+static MpcDecoder   mpcDecoder   = {0};
+static TrackInfo    track        = {0};
+
+static pthread_t           threadHandle;
+static pthread_attr_t      threadAttr;
+static pthread_mutex_t     threadMutex;
+static pthread_mutexattr_t threadMutexAttr;
+
+static void mpcOpenPlugin()
+{
+    pthread_mutexattr_init(&threadMutexAttr);
+    pthread_mutex_init(&threadMutex, &threadMutexAttr);
+    pthread_attr_init(&threadAttr);
+    pthread_attr_setstacksize(&threadAttr, FORCED_THREAD_STACKSIZE);
+
+    ConfigDb *cfg;
+    cfg = bmp_cfg_db_open();
+    bmp_cfg_db_get_bool(cfg, "musepack", "clipPrevention", &pluginConfig.clipPrevention);
+    bmp_cfg_db_get_bool(cfg, "musepack", "albumGain",      &pluginConfig.albumGain);
+    bmp_cfg_db_get_bool(cfg, "musepack", "dynamicBitrate", &pluginConfig.dynamicBitrate);
+    bmp_cfg_db_get_bool(cfg, "musepack", "replaygain",     &pluginConfig.replaygain);
+    bmp_cfg_db_close(cfg);
+}
+
+static void mpcAboutBox()
+{
+    GtkWidget* aboutBox = widgets.aboutBox;
+    if (aboutBox)
+        gdk_window_raise(aboutBox->window);
+    else
+    {
+        char* titleText      = g_strdup_printf("Musepack Decoder Plugin 1.2");
+        char* contentText = "Plugin code by\nBenoit Amiaux\nMartin Spuler\nKuniklo\n\nGet latest version at http://musepack.net\n";
+        char* buttonText  = "Nevermind";
+        aboutBox = xmms_show_message(titleText, contentText, buttonText, FALSE, NULL, NULL);
+        widgets.aboutBox = aboutBox;
+        gtk_signal_connect(GTK_OBJECT(aboutBox), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &widgets.aboutBox);
+    }
+}
+
+static void mpcConfigBox()
+{
+    GtkWidget* configBox = widgets.configBox;
+    if(configBox)
+        gdk_window_raise(configBox->window);
+    else
+    {
+        configBox = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(configBox), GDK_WINDOW_TYPE_HINT_DIALOG);
+        widgets.configBox = configBox;
+        gtk_signal_connect(GTK_OBJECT(configBox), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &widgets.configBox);
+        gtk_window_set_title(GTK_WINDOW(configBox), "Musepack Decoder Configuration");
+        gtk_window_set_policy(GTK_WINDOW(configBox), FALSE, FALSE, FALSE);
+        gtk_container_border_width(GTK_CONTAINER(configBox), 10);
+
+        GtkWidget* notebook = gtk_notebook_new();
+        GtkWidget* vbox = gtk_vbox_new(FALSE, 10);
+        gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
+        gtk_container_add(GTK_CONTAINER(configBox), vbox);
+
+        //General Settings Tab
+        GtkWidget* generalSet = gtk_frame_new("General Settings");
+        gtk_container_border_width(GTK_CONTAINER(generalSet), 5);
+
+        GtkWidget* gSvbox = gtk_vbox_new(FALSE, 10);
+        gtk_container_border_width(GTK_CONTAINER(gSvbox), 5);
+        gtk_container_add(GTK_CONTAINER(generalSet), gSvbox);
+
+        GtkWidget* bitrateCheck = gtk_check_button_new_with_label("Enable Dynamic Bitrate Display");
+        widgets.bitrateCheck = bitrateCheck;
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bitrateCheck), pluginConfig.dynamicBitrate);
+        gtk_box_pack_start(GTK_BOX(gSvbox), bitrateCheck, FALSE, FALSE, 0);
+        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), generalSet, gtk_label_new("Plugin"));
+
+        //ReplayGain Settings Tab
+        GtkWidget* replaygainSet = gtk_frame_new("ReplayGain Settings");
+        gtk_container_border_width(GTK_CONTAINER(replaygainSet), 5);
+
+        GtkWidget* rSVbox = gtk_vbox_new(FALSE, 10);
+        gtk_container_border_width(GTK_CONTAINER(rSVbox), 5);
+        gtk_container_add(GTK_CONTAINER(replaygainSet), rSVbox);
+
+        GtkWidget* clippingCheck = gtk_check_button_new_with_label("Enable Clipping Prevention");
+        widgets.clippingCheck = clippingCheck;
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clippingCheck), pluginConfig.clipPrevention);
+        gtk_box_pack_start(GTK_BOX(rSVbox), clippingCheck, FALSE, FALSE, 0);
+
+        GtkWidget* replaygainCheck = gtk_check_button_new_with_label("Enable ReplayGain");
+        widgets.replaygainCheck = replaygainCheck;
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(replaygainCheck), pluginConfig.replaygain);
+        gtk_box_pack_start(GTK_BOX(rSVbox), replaygainCheck, FALSE, FALSE, 0);
+
+        GtkWidget* replaygainType = gtk_frame_new("ReplayGain Type");
+        gtk_box_pack_start(GTK_BOX(rSVbox), replaygainType, FALSE, FALSE, 0);
+        gtk_signal_connect(GTK_OBJECT(replaygainCheck), "toggled", GTK_SIGNAL_FUNC(toggleSwitch), replaygainType);
+
+        GtkWidget* rgVbox = gtk_vbox_new(FALSE, 5);
+        gtk_container_set_border_width(GTK_CONTAINER(rgVbox), 5);
+        gtk_container_add(GTK_CONTAINER(replaygainType), rgVbox);
+
+        GtkWidget* trackCheck = gtk_radio_button_new_with_label(NULL, "Use Track Gain");
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheck), !pluginConfig.albumGain);
+        gtk_box_pack_start(GTK_BOX(rgVbox), trackCheck, FALSE, FALSE, 0);
+
+        GtkWidget* albumCheck = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(trackCheck)), "Use Album Gain");
+        widgets.albumCheck = albumCheck;
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(albumCheck), pluginConfig.albumGain);
+        gtk_box_pack_start(GTK_BOX(rgVbox), albumCheck, FALSE, FALSE, 0);
+        gtk_widget_set_sensitive(replaygainType, pluginConfig.replaygain);
+        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), replaygainSet, gtk_label_new("ReplayGain"));
+
+        //Buttons
+        GtkWidget* buttonBox = gtk_hbutton_box_new();
+        gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
+        gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonBox), 5);
+        gtk_box_pack_start(GTK_BOX(vbox), buttonBox, FALSE, FALSE, 0);
+
+        GtkWidget* okButton = gtk_button_new_with_label("Ok");
+        gtk_signal_connect(GTK_OBJECT(okButton), "clicked", GTK_SIGNAL_FUNC(saveConfigBox), NULL);
+        GTK_WIDGET_SET_FLAGS(okButton, GTK_CAN_DEFAULT);
+        gtk_box_pack_start(GTK_BOX(buttonBox), okButton, TRUE, TRUE, 0);
+
+        GtkWidget* cancelButton = gtk_button_new_with_label("Cancel");
+        gtk_signal_connect_object(GTK_OBJECT(cancelButton), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(widgets.configBox));
+        GTK_WIDGET_SET_FLAGS(cancelButton, GTK_CAN_DEFAULT);
+        gtk_widget_grab_default(cancelButton);
+        gtk_box_pack_start(GTK_BOX(buttonBox), cancelButton, TRUE, TRUE, 0);
+
+        gtk_widget_show_all(configBox);
+    }
+}
+
+static void toggleSwitch(GtkWidget* p_Widget, gpointer p_Data)
+{
+    gtk_widget_set_sensitive(GTK_WIDGET(p_Data), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_Widget)));
+}
+
+static void saveConfigBox(GtkWidget* p_Widget, gpointer p_Data)
+{
+    ConfigDb* cfg;
+    GtkToggleButton* tb;
+
+    tb = GTK_TOGGLE_BUTTON(widgets.replaygainCheck);
+    pluginConfig.replaygain = gtk_toggle_button_get_active(tb);
+    tb = GTK_TOGGLE_BUTTON(widgets.clippingCheck);
+    pluginConfig.clipPrevention = gtk_toggle_button_get_active(tb);
+    tb = GTK_TOGGLE_BUTTON(widgets.bitrateCheck);
+    pluginConfig.dynamicBitrate = gtk_toggle_button_get_active(tb);
+    tb = GTK_TOGGLE_BUTTON(widgets.albumCheck);
+    pluginConfig.albumGain = gtk_toggle_button_get_active(tb);
+
+    cfg = bmp_cfg_db_open();
+
+    bmp_cfg_db_set_bool(cfg, "musepack", "clipPrevention", pluginConfig.clipPrevention);
+    bmp_cfg_db_set_bool(cfg, "musepack", "albumGain",      pluginConfig.albumGain);
+    bmp_cfg_db_set_bool(cfg, "musepack", "dynamicBitrate", pluginConfig.dynamicBitrate);
+    bmp_cfg_db_set_bool(cfg, "musepack", "replaygain",     pluginConfig.replaygain);
+
+    bmp_cfg_db_close(cfg);
+
+    gtk_widget_destroy (widgets.configBox);
+}
+
+static int mpcIsOurFile(char* p_Filename)
+{
+    char* ext;
+    ext = strrchr(p_Filename, '.');
+    if(ext)
+        return !(strcasecmp(ext, ".mpc") && strcasecmp(ext, ".mpp") && strcasecmp(ext, ".mp+"));
+    return FALSE;
+}
+
+static void mpcPlay(char* p_Filename)
+{
+    mpcDecoder.offset   = -1;
+    mpcDecoder.isAlive  = true;
+    mpcDecoder.isOutput = false;
+    mpcDecoder.isPause  = false;
+    pthread_create(&threadHandle, &threadAttr, decodeStream, (void *) g_strdup(p_Filename));
+}
+
+static void mpcStop()
+{
+    setAlive(false);
+    if (threadHandle)
+    {
+        pthread_join(threadHandle, NULL);
+        if (mpcDecoder.isOutput)
+        {
+            MpcPlugin.output->buffer_free();
+            MpcPlugin.output->close_audio();
+            mpcDecoder.isOutput = false;
+        }
+    }
+}
+
+static void mpcPause(short p_Pause)
+{
+    lockAcquire();
+    mpcDecoder.isPause = p_Pause;
+    MpcPlugin.output->pause(p_Pause);
+    lockRelease();
+}
+
+static void mpcSeek(int p_Offset)
+{
+    lockAcquire();
+    mpcDecoder.offset = static_cast<double> (p_Offset);
+    MpcPlugin.output->flush(1000 * p_Offset);
+    lockRelease();
+}
+
+static void mpcSetEq(int on, float preamp, float* eq)
+{
+    pluginConfig.isEq = static_cast<bool> (on);
+    init_iir(on, preamp, eq);
+}
+
+static int mpcGetTime()
+{
+    if(!isAlive())
+        return -1;
+    return MpcPlugin.output->output_time();
+}
+
+static void mpcClosePlugin()
+{
+    pthread_mutex_destroy(&threadMutex);
+    pthread_mutexattr_destroy(&threadMutexAttr);
+    pthread_attr_destroy(&threadAttr);
+}
+
+static void mpcGetSongInfo(char* p_Filename, char** p_Title, int* p_Length)
+{
+    FILE* input = fopen(p_Filename, "rb");
+    if(input)
+    {
+        MpcInfo tags = getTags(p_Filename);
+        *p_Title = mpcGenerateTitle(tags, p_Filename);
+        freeTags(tags);
+        mpc_streaminfo info;
+        mpc_reader_file reader;
+        mpc_reader_setup_file_reader(&reader, input);
+        mpc_streaminfo_read(&info, &reader.reader);
+        *p_Length = static_cast<int> (1000 * mpc_streaminfo_get_length(&info));
+        fclose(input);
+    }
+    else
+    {
+        char* temp = g_strdup_printf("[xmms-musepack] mpcGetSongInfo is unable to open %s\n", p_Filename);
+        perror(temp);
+        free(temp);
+    }
+}
+
+static void freeTags(MpcInfo& tags)
+{
+    free(tags.title);
+    free(tags.artist);
+    free(tags.album);
+    free(tags.comment);
+    free(tags.genre);
+    free(tags.date);
+}
+
+static MpcInfo getTags(const char* p_Filename)
+{
+    File oFile(p_Filename, false);
+    Tag* poTag = oFile.tag();
+    MpcInfo tags = {0};
+    tags.title   = g_strdup(poTag->title().toCString(true));
+    tags.artist  = g_strdup(poTag->artist().toCString(true));
+    tags.album   = g_strdup(poTag->album().toCString(true));
+    tags.genre   = g_strdup(poTag->genre().toCString(true));
+    tags.comment = g_strdup(poTag->comment().toCString(true));
+    tags.year    = poTag->year();
+    tags.track   = poTag->track();
+    TagLib::APE::Tag* ape = oFile.APETag(false);
+    if(ape)
+    {
+        ItemListMap map = ape->itemListMap();
+        if(map.contains("YEAR"))
+        {
+            tags.date = g_strdup(map["YEAR"].toString().toCString(true));
+        }
+        else
+        {
+            tags.date = g_strdup_printf("%d", tags.year);
+        }
+    }
+    return tags;
+}
+
+static void mpcFileInfoBox(char* p_Filename)
+{
+    GtkWidget* infoBox = widgets.infoBox;
+
+    if(infoBox)
+        gdk_window_raise(infoBox->window);
+    else
+    {
+        infoBox = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        gtk_window_set_type_hint(GTK_WINDOW(infoBox), GDK_WINDOW_TYPE_HINT_DIALOG);
+        widgets.infoBox = infoBox;
+        gtk_window_set_policy(GTK_WINDOW(infoBox), FALSE, FALSE, FALSE);
+        gtk_signal_connect(GTK_OBJECT(infoBox), "destroy", GTK_SIGNAL_FUNC(closeInfoBox), NULL);
+        gtk_container_set_border_width(GTK_CONTAINER(infoBox), 10);
+
+        GtkWidget* iVbox = gtk_vbox_new(FALSE, 10);
+        gtk_container_add(GTK_CONTAINER(infoBox), iVbox);
+
+        GtkWidget* filenameHbox = gtk_hbox_new(FALSE, 5);
+        gtk_box_pack_start(GTK_BOX(iVbox), filenameHbox, FALSE, TRUE, 0);
+
+        GtkWidget* fileLabel = gtk_label_new("Filename:");
+        gtk_box_pack_start(GTK_BOX(filenameHbox), fileLabel, FALSE, TRUE, 0);
+
+        GtkWidget* fileEntry = gtk_entry_new();
+        widgets.fileEntry = fileEntry;
+        gtk_editable_set_editable(GTK_EDITABLE(fileEntry), FALSE);
+        gtk_box_pack_start(GTK_BOX(filenameHbox), fileEntry, TRUE, TRUE, 0);
+
+        GtkWidget* iHbox = gtk_hbox_new(FALSE, 10);
+        gtk_box_pack_start(GTK_BOX(iVbox), iHbox, FALSE, TRUE, 0);
+
+        GtkWidget* leftBox = gtk_vbox_new(FALSE, 10);
+        gtk_box_pack_start(GTK_BOX(iHbox), leftBox, FALSE, FALSE, 0);
+
+        //Tag labels
+        GtkWidget* tagFrame = gtk_frame_new("Musepack Tag");
+        gtk_box_pack_start(GTK_BOX(leftBox), tagFrame, FALSE, FALSE, 0);
+        gtk_widget_set_sensitive(tagFrame, TRUE);
+
+        GtkWidget* iTable = gtk_table_new(5, 5, FALSE);
+        gtk_container_set_border_width(GTK_CONTAINER(iTable), 5);
+        gtk_container_add(GTK_CONTAINER(tagFrame), iTable);
+
+        mpcGtkTagLabel("Title:", 0, 1, 0, 1, iTable);
+        GtkWidget* titleEntry = mpcGtkTagEntry(1, 4, 0, 1, 0, iTable);
+        widgets.titleEntry = titleEntry;
+
+        mpcGtkTagLabel("Artist:", 0, 1, 1, 2, iTable);
+        GtkWidget* artistEntry = mpcGtkTagEntry(1, 4, 1, 2, 0, iTable);
+        widgets.artistEntry = artistEntry;
+
+        mpcGtkTagLabel("Album:", 0, 1, 2, 3, iTable);
+        GtkWidget* albumEntry = mpcGtkTagEntry(1, 4, 2, 3, 0, iTable);
+        widgets.albumEntry = albumEntry;
+
+        mpcGtkTagLabel("Comment:", 0, 1, 3, 4, iTable);
+        GtkWidget* commentEntry = mpcGtkTagEntry(1, 4, 3, 4, 0, iTable);
+        widgets.commentEntry = commentEntry;
+
+        mpcGtkTagLabel("Year:", 0, 1, 4, 5, iTable);
+        GtkWidget* yearEntry = mpcGtkTagEntry(1, 2, 4, 5, 4, iTable);
+        widgets.yearEntry = yearEntry;
+        gtk_widget_set_usize(yearEntry, 4, -1);
+
+        mpcGtkTagLabel("Track:", 2, 3, 4, 5, iTable);
+        GtkWidget* trackEntry = mpcGtkTagEntry(3, 4, 4, 5, 4, iTable);
+        widgets.trackEntry = trackEntry;
+        gtk_widget_set_usize(trackEntry, 3, -1);
+
+        mpcGtkTagLabel("Genre:", 0, 1, 5, 6, iTable);
+        GtkWidget* genreEntry = mpcGtkTagEntry(1, 4, 5, 6, 0, iTable);
+        widgets.genreEntry = genreEntry;
+        gtk_widget_set_usize(genreEntry, 20, -1);
+
+        //Buttons
+        GtkWidget* buttonBox = gtk_hbutton_box_new();
+        gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
+        gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonBox), 5);
+        gtk_box_pack_start(GTK_BOX(leftBox), buttonBox, FALSE, FALSE, 0);
+
+        GtkWidget* saveButton = mpcGtkButton("Save", buttonBox);
+        gtk_signal_connect(GTK_OBJECT(saveButton), "clicked", GTK_SIGNAL_FUNC(saveTags), NULL);
+
+        GtkWidget* removeButton = mpcGtkButton("Remove Tag", buttonBox);
+        gtk_signal_connect_object(GTK_OBJECT(removeButton), "clicked", GTK_SIGNAL_FUNC(removeTags), NULL);
+
+        GtkWidget* cancelButton = mpcGtkButton("Cancel", buttonBox);
+        gtk_signal_connect_object(GTK_OBJECT(cancelButton), "clicked", GTK_SIGNAL_FUNC(closeInfoBox), NULL);
+        gtk_widget_grab_default(cancelButton);
+
+        //File information
+        GtkWidget* infoFrame = gtk_frame_new("Musepack Info");
+        gtk_box_pack_start(GTK_BOX(iHbox), infoFrame, FALSE, FALSE, 0);
+
+        GtkWidget* infoVbox = gtk_vbox_new(FALSE, 5);
+        gtk_container_add(GTK_CONTAINER(infoFrame), infoVbox);
+        gtk_container_set_border_width(GTK_CONTAINER(infoVbox), 10);
+        gtk_box_set_spacing(GTK_BOX(infoVbox), 0);
+
+        GtkWidget* streamLabel    = mpcGtkLabel(infoVbox);
+        GtkWidget* encoderLabel   = mpcGtkLabel(infoVbox);
+        GtkWidget* profileLabel   = mpcGtkLabel(infoVbox);
+        GtkWidget* bitrateLabel   = mpcGtkLabel(infoVbox);
+        GtkWidget* rateLabel      = mpcGtkLabel(infoVbox);
+        GtkWidget* channelsLabel  = mpcGtkLabel(infoVbox);
+        GtkWidget* lengthLabel    = mpcGtkLabel(infoVbox);
+        GtkWidget* fileSizeLabel  = mpcGtkLabel(infoVbox);
+        GtkWidget* trackPeakLabel = mpcGtkLabel(infoVbox);
+        GtkWidget* trackGainLabel = mpcGtkLabel(infoVbox);
+        GtkWidget* albumPeakLabel = mpcGtkLabel(infoVbox);
+        GtkWidget* albumGainLabel = mpcGtkLabel(infoVbox);
+
+        FILE* input = fopen(p_Filename, "rb");
+        if(input)
+        {
+            mpc_streaminfo info;
+            mpc_reader_file reader;
+            mpc_reader_setup_file_reader(&reader, input);
+            mpc_streaminfo_read(&info, &reader.reader);
+
+            int time = static_cast<int> (mpc_streaminfo_get_length(&info));
+            int minutes = time / 60;
+            int seconds = time % 60;
+
+            mpcGtkPrintLabel(streamLabel,    "Streamversion %d", info.stream_version);
+            mpcGtkPrintLabel(encoderLabel,   "Encoder: \%s", info.encoder);
+            mpcGtkPrintLabel(profileLabel,   "Profile: \%s", info.profile_name);
+            mpcGtkPrintLabel(bitrateLabel,   "Average bitrate: \%6.1f kbps", info.average_bitrate * 1.e-3);
+            mpcGtkPrintLabel(rateLabel,      "Samplerate: \%d Hz", info.sample_freq);
+            mpcGtkPrintLabel(channelsLabel,  "Channels: \%d", info.channels);
+            mpcGtkPrintLabel(lengthLabel,    "Length: \%d:\%.2d", minutes, seconds);
+            mpcGtkPrintLabel(fileSizeLabel,  "File size: \%d Bytes", info.total_file_length);
+            mpcGtkPrintLabel(trackPeakLabel, "Track Peak: \%5u", info.peak_title);
+            mpcGtkPrintLabel(trackGainLabel, "Track Gain: \%-+2.2f dB", 0.01 * info.gain_title);
+            mpcGtkPrintLabel(albumPeakLabel, "Album Peak: \%5u", info.peak_album);
+            mpcGtkPrintLabel(albumGainLabel, "Album Gain: \%-+5.2f dB", 0.01 * info.gain_album);
+
+            MpcInfo tags = getTags(p_Filename);
+            gtk_entry_set_text(GTK_ENTRY(titleEntry),   tags.title);
+            gtk_entry_set_text(GTK_ENTRY(artistEntry),  tags.artist);
+            gtk_entry_set_text(GTK_ENTRY(albumEntry),   tags.album);
+            gtk_entry_set_text(GTK_ENTRY(commentEntry), tags.comment);
+            gtk_entry_set_text(GTK_ENTRY(genreEntry),   tags.genre);
+            char* entry = g_strdup_printf ("%d", tags.track);
+            gtk_entry_set_text(GTK_ENTRY(trackEntry), entry);
+            free(entry);
+            entry = g_strdup_printf ("%d", tags.year);
+            gtk_entry_set_text(GTK_ENTRY(yearEntry), entry);
+            free(entry);
+            entry = g_filename_display_name(p_Filename);
+            gtk_entry_set_text(GTK_ENTRY(fileEntry), entry);
+            free(entry);
+            freeTags(tags);
+            fclose(input);
+        }
+        else
+        {
+            char* temp = g_strdup_printf("[xmms-musepack] mpcFileInfoBox is unable to read tags from %s", p_Filename);
+            perror(temp);
+            free(temp);
+        }
+
+	char* name = g_filename_display_basename(p_Filename);
+        char* text = g_strdup_printf("File Info - %s", name);
+        free(name);
+        gtk_window_set_title(GTK_WINDOW(infoBox), text);
+        free(text);
+
+        gtk_widget_show_all(infoBox);
+    }
+}
+
+static void mpcGtkPrintLabel(GtkWidget* widget, char* format,...)
+{
+    va_list args;
+
+    va_start(args, format);
+    char* temp = g_strdup_vprintf(format, args);
+    va_end(args);
+
+    gtk_label_set_text(GTK_LABEL(widget), temp);
+    free(temp);
+}
+
+static GtkWidget* mpcGtkTagLabel(char* p_Text, int a, int b, int c, int d, GtkWidget* p_Box)
+{
+    GtkWidget* label = gtk_label_new(p_Text);
+    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+    gtk_table_attach(GTK_TABLE(p_Box), label, a, b, c, d, GTK_FILL, GTK_FILL, 5, 5);
+    return label;
+}
+
+static GtkWidget* mpcGtkTagEntry(int a, int b, int c, int d, int p_Size, GtkWidget* p_Box)
+{
+    GtkWidget* entry;
+    if(p_Size == 0)
+        entry = gtk_entry_new();
+    else
+        entry = gtk_entry_new_with_max_length(p_Size);
+    gtk_table_attach(GTK_TABLE(p_Box), entry, a, b, c, d,
+                    (GtkAttachOptions) (GTK_FILL | GTK_EXPAND | GTK_SHRINK),
+                    (GtkAttachOptions) (GTK_FILL | GTK_EXPAND | GTK_SHRINK), 0, 5);
+    return entry;
+}
+
+static GtkWidget* mpcGtkLabel(GtkWidget* p_Box)
+{
+    GtkWidget* label = gtk_label_new("");
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+    gtk_box_pack_start(GTK_BOX(p_Box), label, FALSE, FALSE, 0);
+    return label;
+}
+
+static GtkWidget* mpcGtkButton(char* p_Text, GtkWidget* p_Box)
+{
+    GtkWidget* button = gtk_button_new_with_label(p_Text);
+    GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+    gtk_box_pack_start(GTK_BOX(p_Box), button, TRUE, TRUE, 0);
+    return button;
+}
+
+static void removeTags(GtkWidget * w, gpointer data)
+{
+    File oFile(gtk_entry_get_text(GTK_ENTRY(widgets.fileEntry)));
+    oFile.remove();
+    oFile.save();
+    closeInfoBox(NULL, NULL);
+}
+
+static void saveTags(GtkWidget* w, gpointer data)
+{
+    File oFile(gtk_entry_get_text(GTK_ENTRY(widgets.fileEntry)));
+    Tag* poTag = oFile.tag();
+
+    char* cAlbum   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.albumEntry)));
+    char* cArtist  = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.artistEntry)));
+    char* cTitle   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.titleEntry)));
+    char* cGenre   = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.genreEntry)));
+    char* cComment = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.commentEntry)));
+
+    const String album   = String(cAlbum,   TagLib::String::UTF8);
+    const String artist  = String(cArtist,  TagLib::String::UTF8);
+    const String title   = String(cTitle,   TagLib::String::UTF8);
+    const String genre   = String(cGenre,   TagLib::String::UTF8);
+    const String comment = String(cComment, TagLib::String::UTF8);
+
+    poTag->setAlbum(album);
+    poTag->setArtist(artist);
+    poTag->setTitle(title);
+    poTag->setGenre(genre);
+    poTag->setComment(comment);
+    poTag->setYear(atoi(gtk_entry_get_text(GTK_ENTRY(widgets.yearEntry))));
+    poTag->setTrack(atoi(gtk_entry_get_text(GTK_ENTRY(widgets.trackEntry))));
+
+    free(cAlbum);
+    free(cArtist);
+    free(cTitle);
+    free(cGenre);
+    free(cComment);
+
+    oFile.save();
+    closeInfoBox(NULL, NULL);
+}
+
+static void closeInfoBox(GtkWidget* w, gpointer data)
+{
+    gtk_widget_destroy(widgets.infoBox);
+    widgets.infoBox = NULL;
+}
+
+static char* mpcGenerateTitle(const MpcInfo& p_Tags, const char* p_Filename)
+{
+    TitleInput* input;
+    //From titlestring.h
+    input            = g_new0(TitleInput, 1);
+    input->__size    = XMMS_TITLEINPUT_SIZE;
+    input->__version = XMMS_TITLEINPUT_VERSION;
+    //end
+
+    input->file_name    = g_filename_display_basename(p_Filename);
+    input->file_path    = g_path_get_dirname(p_Filename);
+    input->file_ext     = "mpc";
+    input->date         = g_strdup(p_Tags.date);
+    input->track_name   = g_strdup(p_Tags.title);
+    input->performer    = g_strdup(p_Tags.artist);
+    input->album_name   = g_strdup(p_Tags.album);
+    input->track_number = p_Tags.track;
+    input->year         = p_Tags.year;
+    input->genre        = g_strdup(p_Tags.genre);
+    input->comment      = g_strdup(p_Tags.comment);
+
+    char* title = xmms_get_titlestring (xmms_get_gentitle_format(), input);
+    if(!title)
+        title = g_strdup(input->file_name);
+    else if (!*title)
+        title = g_strdup(input->file_name);
+
+    free(input->file_name);
+    free(input->file_path);
+    free(input->track_name);
+    free(input->performer);
+    free(input->album_name);
+    free(input->genre);
+    free(input->comment);
+    free(input->date);
+    g_free(input);
+    return title;
+}
+
+static void* endThread(char* p_FileName, FILE* p_FileHandle, bool release)
+{
+    free(p_FileName);
+    if(release)
+        lockRelease();
+    if(mpcDecoder.isError)
+    {
+        perror(mpcDecoder.isError);
+        free(mpcDecoder.isError);
+        mpcDecoder.isError = NULL;
+    }
+    setAlive(false);
+    if(p_FileHandle)
+        fclose(p_FileHandle);
+    if(track.display)
+    {
+        free(track.display);
+        track.display = NULL;
+    }
+    pthread_exit(NULL);
+    return 0;
+}
+
+static void* decodeStream(void* data)
+{
+    lockAcquire();
+    char* filename = static_cast<char*> (data);
+    FILE* input = fopen(filename, "rb");
+    if (!input)
+    {
+        mpcDecoder.isError = g_strdup_printf("[xmms-musepack] decodeStream is unable to open %s", filename);
+        return endThread(filename, input, true);
+    }
+
+    mpc_reader_file reader;
+    mpc_reader_setup_file_reader(&reader, input);
+
+    mpc_streaminfo info;
+    if (mpc_streaminfo_read(&info, &reader.reader) != ERROR_CODE_OK)
+    {
+        mpcDecoder.isError = g_strdup_printf("[xmms-musepack] decodeStream is unable to read %s", filename);
+        return endThread(filename, input, true);
+    }
+
+    MpcInfo tags     = getTags(filename);
+    track.display    = mpcGenerateTitle(tags, filename);
+    track.length     = static_cast<int> (1000 * mpc_streaminfo_get_length(&info));
+    track.bitrate    = static_cast<int> (info.average_bitrate);
+    track.sampleFreq = info.sample_freq;
+    track.channels   = info.channels;
+    freeTags(tags);
+
+    MpcPlugin.set_info(track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
+
+    mpc_decoder decoder;
+    mpc_decoder_setup(&decoder, &reader.reader);
+    if (!mpc_decoder_initialize(&decoder, &info))
+    {
+        mpcDecoder.isError = g_strdup_printf("[xmms-musepack] decodeStream is unable to initialize decoder on %s", filename);
+        return endThread(filename, input, true);
+    }
+
+    setReplaygain(info, decoder);
+
+    MPC_SAMPLE_FORMAT sampleBuffer[MPC_DECODER_BUFFER_LENGTH];
+    char xmmsBuffer[MPC_DECODER_BUFFER_LENGTH * 4];
+
+    if (!MpcPlugin.output->open_audio(FMT_S16_LE, track.sampleFreq, track.channels))
+    {
+        mpcDecoder.isError = g_strdup_printf("[xmms-musepack] decodeStream is unable to open an audio output");
+        return endThread(filename, input, true);
+    }
+    else
+    {
+        mpcDecoder.isOutput = true;
+    }
+
+    lockRelease();
+
+    int counter = 2 * track.sampleFreq / 3;
+    while (isAlive())
+    {
+        if (getOffset() != -1)
+        {
+            mpc_decoder_seek_seconds(&decoder, mpcDecoder.offset);
+            setOffset(-1);
+        }
+
+        lockAcquire();
+        short iPlaying = MpcPlugin.output->buffer_playing()? 1 : 0;
+        int iFree = MpcPlugin.output->buffer_free();
+        if (!mpcDecoder.isPause &&  iFree >= ((1152 * 4) << iPlaying))
+        {
+            unsigned status = processBuffer(sampleBuffer, xmmsBuffer, decoder);
+            if (status == (unsigned) (-1))
+            {
+                mpcDecoder.isError = g_strdup_printf("[xmms-musepack] error from internal decoder on %s", filename);
+                return endThread(filename, input, true);
+            }
+            else if (status == 0)
+            {
+                //mpcDecoder.isError = g_strdup_printf("[xmms-musepack] null output from internal decoder on %s", filename);
+                return endThread(filename, input, true);
+            }
+            lockRelease();
+
+            if(pluginConfig.dynamicBitrate)
+            {
+                counter -= status;
+                if(counter < 0)
+                {
+                    MpcPlugin.set_info(track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
+                    counter = 2 * track.sampleFreq / 3;
+                }
+            }
+        }
+        else
+        {
+            lockRelease();
+            xmms_usleep(10000);
+        }
+    }
+    return endThread(filename, input, false);
+}
+
+static int processBuffer(MPC_SAMPLE_FORMAT* sampleBuffer, char* xmmsBuffer, mpc_decoder& decoder)
+{
+    mpc_uint32_t vbrAcc = 0;
+    mpc_uint32_t vbrUpd = 0;
+
+    unsigned status  = mpc_decoder_decode(&decoder, sampleBuffer, &vbrAcc, &vbrUpd);
+    copyBuffer(sampleBuffer, xmmsBuffer, status);
+
+    if (pluginConfig.dynamicBitrate)
+    {
+        track.bitrate = static_cast<int> (vbrUpd * track.sampleFreq / 1152);
+    }
+
+    if (pluginConfig.isEq)
+    {
+        iir(xmmsBuffer, 4 * status);
+    }
+
+    MpcPlugin.add_vis_pcm(MpcPlugin.output->written_time(), FMT_S16_LE, track.channels, status * 4, xmmsBuffer);
+    MpcPlugin.output->write_audio(xmmsBuffer, status * 4);
+    return status;
+}
+
+static void setReplaygain(mpc_streaminfo& info, mpc_decoder& decoder)
+{
+    if(!pluginConfig.replaygain && !pluginConfig.clipPrevention)
+        return;
+
+    int peak    = pluginConfig.albumGain ? info.peak_album : info.peak_title;
+    double gain = pluginConfig.albumGain ? info.gain_album : info.gain_title;
+
+    if(!peak)
+        peak = 32767;
+    if(!gain)
+        gain = 1.;
+
+    double clip = 32767. / peak;
+    gain = exp((M_LN10 / 2000.) * gain);
+
+    if(pluginConfig.clipPrevention && !pluginConfig.replaygain)
+        gain = clip;
+    else if(pluginConfig.replaygain && pluginConfig.clipPrevention)
+        if(clip < gain)
+            gain = clip;
+
+    mpc_decoder_scale_output(&decoder, gain);
+}
+
+inline static void lockAcquire()
+{
+    pthread_mutex_lock(&threadMutex);
+}
+
+inline static void lockRelease()
+{
+    pthread_mutex_unlock(&threadMutex);
+}
+
+inline static bool isAlive()
+{
+    lockAcquire();
+    bool isAlive = mpcDecoder.isAlive;
+    lockRelease();
+    return isAlive;
+}
+
+inline static bool isPause()
+{
+    lockAcquire();
+    bool isPause = mpcDecoder.isPause;
+    lockRelease();
+    return isPause;
+}
+
+inline static void setAlive(bool isAlive)
+{
+    lockAcquire();
+    mpcDecoder.isAlive = isAlive;
+    lockRelease();
+}
+
+inline static double getOffset()
+{
+    lockAcquire();
+    double offset = mpcDecoder.offset;
+    lockRelease();
+    return offset;
+}
+
+inline static void setOffset(double offset)
+{
+    lockAcquire();
+    mpcDecoder.offset = offset;
+    lockRelease();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Input/musepack/libmpc.h	Fri Dec 16 16:08:46 2005 -0800
@@ -0,0 +1,176 @@
+#ifndef XMMS_MUSEPACK
+#define XMMS_MUSEPACK
+
+//xmms headers
+extern "C"
+{
+#include "audacious/plugin.h"
+#include "libaudacious/util.h"
+#include "libaudacious/configdb.h"
+#include "libaudacious/titlestring.h"
+}
+
+//stdlib headers
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <math.h>
+
+//libmpcdec headers
+#include <mpcdec/mpcdec.h>
+
+//GTK+ headers
+#include <glib.h>
+#include <gtk/gtk.h>
+
+//taglib headers
+#include <taglib/tag.h>
+#include <taglib/apetag.h>
+#include <taglib/mpcfile.h>
+
+#include "equalizer.h"
+
+#ifndef M_LN10
+#define M_LN10    2.3025850929940456840179914546843642
+#endif
+
+typedef struct PluginConfig
+{
+    gboolean clipPrevention;
+    gboolean dynamicBitrate;
+    gboolean replaygain;
+    gboolean albumGain;
+    gboolean isEq;
+};
+
+typedef struct Widgets
+{
+    GtkWidget* aboutBox;
+    GtkWidget* configBox;
+    GtkWidget* bitrateCheck;
+    GtkWidget* clippingCheck;
+    GtkWidget* replaygainCheck;
+    GtkWidget* albumCheck;
+    GtkWidget* infoBox;
+    GtkWidget* albumEntry;
+    GtkWidget* artistEntry;
+    GtkWidget* titleEntry;
+    GtkWidget* genreEntry;
+    GtkWidget* yearEntry;
+    GtkWidget* trackEntry;
+    GtkWidget* commentEntry;
+    GtkWidget* fileEntry;
+};
+
+typedef struct MpcDecoder
+{
+    char*      isError;
+    double     offset;
+    bool       isOutput;
+    bool       isAlive;
+    bool       isPause;
+};
+
+typedef struct TrackInfo
+{
+    int   bitrate;
+    char* display;
+    int   length;
+    int   sampleFreq;
+    int   channels;
+};
+
+typedef struct MpcInfo
+{
+    char*    title;
+    char*    artist;
+    char*    album;
+    char*    comment;
+    char*    genre;
+    char*    date;
+    unsigned track;
+    unsigned year;
+};
+
+extern "C" InputPlugin * get_iplugin_info(void);
+
+static void       mpcOpenPlugin();
+static void       mpcAboutBox();
+static void       mpcConfigBox();
+static void       toggleSwitch(GtkWidget*, gpointer);
+static void       saveConfigBox(GtkWidget*, gpointer);
+static int        mpcIsOurFile(char*);
+static void       mpcPlay(char*);
+static void       mpcStop();
+static void       mpcPause(short);
+static void       mpcSeek(int);
+static void       mpcSetEq(int, float, float*);
+static int        mpcGetTime();
+static void       mpcClosePlugin();
+static void       mpcGetSongInfo(char*, char**, int*);
+static void       freeTags(MpcInfo&);
+static MpcInfo    getTags(const char*);
+static void       mpcFileInfoBox(char*);
+static void       mpcGtkPrintLabel(GtkWidget*, char*, ...);
+static GtkWidget* mpcGtkTagLabel(char*, int, int, int, int, GtkWidget*);
+static GtkWidget* mpcGtkTagEntry(int, int, int, int, int, GtkWidget*);
+static GtkWidget* mpcGtkLabel(GtkWidget*);
+static GtkWidget* mpcGtkButton(char*, GtkWidget*);
+static void       removeTags(GtkWidget*, gpointer);
+static void       saveTags(GtkWidget*, gpointer);
+static void       closeInfoBox(GtkWidget*, gpointer);
+static char*      mpcGenerateTitle(const MpcInfo&, const char*);
+static void       lockAcquire();
+static void       lockRelease();
+static void*      decodeStream(void*);
+static int        processBuffer(MPC_SAMPLE_FORMAT*, char*, mpc_decoder&);
+static void*      endThread(char*, FILE*, bool);
+static bool       isAlive();
+static void       setAlive(bool);
+static double     getOffset();
+static void       setOffset(double);
+static bool       isPause();
+static void       setReplaygain(mpc_streaminfo&, mpc_decoder&);
+
+#ifdef MPC_FIXED_POINT
+inline static int shiftSigned(MPC_SAMPLE_FORMAT val, int shift)
+{
+    if (shift > 0)
+        val <<= shift;
+    else if (shift < 0)
+        val >>= -shift;
+    return (int) val;
+}
+#endif
+
+inline static void copyBuffer(MPC_SAMPLE_FORMAT* pInBuf, char* pOutBuf, unsigned pLength)
+{
+    unsigned pSize = 16;
+    int clipMin    = -1 << (pSize - 1);
+    int clipMax    = (1 << (pSize - 1)) - 1;
+    int floatScale =  1 << (pSize - 1);
+    for (unsigned n = 0; n < 2 * pLength; n++)
+    {
+        int val;
+#ifdef MPC_FIXED_POINT
+        val = shiftSigned(pInBuf[n], pSize - MPC_FIXED_POINT_SCALE_SHIFT);
+#else
+        val = (int) (pInBuf[n] * floatScale);
+#endif
+        if (val < clipMin)
+            val = clipMin;
+        else if (val > clipMax)
+            val = clipMax;
+        unsigned shift = 0;
+        do
+        {
+            pOutBuf[n * 2 + (shift / 8)] = (unsigned char) ((val >> shift) & 0xFF);
+            shift += 8;
+        }
+        while (shift < pSize);
+    }
+}
+
+#endif
--- a/configure.ac	Fri Dec 16 12:17:53 2005 -0800
+++ b/configure.ac	Fri Dec 16 16:08:46 2005 -0800
@@ -455,6 +455,36 @@
 fi
 AM_CONDITIONAL(HAVE_SIDPLAY,test "x$have_sidplay" = xyes)
 
+dnl *** Musepack
+
+AC_ARG_ENABLE(musepack,
+    [  --disable-musepack        disable musepack input plugin (default=enabled)],
+    [enable_musepack=$enableval],
+    [enable_musepack="yes"]
+)
+
+if test "$enable_musepack" = "yes"; then
+    AC_CHECK_HEADERS(mpcdec/config_types.h,,
+        [AC_MSG_ERROR([libmpcdec not installed])
+	 enable_musepack=no]
+    )
+
+    AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, [no], [$PATH:$prefix/bin])
+    if test "x$TAGLIB_CONFIG" = "xno" ; then
+	enable_musepack=no
+    else
+        TAGLIB_CFLAGS=[`$TAGLIB_CONFIG --cflags`]
+        TAGLIB_LIBS=[`$TAGLIB_CONFIG --libs`]
+    fi
+    AC_SUBST(TAGLIB_CFLAGS)
+    AC_SUBST(TAGLIB_LIBS)
+else
+    AC_MSG_RESULT([*** Musepack plugin disabled per user request ***])
+    enable_musepack=no
+fi
+
+AM_CONDITIONAL(ENABLE_MUSEPACK, [test "$enable_musepack" = "yes"])
+
 dnl *** OSS output
 
 AC_ARG_ENABLE(oss,
@@ -746,6 +776,7 @@
 	Plugins/Input/modplug/Makefile
 	Plugins/Input/modplug/archive/Makefile
 	Plugins/Input/modplug/gui/Makefile
+	Plugins/Input/musepack/Makefile
 	Plugins/Input/tonegen/Makefile
         Plugins/Input/vorbis/Makefile
         Plugins/Input/cdaudio/Makefile
@@ -813,6 +844,7 @@
 echo "    + id3v2 editing:                      $have_id3lib"
 echo "  MPEG 4 Audio (AAC):                     $enable_aac"
 echo "  Windows Media Audio (wma):              $enable_wma"
+echo "  .mpc playback (musepack):               $enable_musepack"
 echo "  Module decoder (modplug):               $enable_modplug"
 echo "  MIDI to WAVE converter (timidity):      $enable_timidity"
 echo "  CD Digital Audio (cdda):                yes"