Merge lp:~kabelfrickler/mixxx/modplug into lp:~mixxxdevelopers/mixxx/trunk

[Stefan Nürnberger]

Add module tracker support through libmodplug

This branch adds a soundsource for files supported by modplug (MOD/MED/IT/STM/S3M/XM/OKT/...)
It also includes a preferences dialog through which the decoder can be configured.

Module tracker formats do not play well with seeking, therefore files are decoded to 16bit stereo samples on track load and kept in a QByteArray until the soundsource is destroyed. Maximum size of this buffer per track (i.e. per soundsource instance) is also configurable through the preferences dialog.

Building this requires libmodplug and the modplug.h header file. Most linux distributions offer modplug packages. I have not attempted a build under Mac or Windows.

Modplug support is activated with by appending "modplug=1" to the scons command. This will also add the __MODPLUG__ define to the compiler flags. All code concerning modplug is guarded by this define.

For modplug to work correctly the settings which are stored in the mixxx.cfg need to be applied once before loading a module file. Currently this is done in mixxx.cpp when the program loads by creating an instance of the preferences dialog and letting it deal with the configuration. Maybe there is a more elegant way?

[Stefan Nürnberger (kabelfrickler)]

Hmm, ok the branch is not completely clean. I will try to remove every change that is not directly concerned with modplug (whitespace fixes etc.) and the remaining reference to "plugin" in the SConstruct file. Then I will merge with latest trunk to resolve the conflict and resubmit the merge request.

review: Needs Fixing

[lp:~kabelfrickler/mixxx/modplug]

3296. By Stefan Nuernberger <email address hidden> on 2013-03-14

Remove remaining reference to modplug plugin from SConstruct file. Modplug is now builtin.

3297. By Stefan Nuernberger <email address hidden> on 2013-03-14

revert unrelated changes in dlgpreferences.

3298. By Stefan Nuernberger <email address hidden> on 2013-03-14

Change description of modplug feature.

3299. By Stefan Nuernberger <email address hidden> on 2013-03-14

Remove unused include from soundsourceproxy.

3300. By Stefan Nuernberger <email address hidden> on 2013-03-14

merge with latest trunk.

3301. By Stefan Nuernberger <email address hidden> on 2013-03-14

Fix build error due to incorrectly positioned code.

3302. By Stefan Nuernberger <email address hidden> on 2013-03-14

Correct typo in features.py

3303. By Stefan Nuernberger <email address hidden> on 2013-03-17

Refactoring SoundSourceModPlug. Obey coding styleguide. Estimate sample buffer size. Get rid of temp buffer in open().

3304. By Stefan Nuernberger <email address hidden> on 2013-03-18

Use memcpy for SoundSourceModPlug::read(). Add ScopedTimer for SoundSourceModPlug::open().

3305. By Stefan Nuernberger <email address hidden> on 2013-03-19

Refactored modplug preferences dialog. Introduced advanced options switch. Adhere to coding style guide.

3306. By Stefan Nuernberger <email address hidden> on 2013-03-19

insert spaces in front of class scope identifiers as demanded by style guide.

3307. By Stefan Nuernberger <email address hidden> on 2013-03-19

Fix a comment about samplerate.

3308. By Stefan Nuernberger <email address hidden> on 2013-03-19

Changed placement of controls in modplug preferences dialog.

Unmerged revisions

=== modified file 'mixxx/SConstruct'
--- mixxx/SConstruct	2013-02-09 00:38:39 +0000
+++ mixxx/SConstruct	2013-03-14 18:33:22 +0000
@@ -48,6 +48,7 @@
                       features.Optimize,
                       features.FAAD,
                       features.WavPack,
+                      features.ModPlug,
                       features.TestSuite,
                       features.LADSPA,
                       features.MSVCDebug,

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2013-02-09 00:49:59 +0000
+++ mixxx/build/features.py	2013-03-14 18:33:22 +0000
@@ -483,6 +483,40 @@
                             '%s/RealTime.cpp'])
         return sources
 
+
+class ModPlug(Feature):
+    def description(self):
+        return "Modplug module decoder plugin"
+
+    def enabled(self, build):
+        build.flags['modplug'] = util.get_flags(build.env, 'modplug', 0)
+        if int(build.flags['modplug']):
+            return True
+        return False
+
+    def add_options(self, build, vars):
+        vars.Add('modplug', 'Set to 1 to enable libmbodplug based module tracker support.', 0)
+
+    def configure(self, build, conf):
+        if not self.enabled(build):
+            return
+
+        build.env.Append(CPPDEFINES = '__MODPLUG__')
+
+        have_modplug_h = conf.CheckHeader('libmodplug/modplug.h')
+        have_modplug = conf.CheckLib(['modplug','libmodplug'], autoadd=True)
+
+        if not have_modplug_h:
+            raise Exception('Could not find libmodplug development headers.')
+
+        if not have_modplug:
+            raise Exception('Could not find libmodplug shared library.')
+
+    def sources(self, build):
+        build.env.Uic4('dlgprefmodplugdlg.ui')
+        return ['soundsourcemodplug.cpp', 'dlgprefmodplug.cpp']
+
+
 class FAAD(Feature):
     def description(self):
         return "FAAD AAC audio file decoder plugin"

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2012-11-27 16:19:52 +0000
+++ mixxx/src/dlgpreferences.cpp	2013-03-14 18:33:22 +0000
@@ -37,6 +37,10 @@
     #include "dlgprefbpm.h"
 #endif
 
+#ifdef __MODPLUG__
+    #include "dlgprefmodplug.h"
+#endif
+
 #include "dlgpreferences.h"
 #include "dlgprefsound.h"
 #include "controllers/dlgprefmappablecontroller.h"
@@ -109,6 +113,10 @@
     m_wshoutcast = new DlgPrefShoutcast(this, config);
     addPageWidget(m_wshoutcast);
 #endif
+#ifdef __MODPLUG__
+    m_wmodplug = new DlgPrefModplug(this, config);
+    addPageWidget(m_wmodplug);
+#endif
     m_wNoControllers = new DlgPrefNoControllers(this, config);
     addPageWidget(m_wNoControllers);
     setupControllerWidgets();
@@ -152,6 +160,10 @@
     connect(this, SIGNAL(showDlg()), m_wshoutcast,SLOT(slotUpdate()));
 #endif
 
+#ifdef __MODPLUG__
+    connect(this, SIGNAL(showDlg()), m_wmodplug,SLOT(slotUpdate()));
+#endif
+
 #ifdef __VINYLCONTROL__
     connect(buttonBox, SIGNAL(accepted()), m_wvinylcontrol,    SLOT(slotApply())); //It's important for this to be before the
                                                                                  //connect for wsound...
@@ -173,6 +185,9 @@
 #ifdef __SHOUTCAST__
     connect(buttonBox, SIGNAL(accepted()), m_wshoutcast,SLOT(slotApply()));
 #endif
+#ifdef __MODPLUG__
+    connect(buttonBox, SIGNAL(accepted()), m_wmodplug,SLOT(slotApply()));
+#endif
 
     //Update the library when you change the options
     /*if (m_pTrack && wplaylist)
@@ -276,6 +291,15 @@
     m_pShoutcastButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pShoutcastButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 #endif
+
+#ifdef __MODPLUG__
+    m_pModplugButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
+    m_pModplugButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_sampler.png"));
+    m_pModplugButton->setText(0, tr("Modplug Decoder"));
+    m_pModplugButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
+    m_pModplugButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#endif
+
     connect(contentsTreeWidget,
             SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
             this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem*)));
@@ -321,6 +345,10 @@
     } else if (current == m_pShoutcastButton) {
            pagesWidget->setCurrentWidget(m_wshoutcast->parentWidget()->parentWidget());
 #endif
+#ifdef __MODPLUG__
+    } else if (current == m_pModplugButton) {
+           pagesWidget->setCurrentWidget(m_wmodplug->parentWidget()->parentWidget());
+#endif
     //Handle selection of controller items
     } else if (m_controllerWindowLinks.indexOf(current) >= 0) {
            int index = m_controllerWindowLinks.indexOf(current);

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2012-04-25 15:40:15 +0000
+++ mixxx/src/dlgpreferences.h	2013-03-14 18:33:22 +0000
@@ -45,6 +45,9 @@
 class SkinLoader;
 class PlayerManager;
 class VinylControlManager;
+#ifdef __MODPLUG__
+class DlgPrefModplug;
+#endif
 
 /**
   *@author Tue & Ken Haste Andersen
@@ -93,6 +96,9 @@
     DlgPrefNoVinyl* m_wnovinylcontrol;
     DlgPrefShoutcast* m_wshoutcast;
     DlgPrefReplayGain* m_wreplaygain;
+#ifdef __MODPLUG__
+    DlgPrefModplug* m_wmodplug;
+#endif
 
     /*
     QScrollArea* m_sasound;
@@ -120,6 +126,9 @@
     QTreeWidgetItem* m_pVinylControlButton;
     QTreeWidgetItem* m_pShoutcastButton;
     QTreeWidgetItem* m_pReplayGainButton;
+#ifdef __MODPLUG__
+    QTreeWidgetItem* m_pModplugButton;
+#endif
     QTreeWidgetItem* m_pControllerTreeItem;
     QList<QTreeWidgetItem*> m_controllerWindowLinks;
 

=== added file 'mixxx/src/dlgprefmodplug.cpp'
--- mixxx/src/dlgprefmodplug.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmodplug.cpp	2013-03-14 18:33:22 +0000
@@ -0,0 +1,161 @@
+/***************************************************************************
+                          dlgprefmodplug.cpp  -  modplug settings dialog
+                             -------------------
+    copyright            : (C) 2013 by Stefan Nuernberger
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include "dlgprefmodplug.h"
+#include "ui_dlgprefmodplugdlg.h"
+#include "configobject.h"
+#include "soundsourcemodplug.h"
+
+#include <QtDebug>
+
+#define CONFIG_KEY "[Modplug]"
+
+DlgPrefModplug::DlgPrefModplug(QWidget *parent, ConfigObject<ConfigValue> *_config) :
+    QDialog(parent),
+    ui(new Ui::DlgPrefModplug),
+    config(_config)
+{
+    ui->setupUi(this);
+}
+
+DlgPrefModplug::~DlgPrefModplug()
+{
+    delete ui;
+}
+
+void DlgPrefModplug::slotApply()
+{
+    qDebug() << "Modplug Preferences - Apply and save configuration changes";
+
+    applySettings();
+    saveSettings();
+}
+
+void DlgPrefModplug::slotUpdate()
+{
+    qDebug() << "Modplug Preferences - Update Configuration Dialog from saved settings";
+
+    loadSettings();
+}
+
+void DlgPrefModplug::loadSettings()
+{
+    ui->memoryLimit->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"PerTrackMemoryLimitMB"),"256").toInt());
+    ui->oversampling->setChecked(
+        config->getValueString(ConfigKey(CONFIG_KEY,"OversamplingEnabled"),"1") == QString("1"));
+    ui->noiseReduction->setChecked(
+        config->getValueString(ConfigKey(CONFIG_KEY,"NoiseReductionEnabled"),"1") == QString("1"));
+    ui->stereoSeparation->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"StereoSeparation"),"1").toInt());
+    ui->maxMixChannels->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"MaxMixChannels"),"128").toInt());
+    ui->resampleMode->setCurrentIndex(
+        config->getValueString(ConfigKey(CONFIG_KEY,"ResamplingMode"),"3").toInt());
+    ui->reverb->setChecked(
+        config->getValueString(ConfigKey(CONFIG_KEY,"ReverbEnabled"),"0") == QString("1"));
+    ui->reverbDepth->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"ReverbLevel"),"30").toInt());
+    ui->reverbDelay->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"ReverbDelay"),"50").toInt());
+    ui->megabass->setChecked(
+        config->getValueString(ConfigKey(CONFIG_KEY,"MegabassEnabled"),"0") == QString("1"));
+    ui->bassDepth->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"MegabassLevel"),"30").toInt());
+    ui->bassCutoff->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"MegabassCutoff"),"80").toInt());
+    ui->surround->setChecked(
+        config->getValueString(ConfigKey(CONFIG_KEY,"SurroundEnabled"),"0") == QString("1"));
+    ui->surroundDepth->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"SurroundLevel"),"30").toInt());
+    ui->surroundDelay->setValue(
+        config->getValueString(ConfigKey(CONFIG_KEY,"SurroundDelay"),"10").toInt());
+}
+
+void DlgPrefModplug::saveSettings()
+{
+    config->set(ConfigKey(CONFIG_KEY,"PerTrackMemoryLimitMB"),ConfigValue(ui->memoryLimit->value()));
+    config->set(ConfigKey(CONFIG_KEY,"OversamplingEnabled"), ConfigValue(ui->oversampling->isChecked()));
+    config->set(ConfigKey(CONFIG_KEY,"NoiseReductionEnabled"), ConfigValue(ui->noiseReduction->isChecked()));
+    config->set(ConfigKey(CONFIG_KEY,"StereoSeparation"),ConfigValue(ui->stereoSeparation->value()));
+    config->set(ConfigKey(CONFIG_KEY,"MaxMixChannels"),ConfigValue(ui->maxMixChannels->value()));
+    config->set(ConfigKey(CONFIG_KEY,"ResamplingMode"),ConfigValue(ui->resampleMode->currentIndex()));
+    config->set(ConfigKey(CONFIG_KEY,"ReverbEnabled"),ConfigValue(ui->reverb->isChecked()));
+    config->set(ConfigKey(CONFIG_KEY,"ReverbLevel"),ConfigValue(ui->reverbDepth->value()));
+    config->set(ConfigKey(CONFIG_KEY,"ReverbDelay"),ConfigValue(ui->reverbDelay->value()));
+    config->set(ConfigKey(CONFIG_KEY,"MegabassEnabled"),ConfigValue(ui->megabass->isChecked()));
+    config->set(ConfigKey(CONFIG_KEY,"MegabassLevel"),ConfigValue(ui->bassDepth->value()));
+    config->set(ConfigKey(CONFIG_KEY,"MegabassCutoff"),ConfigValue(ui->bassCutoff->value()));
+    config->set(ConfigKey(CONFIG_KEY,"SurroundEnabled"),ConfigValue(ui->surround->isChecked()));
+    config->set(ConfigKey(CONFIG_KEY,"SurroundLevel"),ConfigValue(ui->surroundDepth->value()));
+    config->set(ConfigKey(CONFIG_KEY,"SurroundDelay"),ConfigValue(ui->surroundDelay->value()));
+}
+
+void DlgPrefModplug::applySettings()
+{
+    // read ui parameters and configure soundsource
+    unsigned int bufferSizeLimit = ui->memoryLimit->value() * 1024 * 1024;
+    ModPlug::ModPlug_Settings settings;
+
+    // Currently this is fixed to 16bit 44.1kHz stereo */
+    /* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stereo and then
+     * down-mixes to the settings you choose. */
+    settings.mChannels = 2;        /* Number of channels - 1 for mono or 2 for stereo */
+    settings.mBits = 16;           /* Bits per sample - 8, 16, or 32 */
+    settings.mFrequency = 44100;   /* Sampling rate - 11025, 22050, or 44100 */
+
+    settings.mFlags = 0;
+    if (ui->oversampling->isChecked())
+        settings.mFlags |= ModPlug::MODPLUG_ENABLE_OVERSAMPLING;
+    if (ui->noiseReduction->isChecked())
+        settings.mFlags |=  ModPlug::MODPLUG_ENABLE_NOISE_REDUCTION;
+    if (ui->reverb->isChecked())
+        settings.mFlags |= ModPlug::MODPLUG_ENABLE_REVERB;
+    if (ui->megabass->isChecked())
+        settings.mFlags |= ModPlug::MODPLUG_ENABLE_MEGABASS;
+    if (ui->surround->isChecked())
+        settings.mFlags |= ModPlug::MODPLUG_ENABLE_SURROUND;
+
+    switch (ui->resampleMode->currentIndex())
+    {
+    case 0: /* nearest neighbor */
+        settings.mResamplingMode = ModPlug::MODPLUG_RESAMPLE_NEAREST;
+        break;
+    case 1: /* linear */
+        settings.mResamplingMode = ModPlug::MODPLUG_RESAMPLE_LINEAR;
+        break;
+    case 2: /* cubic spline */
+        settings.mResamplingMode = ModPlug::MODPLUG_RESAMPLE_SPLINE;
+        break;
+    case 3: /* 8 bit FIR (also default) */
+    default:
+        settings.mResamplingMode = ModPlug::MODPLUG_RESAMPLE_FIR;
+        break;
+    }
+
+    settings.mStereoSeparation = ui->stereoSeparation->value();
+    settings.mMaxMixChannels = ui->maxMixChannels->value();
+    settings.mReverbDepth = ui->reverbDepth->value();      /* Reverb level 0(quiet)-100(loud)      */
+    settings.mReverbDelay = ui->reverbDelay->value();      /* Reverb delay in ms, usually 40-200ms */
+    settings.mBassAmount = ui->bassDepth->value();         /* XBass level 0(quiet)-100(loud)       */
+    settings.mBassRange = ui->bassCutoff->value();         /* XBass cutoff in Hz 10-100            */
+    settings.mSurroundDepth = ui->surroundDepth->value();  /* Surround level 0(quiet)-100(heavy)   */
+    settings.mSurroundDelay = ui->surroundDelay->value();  /* Surround delay in ms, usually 5-40ms */
+    settings.mLoopCount = 0; /* Number of times to loop.  Zero prevents looping. -1 loops forever. */
+
+    // apply modplug settings
+    SoundSourceModPlug::configure(bufferSizeLimit, settings);
+}

=== added file 'mixxx/src/dlgprefmodplug.h'
--- mixxx/src/dlgprefmodplug.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmodplug.h	2013-03-14 18:33:22 +0000
@@ -0,0 +1,49 @@
+/***************************************************************************
+                          dlgprefmodplug.h  -  modplug settings dialog
+                             -------------------
+    copyright            : (C) 2013 by Stefan Nuernberger
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DLGPREFMODPLUG_H
+#define DLGPREFMODPLUG_H
+
+#include <QDialog>
+#include "configobject.h"
+
+namespace Ui {
+class DlgPrefModplug;
+}
+
+class DlgPrefModplug : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DlgPrefModplug(QWidget *parent, ConfigObject<ConfigValue> *_config);
+    ~DlgPrefModplug();
+
+public slots:
+    /** Apply changes to widget */
+   void slotApply();
+   void slotUpdate();
+
+   void loadSettings();
+   void saveSettings();
+   void applySettings();
+
+private:
+    Ui::DlgPrefModplug *ui;
+    ConfigObject<ConfigValue> *config;
+};
+
+#endif // DLGPREFMODPLUG_H

=== added file 'mixxx/src/dlgprefmodplugdlg.ui'
--- mixxx/src/dlgprefmodplugdlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmodplugdlg.ui	2013-03-14 18:33:22 +0000
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefModplug</class>
+ <widget class="QDialog" name="DlgPrefModplug">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>593</width>
+    <height>538</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Modplug Preferences</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="spacing">
+    <number>10</number>
+   </property>
+   <item row="13" column="4">
+    <widget class="QSlider" name="surroundDelay">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>10</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="5">
+    <widget class="QCheckBox" name="noiseReduction">
+     <property name="text">
+      <string>Enable noise reduction</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QCheckBox" name="megabass">
+     <property name="text">
+      <string>Enable megabass</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="reverb">
+     <property name="text">
+      <string>Enable reverb</string>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="3">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Stereo separation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Bass level</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QLabel" name="label_10">
+     <property name="text">
+      <string>Memory limit for single track (MB)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="5">
+    <widget class="QSpinBox" name="surroundDepthSpin">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Resampling mode (interpolation)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4">
+    <widget class="QSlider" name="memoryLimit">
+     <property name="toolTip">
+      <string extracomment="1 minute of decoded audio requires about 10MB of RAM."/>
+     </property>
+     <property name="minimum">
+      <number>16</number>
+     </property>
+     <property name="maximum">
+      <number>512</number>
+     </property>
+     <property name="value">
+      <number>256</number>
+     </property>
+     <property name="sliderPosition">
+      <number>256</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="3">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Maximum Number of Mixing Channels</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="4">
+    <widget class="QSlider" name="bassDepth">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="5">
+    <widget class="QSpinBox" name="memoryLimitSpin">
+     <property name="minimum">
+      <number>16</number>
+     </property>
+     <property name="maximum">
+      <number>512</number>
+     </property>
+     <property name="value">
+      <number>256</number>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="4">
+    <widget class="QSlider" name="bassCutoff">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>80</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Bass cutoff (Hz)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1" colspan="2">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>Surround level</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1" colspan="2">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>Surround delay (ms)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="4">
+    <widget class="QSlider" name="reverbDepth">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="4">
+    <widget class="QSlider" name="reverbDelay">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="maximum">
+      <number>250</number>
+     </property>
+     <property name="value">
+      <number>50</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="4">
+    <widget class="QSlider" name="stereoSeparation">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>256</number>
+     </property>
+     <property name="value">
+      <number>64</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="tickPosition">
+      <enum>QSlider::NoTicks</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1" colspan="2">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Reverb delay (ms)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0">
+    <widget class="QCheckBox" name="surround">
+     <property name="text">
+      <string>Enable surround</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="5">
+    <widget class="QCheckBox" name="oversampling">
+     <property name="text">
+      <string>Enable oversampling (*highly* recommended)</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="4">
+    <widget class="QSlider" name="maxMixChannels">
+     <property name="minimum">
+      <number>32</number>
+     </property>
+     <property name="maximum">
+      <number>256</number>
+     </property>
+     <property name="value">
+      <number>128</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="4">
+    <widget class="QSlider" name="surroundDepth">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="2">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Reverb level</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="5">
+    <widget class="QSpinBox" name="stereoSeparationSpin">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>256</number>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="5">
+    <widget class="QSpinBox" name="maxMixChannelsSpin">
+     <property name="minimum">
+      <number>32</number>
+     </property>
+     <property name="maximum">
+      <number>256</number>
+     </property>
+     <property name="value">
+      <number>128</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4" colspan="2">
+    <widget class="QComboBox" name="resampleMode">
+     <property name="currentIndex">
+      <number>3</number>
+     </property>
+     <item>
+      <property name="text">
+       <string>Nearest (very fast, extremely bad quality)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Linear (fast, good quality)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Cubic Spline (high quality)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>8-tap FIR (extremely high quality)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="8" column="5">
+    <widget class="QSpinBox" name="reverbDepthSpin">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="5">
+    <widget class="QSpinBox" name="reverbDelaySpin">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="maximum">
+      <number>250</number>
+     </property>
+     <property name="value">
+      <number>50</number>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="5">
+    <widget class="QSpinBox" name="bassDepthSpin">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="5">
+    <widget class="QSpinBox" name="bassCutoffSpin">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>80</number>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="5">
+    <widget class="QSpinBox" name="surroundDelaySpin">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="5">
+    <widget class="QLabel" name="label_11">
+     <property name="text">
+      <string>Decoding options for libmodplug. Module files are decoded at once
+and kept in RAM to allow for seeking and smooth operation in Mixxx.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="3">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>memoryLimit</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>memoryLimitSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>58</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>58</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>memoryLimitSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>memoryLimit</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>58</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>58</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>stereoSeparation</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>stereoSeparationSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>186</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>186</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>stereoSeparationSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>stereoSeparation</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>186</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>186</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>maxMixChannels</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>maxMixChannelsSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>220</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>220</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>maxMixChannelsSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>maxMixChannels</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>220</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>220</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reverbDepth</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>reverbDepthSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reverbDepthSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>reverbDepth</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>254</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reverbDelay</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>reverbDelaySpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>288</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>288</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bassDepth</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>bassDepthSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>322</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>322</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bassDepthSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>bassDepth</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>322</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>322</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reverbDelaySpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>reverbDelay</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>288</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>288</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bassCutoff</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>bassCutoffSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>356</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>bassCutoffSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>bassCutoff</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>356</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>356</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>surroundDepth</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>surroundDepthSpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>390</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>surroundDepthSpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>surroundDepth</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>390</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>surroundDelay</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>surroundDelaySpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>405</x>
+     <y>424</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>556</x>
+     <y>424</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>surroundDelaySpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>surroundDelay</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>556</x>
+     <y>424</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>405</x>
+     <y>424</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2013-02-10 20:59:19 +0000
+++ mixxx/src/mixxx.cpp	2013-03-14 18:33:22 +0000
@@ -60,6 +60,10 @@
 #include "vinylcontrol/vinylcontrolmanager.h"
 #endif
 
+#ifdef __MODPLUG__
+#include "dlgprefmodplug.h"
+#endif
+
 extern "C" void crashDlg()
 {
     QMessageBox::critical(0, "Mixxx",
@@ -340,6 +344,14 @@
     m_pVCManager->init();
 #endif
 
+#ifdef __MODPLUG__
+    // restore the configuration for the modplug library before trying to load a module
+    DlgPrefModplug* pModplugPrefs = new DlgPrefModplug(0, m_pConfig);
+    pModplugPrefs->loadSettings();
+    pModplugPrefs->applySettings();
+    delete pModplugPrefs; // not needed anymore
+#endif
+
     m_pLibrary = new Library(this, m_pConfig,
                              bFirstRun || bUpgraded,
                              m_pRecordingManager);

=== added file 'mixxx/src/soundsourcemodplug.cpp'
--- mixxx/src/soundsourcemodplug.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/soundsourcemodplug.cpp	2013-03-14 18:33:22 +0000
@@ -0,0 +1,196 @@
+/***************************************************************************
+                          soundsourcemodplug.cpp  -  module tracker support
+                             -------------------
+    copyright            : (C) 2012 by Stefan Nuernberger
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include "soundsourcemodplug.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <QFile>
+
+/* read files in 512k chunks */
+#define CHUNKSIZE 524288
+
+// reserve some static space for settings...
+ModPlug::ModPlug_Settings SoundSourceModPlug::settings;
+unsigned int SoundSourceModPlug::bufferSizeLimit;
+
+SoundSourceModPlug::SoundSourceModPlug(QString qFilename) :
+    SoundSource(qFilename)
+{
+    opened = false;
+    filelength = 0;
+    file = 0;
+
+    qDebug() << "Loading ModPlug module " << m_qFilename;
+
+    // read module file to byte array
+    QFile modfile(m_qFilename);
+    modfile.open(QIODevice::ReadOnly);
+    filebuf = modfile.readAll();
+    modfile.close();
+    // get ModPlugFile
+    file = ModPlug::ModPlug_Load(filebuf.data(), filebuf.length());
+}
+
+SoundSourceModPlug::~SoundSourceModPlug()
+{
+    if (file) {
+        ModPlug::ModPlug_Unload(file);
+        file = NULL;
+    }
+}
+
+QList<QString> SoundSourceModPlug::supportedFileExtensions()
+{
+    QList<QString> list;
+    /* ModPlug supports more formats but file name
+     * extensions are not always present with modules.
+     */
+    list.push_back("mod");
+    list.push_back("med");
+    list.push_back("okt");
+    list.push_back("s3m");
+    list.push_back("stm");
+    list.push_back("xm");
+    list.push_back("it");
+    return list;
+}
+
+void SoundSourceModPlug::configure(unsigned int bLimit, const ModPlug::ModPlug_Settings &config)
+{
+    bufferSizeLimit = bLimit;
+    settings = config;
+
+    ModPlug::ModPlug_SetSettings(&settings);
+}
+
+int SoundSourceModPlug::open() {
+    if (file == NULL) {
+        // an error occured
+        qDebug() << "Could not load module file: "
+                 << m_qFilename;
+        return ERR;
+    }
+
+    // temporary buffer to read samples
+    char *tmpbuf = new char[CHUNKSIZE];
+    int count = 1;
+    while ((count != 0) && (smplbuf.length() < bufferSizeLimit))
+    {
+        /* Read sample data into the buffer.  Returns the number of bytes read.  If the end
+         * of the module has been reached, zero is returned. */
+        count = ModPlug::ModPlug_Read(file, tmpbuf, CHUNKSIZE);
+        smplbuf.append(tmpbuf, count);
+    }
+    delete tmpbuf;
+    qDebug() << "Filled Sample buffer with " << smplbuf.length() << " bytes.";
+
+    // smplbuf holds 44.1kHz 16bit integer stereo samples.
+    // We count the number of samples by dividing number of
+    // bytes in smplbuf by 2 (bytes per sample).
+    filelength = smplbuf.length() >> 1;
+    m_iSampleRate = 44100; // ModPlug uses 44.1kHz
+    opened = true;
+    seekpos = 0;
+    return OK;
+}
+
+long SoundSourceModPlug::seek(long filepos)
+{
+    if (filelength > 0)
+    {
+        seekpos = math_min((unsigned long)filepos, filelength);
+        return seekpos;
+    }
+    return 0;
+}
+
+/*
+   read <size> samples into <destination>, and return the number of
+   samples actually read.
+ */
+unsigned SoundSourceModPlug::read(unsigned long size, const SAMPLE * destination)
+{
+    unsigned char * dest = (unsigned char *) destination;
+    if (filelength > 0)
+    {
+        unsigned count = 0;
+        while ((seekpos < filelength) && (count < (size << 1 )))
+        {
+            // copy a 16bit sample
+            dest[count++] = smplbuf[seekpos << 1];
+            dest[count++] = smplbuf[(seekpos << 1) + 1];
+            ++seekpos;
+        }
+        return count >> 1; ///< number of bytes divided by bytes per sample
+    }
+    // The file has errors or is not open. Tell the truth and return 0.
+    return 0;
+}
+
+int SoundSourceModPlug::parseHeader()
+{
+    if (file == NULL) {
+        // an error occured
+        qDebug() << "Could not parse module header of " << m_qFilename;
+        return ERR;
+    }
+
+    switch (ModPlug::ModPlug_GetModuleType(file))
+    {
+    case NONE:
+        setType(QString("None"));
+        break;
+    case MOD:
+        setType(QString("Protracker"));
+        break;
+    case S3M:
+        setType(QString("Scream Tracker 3"));
+        break;
+    case XM:
+        setType(QString("FastTracker2"));
+        break;
+    case MED:
+        setType(QString("OctaMed"));
+        break;
+    case IT:
+        setType(QString("Impulse Tracker"));
+        break;
+    case STM:
+        setType(QString("Scream Tracker"));
+        break;
+    case OKT:
+        setType(QString("Oktalyzer"));
+        break;
+    default:
+        setType(QString("Module"));
+        break;
+    }
+    setComment(QString(ModPlug::ModPlug_GetMessage(file)));
+    setTitle(QString(ModPlug::ModPlug_GetName(file)));
+    setDuration(ModPlug::ModPlug_GetLength(file) / 1000);
+    setBitrate(8); // not really, but fill in something...
+    setSampleRate(44100);
+    setChannels(2);
+    return OK;
+}
+
+/*
+   Return the length of the file in samples.
+ */
+inline long unsigned SoundSourceModPlug::length()
+{
+    return filelength;
+}

=== added file 'mixxx/src/soundsourcemodplug.h'
--- mixxx/src/soundsourcemodplug.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/soundsourcemodplug.h	2013-03-14 18:33:22 +0000
@@ -0,0 +1,74 @@
+/***************************************************************************
+                          soundsourcemodplug.h  -  modplug tracker support
+                             -------------------
+    copyright            : (C) 2012 by Stefan Nuernberger
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef SOUNDSOURCEMODPLUG_H
+#define SOUNDSOURCEMODPLUG_H
+
+#include "soundsource.h"
+#include "defs_version.h"
+#include <QByteArray>
+#include <QList>
+#include <QString>
+#include <QtDebug>
+
+namespace ModPlug {
+#include "libmodplug/modplug.h"
+}
+
+/*
+    Class for reading tracker files using libmodplug
+    The whole file is decoded at once and saved
+    in RAM to allow seeking and smooth operation in Mixxx.
+ */
+class SoundSourceModPlug : public Mixxx::SoundSource
+{
+public:
+    SoundSourceModPlug(QString qFilename);
+    ~SoundSourceModPlug();
+    int open();
+    long seek(long);
+    unsigned read(unsigned long size, const SAMPLE*);
+    inline long unsigned length();
+    int parseHeader();
+    static QList<QString> supportedFileExtensions();
+
+    static void configure(unsigned int bufferSizeLimit,
+                          const ModPlug::ModPlug_Settings &settings);
+private:
+    static unsigned int bufferSizeLimit;
+    static ModPlug::ModPlug_Settings settings; ///< struct of parameters
+
+    bool opened;
+    unsigned long filelength;
+    unsigned int seekpos;
+    ModPlug::ModPlugFile *file; ///< pointer to ModPlugFile struct
+    QByteArray filebuf; ///< original module file data
+    QByteArray smplbuf; ///< 16bit stereo samples, 44.1kHz
+
+    /// identification of modplug module type
+    enum ModuleTypes {
+        NONE = 0x00,
+        MOD  = 0x01,
+        S3M  = 0x02,
+        XM   = 0x04,
+        MED  = 0x08,
+        IT   = 0x20,
+        STM  = 0x100,
+        OKT  = 0x8000
+    };
+};
+
+#endif

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2012-11-20 00:40:18 +0000
+++ mixxx/src/soundsourceproxy.cpp	2013-03-14 18:33:22 +0000
@@ -31,6 +31,9 @@
 #ifdef __FFMPEGFILE__
 #include "soundsourceffmpeg.h"
 #endif
+#ifdef __MODPLUG__
+#include "soundsourcemodplug.h"
+#endif
 #include "soundsourceflac.h"
 
 #include "mixxx.h"
@@ -139,6 +142,10 @@
     } else if (SoundSourceCoreAudio::supportedFileExtensions().contains(extension)) {
         return new SoundSourceCoreAudio(qFilename);
 #endif
+#ifdef __MODPLUG__
+    } else if (SoundSourceModPlug::supportedFileExtensions().contains(extension)) {
+        return new SoundSourceModPlug(qFilename);
+#endif
     } else if (m_extensionsSupportedByPlugins.contains(extension)) {
         getSoundSourceFunc getter = m_extensionsSupportedByPlugins.value(extension);
         if (getter)
@@ -368,6 +375,9 @@
 #ifdef __COREAUDIO__
     supportedFileExtensions.append(SoundSourceCoreAudio::supportedFileExtensions());
 #endif
+#ifdef __MODPLUG__
+    supportedFileExtensions.append(SoundSourceModPlug::supportedFileExtensions());
+#endif
     supportedFileExtensions.append(m_extensionsSupportedByPlugins.keys());
 
     return supportedFileExtensions;