Merge lp:~l0rdt/mixxx/features_replaygain into lp:~mixxxdevelopers/mixxx/trunk

[Sean M. Pappalardo]

In this branch, Vittorio has completed the following work towards completing the ReplayGain support blueprint:

* The ability to load ReplayGain tags using the industry convention from common formats (Xiph, MP4, ID3v2, APE)
* An Analyser to calculate the ReplayGain for a track that does not have ReplayGain tags
* Preferences dialog settings to enable/disable ReplayGain, enable/disable the ReplayGain analyser, and set the normalized gain level
* Engine support for applying the replaygain.

I'm proposing this merge to start the code review of his work.

[Sean M. Pappalardo (pegasus-renegadetech)]

I've asked Vittorio to have this auto-adjust the Gain knob rather than creating a hidden one that would make the on-screen one redundant (and confusing.)

This then puts a dependency on bug #555547 getting fixed (soft-takeover) so controllerists with physical gain knobs don't get any surprises.

[lp:~l0rdt/mixxx/features_replaygain]

2466. By Vittorio Colao on 2010-10-20

(Maybe) fix a compiler error

2467. By Vittorio Colao on 2010-10-20

Merged with features_taglib branch

2468. By Vittorio Colao on 2010-10-20

compile problem fixed.Now it's true ;)

[Sean M. Pappalardo (pegasus-renegadetech)]

I just tested this branch and it looks good from a UI perspective. I would suggest adding labels for each tick of the initial boost slider. It would also be nice if you added qDebugs at track load time saying if a track is being analyzed for ReplayGain (if the analyzer is enabled,) and what a track's ReplayGain value is, or not present.

I also noticed that the enabled/disabled setting didn't save every time I restarted Mixxx.

Now, as far as max dynamic range in the deck pre-fader signal path after ReplayGain, is it possible to auto-adjust the gain knob so that the highest peak of the song is just below clipping?

[Vittorio Colao (l0rdt)]

Thanks for your comment Sean, I will take care of all your observations.

About auto-adjusting gain knob for the track to stay below clipping, I am unsure on what you ask:

As for now, channels pregain is auto-adjusted so that two tracks playing in two different decks will play at the same perceived volume. That is very effective if one test it on tracks registered on very different volume levels. If I change the channel pregain to stay under clipping, it will not match anymore replaygain suggested volume. The only way I see to stay under clipping *and* preserve no differences in perceived loudness between tracks is that of acting on master volume and not on channel volume.
As a sketch, the only solution I see is to get track peak from tags and from analyser and try to figure out if the master volume is too high for it.
On the other hand, one may think of applying PeakIndicator routines to an analyser so that clipping is detected chunk by chunk.

In both cases and where possible, I may suggest of not altering pregain or master volume but just pass "PeakIndicator" to controllers/skins at loading track time.

Is this alternative way a possible solution?
thanks for reading,
Vittorio

[lp:~l0rdt/mixxx/features_replaygain]

2469. By Vittorio Colao on 2010-10-21

Fixed a typo in dlgprefreplaygain.cpp: now Analyser on/off value is saved in the configuration.
 Added some qDebug info about replaygain tags of a track and about analyser status.

2470. By Vittorio Colao on 2010-10-21

Added extra-coolness in terms of:
* comments in analyserrg.cpp
* old-fashioned LCD display in preferences ui to show current initial pregain boost

2471. By Vittorio Colao on 2010-10-21

Since it is possible to switch on/off ReplayGain Analyser, I added it to createPrepareViewAnalyserQueue too

2472. By Vittorio Colao on 2010-10-26

quick fix for #665524

2473. By Vittorio Colao on 2010-10-29

Merging from lp:mixxx

2474. By Vittorio Colao on 2010-11-01

merging with trunk

2475. By Vittorio Colao on 2010-11-01

Adjusting indentation/notations

2476. By Vittorio Colao on 2010-11-01

Merging again from trunk

2477. By Vittorio Colao on 2010-11-05

Merging from trunk.

2478. By Vittorio Colao on 2010-11-05

Adjust Waveform according to gain (see wishlist Bug #367153).
Fixed some mistake.

2479. By Vittorio Colao on 2010-11-05

Fixing indentation once again.

2480. By Vittorio Colao on 2010-11-05

I hate myself. Sometimes

2481. By Vittorio Colao on 2010-11-07

Merging from trunk.

2482. By Vittorio Colao on 2010-11-07

Fix few things.
Commented out some qDebug().
ReplayGain Analyser is now turned on by default.

2483. By Vittorio Colao on 2010-11-08

Something I forgot to fix.

2484. By Vittorio Colao on 2010-11-11

s/RG/ReplayGain/ where needed to improve readibilty.
Moved replaygain dir from src/ to lib/ .

2485. By Vittorio Colao on 2010-11-11

Added missing dir.

2486. By Vittorio Colao on 2010-11-13

Smooth fading to ReplayGain gain when a value is found after a track is loaded

2487. By Vittorio Colao on 2010-11-13

Just to be precise...

2488. By Vittorio Colao on 2010-11-14

delete LeftChannel and RightChannel in a more appropriate way

Unmerged revisions

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2010-11-02 19:50:15 +0000
+++ mixxx/build/depends.py	2010-11-07 16:11:47 +0000
@@ -315,6 +315,7 @@
                    "dlgprefnomidi.cpp",
                    "dlgprefcontrols.cpp",
                    "dlgprefbpm.cpp",
+                   "dlgprefreplaygain.cpp",
                    "dlgbpmscheme.cpp",
                    "dlgabout.cpp",
                    "dlgprefeq.cpp",
@@ -354,7 +355,9 @@
                    "engine/cuecontrol.cpp",
                    "engine/readaheadmanager.cpp",
                    "cachingreader.cpp",
-
+			
+		   "replaygain/replaygain_analysis.c",
+		   "analyserrg.cpp",
                    "analyserqueue.cpp",
                    "analyserwavesummary.cpp",
                    "analyserbpm.cpp",
@@ -521,6 +524,7 @@
         build.env.Uic4('dlgprefeqdlg.ui')
         build.env.Uic4('dlgprefcrossfaderdlg.ui')
         build.env.Uic4('dlgprefbpmdlg.ui')
+        build.env.Uic4('dlgprefreplaygaindlg.ui')
         build.env.Uic4('dlgbpmschemedlg.ui')
         # build.env.Uic4('dlgbpmtapdlg.ui')
         build.env.Uic4('dlgprefvinyldlg.ui')

=== removed directory 'mixxx/plugins/build/debian/usr'
=== removed directory 'mixxx/plugins/build/debian/usr/lib'
=== added file 'mixxx/res/images/preferences/ic_preferences_replaygain.png'
Binary files mixxx/res/images/preferences/ic_preferences_replaygain.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/preferences/ic_preferences_replaygain.png	2010-11-07 16:11:47 +0000 differ
=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2010-08-15 13:39:23 +0000
+++ mixxx/res/mixxx.qrc	2010-11-07 16:11:47 +0000
@@ -1,31 +1,32 @@
 <RCC>
-  <qresource prefix="/">
-    <file>html/crates.html</file>
-    <file>html/playlists.html</file>
-    <file>images/mixxx-icon.png</file>
-    <file>images/ic_mixxx_window.png</file>
-    <file>images/templates/logo_mixxx.png</file>
-    <file>images/preferences/ic_preferences_bpmdetect.png</file>
-    <file>images/preferences/ic_preferences_broadcast.png</file>
-    <file>images/preferences/ic_preferences_controllers.png</file>
-    <file>images/preferences/ic_preferences_crossfader.png</file>
-    <file>images/preferences/ic_preferences_effects.png</file>
-    <file>images/preferences/ic_preferences_equalizers.png</file>
-    <file>images/preferences/ic_preferences_interface.png</file>
-    <file>images/preferences/ic_preferences_library.png</file>
-    <file>images/preferences/ic_preferences_recording.png</file>
-    <file>images/preferences/ic_preferences_sampler.png</file>
-    <file>images/preferences/ic_preferences_soundhardware.png</file>
-    <file>images/preferences/ic_preferences_vinyl.png</file>
-    <file>images/library/crates_art.png</file>
-    <file>images/library/ic_library_autodj.png</file>
-    <file>images/library/ic_library_browse.png</file>
-    <file>images/library/ic_library_crates.png</file>
-    <file>images/library/ic_library_itunes.png</file>
-    <file>images/library/ic_library_library.png</file>
-    <file>images/library/ic_library_playlist.png</file>
-    <file>images/library/ic_library_prepare.png</file>
-    <file>images/library/ic_library_promotracks.png</file>
-    <file>images/library/ic_library_rhythmbox.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>html/crates.html</file>
+        <file>html/playlists.html</file>
+        <file>images/mixxx-icon.png</file>
+        <file>images/ic_mixxx_window.png</file>
+        <file>images/templates/logo_mixxx.png</file>
+        <file>images/preferences/ic_preferences_bpmdetect.png</file>
+        <file>images/preferences/ic_preferences_broadcast.png</file>
+        <file>images/preferences/ic_preferences_controllers.png</file>
+        <file>images/preferences/ic_preferences_crossfader.png</file>
+        <file>images/preferences/ic_preferences_effects.png</file>
+        <file>images/preferences/ic_preferences_equalizers.png</file>
+        <file>images/preferences/ic_preferences_interface.png</file>
+        <file>images/preferences/ic_preferences_library.png</file>
+        <file>images/preferences/ic_preferences_recording.png</file>
+        <file>images/preferences/ic_preferences_sampler.png</file>
+        <file>images/preferences/ic_preferences_soundhardware.png</file>
+        <file>images/preferences/ic_preferences_vinyl.png</file>
+	<file>images/preferences/ic_preferences_replaygain.png</file>
+        <file>images/library/crates_art.png</file>
+        <file>images/library/ic_library_autodj.png</file>
+        <file>images/library/ic_library_browse.png</file>
+        <file>images/library/ic_library_crates.png</file>
+        <file>images/library/ic_library_itunes.png</file>
+        <file>images/library/ic_library_library.png</file>
+        <file>images/library/ic_library_playlist.png</file>
+        <file>images/library/ic_library_prepare.png</file>
+        <file>images/library/ic_library_promotracks.png</file>
+        <file>images/library/ic_library_rhythmbox.png</file>
+    </qresource>
 </RCC>

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2010-09-14 14:45:35 +0000
+++ mixxx/res/schema.xml	2010-11-07 16:11:47 +0000
@@ -146,4 +146,13 @@
       ALTER TABLE LibraryHashes ADD COLUMN needs_verification INTEGER DEFAULT 0;
     </sql>
   </revision>
+  <revision version="6">
+  <description>
+                Added a ReplayGain Column.
+  </description>
+  <sql>
+    ALTER TABLE library ADD COLUMN replaygain float DEFAULT 0;
+  </sql>
+  </revision>
+  
 </schema>

=== modified file 'mixxx/src/analyserqueue.cpp'
--- mixxx/src/analyserqueue.cpp	2010-10-18 02:20:34 +0000
+++ mixxx/src/analyserqueue.cpp	2010-11-07 16:11:47 +0000
@@ -11,6 +11,7 @@
 #include "analyserwaveform.h"
 #include "analyserwavesummary.h"
 #include "analyserbpm.h"
+#include "analyserrg.h"
 
 AnalyserQueue::AnalyserQueue() : m_aq(),
                                  m_tioq(),
@@ -202,6 +203,7 @@
     ret->addAnalyser(new AnalyserWavesummary());
     ret->addAnalyser(new AnalyserWaveform());
     ret->addAnalyser(new AnalyserBPM(_config));
+    ret->addAnalyser(new AnalyserGain(_config));
 
     ret->start(QThread::IdlePriority);
     return ret;
@@ -211,6 +213,7 @@
 	AnalyserQueue* ret = new AnalyserQueue();
     ret->addAnalyser(new AnalyserWavesummary());
     ret->addAnalyser(new AnalyserBPM(_config));
+    ret->addAnalyser(new AnalyserGain(_config));
 	ret->start(QThread::IdlePriority);
 	return ret;
 }

=== added file 'mixxx/src/analyserrg.cpp'
--- mixxx/src/analyserrg.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/analyserrg.cpp	2010-11-07 16:11:47 +0000
@@ -0,0 +1,80 @@
+
+
+#include <QtDebug>
+#include <time.h>
+#include <math.h>
+
+#include "trackinfoobject.h"
+#include "analyserrg.h"
+#include "replaygain/replaygain_analysis.h"
+
+AnalyserGain::AnalyserGain(ConfigObject<ConfigValue> *_config) {
+    m_pConfigRG = _config;
+    m_iStepControl = 0;
+}
+//TODO: On may think on rewriting replaygain/replagain_analys.* to improve performances. Anyway those willing to do should be sure of
+//		the resulting values to exactly coincide with "classical" replaygain_analysis.* ones.
+//		On the other hand, every other ReplayGain tagger uses exactly these methods so that we do not have problems about
+//		values to coincide.
+
+void AnalyserGain::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
+
+    bool bAnalyserEnabled = (bool)m_pConfigRG->getValueString(ConfigKey("[ReplayGain]","ReplayGainAnalyserEnabled")).toInt();
+    float fRG = tio->getRG();
+    if(totalSamples == 0 || fRG != 0 || !bAnalyserEnabled) {
+        //qDebug() << "Replaygain Analyser will not start.";
+        //if (fRG != 0 ) qDebug() << "Found a ReplayGain value of " << 20*log10(fRG) << "dB for track :" <<(tio->getFilename());
+        return;
+    }
+    m_iStepControl = InitGainAnalysis( (long)sampleRate );
+
+    //   m_iStartTime = clock();
+}
+
+
+
+
+void AnalyserGain::process(const CSAMPLE *pIn, const int iLen) {
+
+    if(m_iStepControl!=1) return;
+
+    CSAMPLE *m_fLems = new CSAMPLE[(int)(iLen/2)];
+    CSAMPLE *m_fRems = new CSAMPLE[(int)(iLen/2)];
+    int iRGCounter = 0;
+    for(int i=0; i<iLen; i+=2) {
+        m_fLems[iRGCounter] = pIn[i]*32767;
+        m_fRems[iRGCounter] = pIn[i+1]*32767;
+
+        iRGCounter++;
+    }
+
+    m_iStepControl = AnalyzeSamples(m_fLems,m_fRems,iRGCounter,2);
+
+    delete m_fLems;
+    delete m_fRems;
+    m_fLems = NULL;
+    m_fRems = NULL;
+
+}
+
+
+
+
+void AnalyserGain::finalise(TrackPointer tio) {
+
+    if(m_iStepControl!=1) return;
+
+    //TODO: We are going to store values as relative peaks so that "0" means that no replaygain has been evaluated.
+    // This means that we are going to transform from dB to peaks and viceversa.
+    // One may think to digg into replay_gain code and modify it so that
+    // it directly sends results as relative peaks.
+    // In that way there is no need to spend resources in calculating log10 or pow.
+
+    float fGain_Result = pow(10,GetTitleGain()/20);
+    tio->setRG(fGain_Result);
+    //if(fGain_Result) qDebug() << "ReplayGain Analyser found a ReplayGain value of "<< 20*log10(fGain_Result) << "dB for track " << (tio->getFilename());
+    m_iStepControl=0;
+    fGain_Result=0;
+    //m_iStartTime = clock() - m_iStartTime;
+    //qDebug() << "AnalyserGain :: Generation took " << double(m_iStartTime) / CLOCKS_PER_SEC << " seconds";
+}

=== added file 'mixxx/src/analyserrg.h'
--- mixxx/src/analyserrg.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/analyserrg.h	2010-11-07 16:11:47 +0000
@@ -0,0 +1,29 @@
+/*
+ * analyserrg.h
+ *
+ *  Created on: 13/ott/2010
+ *      Author: Vittorio Colao
+ *       */
+
+#ifndef ANALYSERRG_H_
+#define ANALYSERRG_H_
+
+#include "analyser.h"
+#include "configobject.h"
+
+class AnalyserGain : public Analyser {
+
+public:
+    AnalyserGain(ConfigObject<ConfigValue> *_config);
+    void initialise(TrackPointer tio, int sampleRate, int totalSamples);
+    void process(const CSAMPLE *pIn, const int iLen);
+    void finalise(TrackPointer tio);
+
+private:
+    int m_iStepControl;
+    ConfigObject<ConfigValue> *m_pConfigRG;
+    //int m_iStartTime;
+};
+
+
+#endif /* ANALYSERRG_H_ */

=== modified file 'mixxx/src/analyserwaveform.cpp'
--- mixxx/src/analyserwaveform.cpp	2010-10-07 06:37:36 +0000
+++ mixxx/src/analyserwaveform.cpp	2010-11-07 16:11:47 +0000
@@ -13,9 +13,9 @@
 
 void AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
 
-    if(tio->getVisualWaveform() != NULL) {
-        return;
-    }
+  if(tio->getVisualWaveform() != NULL) {
+       return;
+   }
 
     if(totalSamples == 0) {
         return;  //?

=== modified file 'mixxx/src/analyserwavesummary.cpp'
--- mixxx/src/analyserwavesummary.cpp	2010-10-07 06:37:36 +0000
+++ mixxx/src/analyserwavesummary.cpp	2010-11-07 16:11:47 +0000
@@ -21,7 +21,7 @@
     Q_UNUSED(sampleRate);
     // Check if the preview has already been generated
     const QByteArray* p = tio->getWaveSummary();
-    if(p != NULL && p->size() > 0) {
+   if(p != NULL && p->size() > 0) {
         return;
     }
 

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2010-10-21 01:57:15 +0000
+++ mixxx/src/dlgpreferences.cpp	2010-11-07 16:11:47 +0000
@@ -34,6 +34,7 @@
 #include "dlgprefeq.h"
 #include "dlgprefcrossfader.h"
 #include "dlgprefrecord.h"
+#include "dlgprefreplaygain.h"
 #include "mixxx.h"
 #include "midi/mididevicemanager.h"
 #include "midi/mididevice.h"
@@ -70,6 +71,7 @@
     weq = new DlgPrefEQ(this, config);
     wcrossfader = new DlgPrefCrossfader(this, config);
     wbpm = new DlgPrefBpm(this, config);
+    wreplaygain = new DlgPrefReplayGain(this, config);
     wrecord = new DlgPrefRecord(this, config);
 #ifdef __VINYLCONTROL__
     wvinylcontrol = new DlgPrefVinyl(this, soundman, config);
@@ -91,6 +93,7 @@
     pagesWidget->addWidget(wcrossfader);
     pagesWidget->addWidget(wrecord);
     pagesWidget->addWidget(wbpm);
+    pagesWidget->addWidget(wreplaygain);
 #ifdef __VINYLCONTROL__
     pagesWidget->addWidget(wvinylcontrol);
 #endif
@@ -110,12 +113,13 @@
     connect(this, SIGNAL(closeDlg()), this,      SLOT(slotHide()));
     connect(m_pMidiDeviceManager, SIGNAL(devicesChanged()), this, SLOT(rescanMidi()));
 
-    connect(this, SIGNAL(showDlg()), wsound,    SLOT(slotUpdate()));
-    connect(this, SIGNAL(showDlg()), wplaylist, SLOT(slotUpdate()));
-    connect(this, SIGNAL(showDlg()), wcontrols, SLOT(slotUpdate()));
-    connect(this, SIGNAL(showDlg()), weq,       SLOT(slotUpdate()));
-    connect(this, SIGNAL(showDlg()),wcrossfader,SLOT(slotUpdate()));
-    connect(this, SIGNAL(showDlg()), wbpm,      SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), wsound,     SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), wplaylist,  SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), wcontrols,  SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), weq,        SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()),wcrossfader, SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), wbpm,       SLOT(slotUpdate()));
+    connect(this, SIGNAL(showDlg()), wreplaygain,SLOT(slotUpdate()));
 
     connect(this, SIGNAL(showDlg()), wrecord,    SLOT(slotUpdate()));
 #ifdef __VINYLCONTROL__
@@ -139,8 +143,9 @@
     connect(buttonBox, SIGNAL(accepted()), weq,       SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()),wcrossfader,SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()), this,      SLOT(slotApply()));
-    connect(buttonBox, SIGNAL(accepted()), wbpm,    SLOT(slotApply()));
-    connect(buttonBox, SIGNAL(accepted()), wrecord,    SLOT(slotApply()));
+    connect(buttonBox, SIGNAL(accepted()), wbpm,      SLOT(slotApply()));
+    connect(buttonBox, SIGNAL(accepted()),wreplaygain,SLOT(slotApply()));
+    connect(buttonBox, SIGNAL(accepted()), wrecord,   SLOT(slotApply()));
 #ifdef __SHOUTCAST__
     connect(buttonBox, SIGNAL(accepted()), wshoutcast,SLOT(slotApply()));
 #endif
@@ -223,6 +228,12 @@
     m_pBPMdetectButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pBPMdetectButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
+    m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
+    m_pReplayGainButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_replaygain.png"));
+    m_pReplayGainButton->setText(0, tr("Normalization"));
+    m_pReplayGainButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
+    m_pReplayGainButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
 #ifdef __VINYLCONTROL__
     m_pVinylControlButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
     //QT screws up my nice vinyl svg for some reason, so we'll use a PNG version
@@ -265,6 +276,9 @@
            pagesWidget->setCurrentWidget(wrecord);
        else if (current == m_pBPMdetectButton)
            pagesWidget->setCurrentWidget(wbpm);
+       else if (current == m_pReplayGainButton)
+    	   pagesWidget->setCurrentWidget(wreplaygain);
+
 #ifdef __VINYLCONTROL__
        else if (current == m_pVinylControlButton)
            pagesWidget->setCurrentWidget(wvinylcontrol);

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2010-10-21 01:57:15 +0000
+++ mixxx/src/dlgpreferences.h	2010-11-07 16:11:47 +0000
@@ -43,6 +43,7 @@
 class DlgPrefBpm;
 class DlgPrefVinyl;
 class DlgPrefShoutcast;
+class DlgPrefReplayGain;
 class PowerMate;
 class MidiDeviceManager;
 class SkinLoader;
@@ -86,6 +87,7 @@
     DlgPrefBpm *wbpm;
     DlgPrefVinyl *wvinylcontrol;
     DlgPrefShoutcast *wshoutcast;
+    DlgPrefReplayGain *wreplaygain;
 
 	QTreeWidgetItem* m_pSoundButton;
 	QTreeWidgetItem* m_pPlaylistButton;
@@ -96,6 +98,7 @@
 	QTreeWidgetItem* m_pBPMdetectButton;
 	QTreeWidgetItem* m_pVinylControlButton;
 	QTreeWidgetItem* m_pShoutcastButton;
+	QTreeWidgetItem* m_pReplayGainButton;
     QTreeWidgetItem* m_pMIDITreeItem;
     QList<QTreeWidgetItem*> m_midiBindingsButtons;
 

=== added file 'mixxx/src/dlgprefreplaygain.cpp'
--- mixxx/src/dlgprefreplaygain.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefreplaygain.cpp	2010-11-07 16:11:47 +0000
@@ -0,0 +1,129 @@
+
+#include <qlineedit.h>
+#include <qwidget.h>
+#include <qcheckbox.h>
+#include <qlabel.h>
+#include <qstring.h>
+#include <qpushbutton.h>
+#include <qlcdnumber.h>
+#include <qslider.h>
+#include <QtCore>
+#include <QMessageBox>
+#include "controlobject.h"
+
+#include "dlgprefreplaygain.h"
+
+#define CONFIG_KEY "[ReplayGain]"
+
+
+DlgPrefReplayGain::DlgPrefReplayGain(QWidget * parent, ConfigObject<ConfigValue> * _config) :  QWidget(parent), Ui::DlgPrefReplayGainDlg()
+{
+
+    config = _config;
+
+
+    setupUi(this);
+
+    //Connections
+    connect(EnableGain,      SIGNAL(stateChanged(int)), this, SLOT(slotSetRGEnabled()));
+    connect(EnableAnalyser,  SIGNAL(stateChanged(int)), this, SLOT(slotSetRGAnalyserEnabled()));
+    connect(SliderBoost,     SIGNAL(valueChanged(int)), this, SLOT(slotUpdateBoost()));
+    connect(SliderBoost,     SIGNAL(sliderReleased()),  this, SLOT(slotApply()));
+    connect(PushButtonReset, SIGNAL(clicked(bool)),     this, SLOT(setDefaults()));
+
+    loadSettings();
+}
+
+DlgPrefReplayGain::~DlgPrefReplayGain()
+{
+}
+
+void DlgPrefReplayGain::loadSettings()
+{
+    if(config->getValueString(ConfigKey(CONFIG_KEY,"ReplayGainEnabled"))==QString(""))
+        setDefaults();
+    else
+    {
+        SliderBoost->setValue(config->getValueString(ConfigKey(CONFIG_KEY, "InitialReplayGainBoost")).toInt());
+        lcddB->display(config->getValueString(ConfigKey(CONFIG_KEY, "InitialReplayGainBoost")).toInt());
+        EnableGain->setChecked(false);
+        if(config->getValueString(ConfigKey(CONFIG_KEY, "ReplayGainEnabled")).toInt()==1)EnableGain->setChecked(true);
+        EnableAnalyser->setChecked(false);
+        if(config->getValueString(ConfigKey(CONFIG_KEY, "ReplayGainAnalyserEnabled")).toInt())EnableAnalyser->setChecked(true);
+    }
+    slotUpdate();
+    slotApply();
+}
+
+void DlgPrefReplayGain::setDefaults()
+{
+    EnableGain->setChecked(true);
+    // Turn ReplayGain Analyser on by default as it does not give appreciable delay on recent hardware (<5 years old).
+    EnableAnalyser->setChecked(true);
+    SliderBoost->setValue(6);
+    lcddB -> display(6);
+    slotUpdate();
+    slotApply();
+}
+
+
+void DlgPrefReplayGain::slotSetRGEnabled()
+{
+    if (EnableGain->isChecked())
+        config->set(ConfigKey(CONFIG_KEY,"ReplayGainEnabled"), ConfigValue(1));
+
+    else
+    {
+        config->set(ConfigKey(CONFIG_KEY,"ReplayGainEnabled"), ConfigValue(0));
+        config->set(ConfigKey(CONFIG_KEY,"ReplayGainAnalyserEnabled"), ConfigValue(0));
+    }
+
+
+    slotUpdate();
+    slotApply();
+}
+
+void DlgPrefReplayGain::slotSetRGAnalyserEnabled()
+{
+    if (EnableAnalyser->isChecked())
+        config->set(ConfigKey(CONFIG_KEY,"ReplayGainAnalyserEnabled"), ConfigValue(1));
+    else
+        config->set(ConfigKey(CONFIG_KEY,"ReplayGainAnalyserEnabled"), ConfigValue(0));
+    slotApply();
+}
+
+
+void DlgPrefReplayGain::slotUpdateBoost()
+{
+    config->set(ConfigKey(CONFIG_KEY, "InitialReplayGainBoost"), ConfigValue(SliderBoost->value()));
+    slotApply();
+}
+
+
+void DlgPrefReplayGain::slotUpdate()
+{
+    if (config->getValueString(ConfigKey(CONFIG_KEY,"ReplayGainEnabled")).toInt()==1)
+    {
+        EnableAnalyser->setEnabled(true);
+        SliderBoost->setEnabled(true);
+    }
+    else
+    {
+        EnableAnalyser->setChecked(false);
+        EnableAnalyser->setEnabled(false);
+        SliderBoost->setValue(0);
+        SliderBoost->setEnabled(false);
+        lcddB -> display(0);
+    }
+}
+
+void DlgPrefReplayGain::slotApply()
+{
+    ControlObject::getControl(ConfigKey(CONFIG_KEY, "InitialReplayGainBoost"))->set(SliderBoost->value());
+    int iRGenabled = 0;
+    int iRGAnalyserEnabled = 0;
+    if (EnableGain->isChecked()) iRGenabled = 1;
+    if (EnableAnalyser->isChecked()) iRGAnalyserEnabled = 1;
+    ControlObject::getControl(ConfigKey(CONFIG_KEY, "ReplayGainEnabled"))->set(iRGenabled);
+}
+

=== added file 'mixxx/src/dlgprefreplaygain.h'
--- mixxx/src/dlgprefreplaygain.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefreplaygain.h	2010-11-07 16:11:47 +0000
@@ -0,0 +1,43 @@
+/*
+ * dlgprefreplaygain.h
+ *
+ *  Created on: 18/ott/2010
+ *      Author: Vittorio Colao
+ */
+
+#ifndef DLGPREFREPLAYGAIN_H_
+#define DLGPREFREPLAYGAIN_H_
+#include "ui_dlgprefreplaygaindlg.h"
+#include "configobject.h"
+
+
+class QWidget;
+
+class DlgPrefReplayGain: public QWidget, public Ui::DlgPrefReplayGainDlg  {
+    Q_OBJECT
+public:
+    DlgPrefReplayGain(QWidget *parent, ConfigObject<ConfigValue> *_config);
+    ~DlgPrefReplayGain();
+public slots:
+/** Update initial gain increment */
+void slotUpdateBoost();
+void slotSetRGEnabled();
+void slotSetRGAnalyserEnabled();
+
+void slotApply();
+void slotUpdate();
+void setDefaults();
+signals:
+void apply(const QString &);
+private:
+
+// Determines whether or not to gray out the preferences
+void loadSettings();
+
+/** Pointer to config object */
+ConfigObject<ConfigValue> *config;
+
+};
+
+
+#endif /* DLGPREFREPLAYGAIN_H_ */

=== added file 'mixxx/src/dlgprefreplaygaindlg.ui'
--- mixxx/src/dlgprefreplaygaindlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefreplaygaindlg.ui	2010-11-07 16:11:47 +0000
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefReplayGainDlg</class>
+ <widget class="QWidget" name="DlgPrefReplayGainDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>433</width>
+    <height>446</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>BPM Detection Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="font">
+      <font>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>ReplayGain Normalization</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="EnableGain">
+        <property name="text">
+         <string>Enable Replay Gain</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="Line" name="line1">
+        <property name="frameShape">
+         <enum>QFrame::HLine</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Sunken</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="EnableAnalyser">
+        <property name="text">
+         <string>Enable Replay Gain Analyser</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="bigfatwarning">
+     <property name="font">
+      <font>
+       <weight>50</weight>
+       <italic>true</italic>
+       <bold>false</bold>
+       <strikeout>false</strikeout>
+      </font>
+     </property>
+     <property name="text">
+      <string>On old computers the analyser may take some seconds.
+ Wait until the song is normalized before playing with
+ pregain and volume.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <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>
+    <widget class="QGroupBox" name="grpRP">
+     <property name="minimumSize">
+      <size>
+       <width>409</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout">
+      <item row="1" column="0">
+       <spacer>
+        <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="0" column="0">
+       <layout class="QVBoxLayout" name="_2">
+        <item>
+         <layout class="QHBoxLayout" name="_3">
+          <item>
+           <widget class="QLabel" name="label_boost">
+            <property name="text">
+             <string>Initial Boost</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QSlider" name="SliderBoost">
+          <property name="toolTip">
+           <string>Initial Gain Boost</string>
+          </property>
+          <property name="locale">
+           <locale language="C" country="AnyCountry"/>
+          </property>
+          <property name="minimum">
+           <number>0</number>
+          </property>
+          <property name="maximum">
+           <number>15</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="pageStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>6</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="tickInterval">
+           <number>5</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="_4">
+          <item>
+           <spacer>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QLCDNumber" name="lcddB">
+            <property name="locale">
+             <locale language="C" country="AnyCountry"/>
+            </property>
+            <property name="numDigits">
+             <number>2</number>
+            </property>
+            <property name="digitCount">
+             <number>2</number>
+            </property>
+            <property name="segmentStyle">
+             <enum>QLCDNumber::Flat</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>dB</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="_5">
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="PushButtonReset">
+          <property name="text">
+           <string>Reset</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>SliderBoost</sender>
+   <signal>sliderMoved(int)</signal>
+   <receiver>lcddB</receiver>
+   <slot>display(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>220</x>
+     <y>298</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>355</x>
+     <y>331</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

=== added file 'mixxx/src/dlgprefsound.cpp'
--- mixxx/src/dlgprefsound.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefsound.cpp	2010-10-29 10:38:31 +0000
@@ -0,0 +1,399 @@
+/**
+ * @file dlgprefsound.cpp
+ * @author Bill Good <bkgood at gmail dot com>
+ * @date 20100625
+ */
+
+/***************************************************************************
+ *                                                                         *
+ *   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 <QDebug>
+#include <QMessageBox>
+#include "dlgprefsound.h"
+#include "dlgprefsounditem.h"
+#include "soundmanager.h"
+#include "sounddevice.h"
+#include "engine/enginemaster.h"
+
+/**
+ * Construct a new sound preferences pane. Initializes and populates all the
+ * all the controls to the values obtained from SoundManager.
+ */
+DlgPrefSound::DlgPrefSound(QWidget *parent, SoundManager *soundManager,
+        ConfigObject<ConfigValue> *config)
+    : QWidget(parent)
+    , m_pSoundManager(soundManager)
+    , m_pConfig(config)
+    , m_settingsModified(false)
+    , m_loading(false)
+    , m_forceApply(false)
+    , m_deckCount(0)
+{
+    setupUi(this);
+
+    connect(m_pSoundManager, SIGNAL(devicesUpdated()),
+            this, SLOT(refreshDevices()));
+
+    applyButton->setEnabled(false);
+    connect(applyButton, SIGNAL(clicked()),
+            this, SLOT(slotApply()));
+
+    apiComboBox->clear();
+    apiComboBox->addItem(tr("None"), "None");
+    updateAPIs();
+    connect(apiComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(apiChanged(int)));
+
+    sampleRateComboBox->clear();
+    foreach (unsigned int srate, m_pSoundManager->getSampleRates()) {
+        if (srate > 0) {
+            // no ridiculous sample rate values. prohibiting zero means
+            // avoiding a potential div-by-0 error in ::updateLatencies
+            sampleRateComboBox->addItem(QString(tr("%1 Hz")).arg(srate), srate);
+        }
+    }
+    connect(sampleRateComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(sampleRateChanged(int)));
+    connect(sampleRateComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(updateLatencies(int)));
+    connect(latencyComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(latencyChanged(int)));
+
+    // using math_max to give the signed return value of numChannels a lower
+    // bound so we can safely stick it in the unsigned deckCount -bkgood
+    m_deckCount = math_max(m_pSoundManager->getEngine()->numChannels(), 0);
+
+    initializePaths();
+    loadSettings();
+
+    connect(apiComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(settingChanged()));
+    connect(sampleRateComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(settingChanged()));
+    connect(latencyComboBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(settingChanged()));
+
+    connect(queryButton, SIGNAL(clicked()),
+            this, SLOT(queryClicked()));
+    connect(resetButton, SIGNAL(clicked()),
+            this, SLOT(resetClicked()));
+}
+
+DlgPrefSound::~DlgPrefSound() {
+
+}
+
+/**
+ * Slot called when the preferences dialog  is opened or this pane is
+ * selected.
+ */
+void DlgPrefSound::slotUpdate() {
+    // this is unfortunate, because slotUpdate is called every time
+    // we change to this pane, we lose changed and unapplied settings
+    // every time. There's no real way around this, just anothe argument
+    // for a prefs rewrite -- bkgood
+    loadSettings();
+    m_settingsModified = false;
+    applyButton->setEnabled(false);
+}
+
+/**
+ * Slot called when the Apply or OK button is pressed.
+ */
+void DlgPrefSound::slotApply() {
+    if (!m_settingsModified && !m_forceApply) {
+        return;
+    }
+#ifdef __VINYLCONTROL__
+    // Scratchlib sucks, throw rocks at it
+    // XXX(bkgood) HACKS DELETE THIS WHEN SCRATCHLIB GETS NUKED KTHX
+    if (m_pConfig->getValueString(ConfigKey("[VinylControl]", "strVinylType"))
+            == MIXXX_VINYL_FINALSCRATCH &&
+        sampleRateComboBox->itemData(sampleRateComboBox->currentIndex()).toUInt()
+            != 44100) {
+        QMessageBox::warning(this, tr("Mixxx Error"),
+            tr("FinalScratch records currently only work properly with a "
+            "44100 Hz sample rate.\nThe sample rate has been reset to 44100 Hz."));
+        sampleRateComboBox->setCurrentIndex(sampleRateComboBox->findData(44100));
+    }
+#endif
+    m_forceApply = false;
+    m_config.clearInputs();
+    m_config.clearOutputs();
+    emit(writePaths(&m_config));
+    int err = m_pSoundManager->setConfig(m_config);
+    if (err != OK) {
+        QString error;
+        QString deviceName(tr("a device"));
+        QString detailedError(tr("An unknown error occurred"));
+        SoundDevice *device = m_pSoundManager->getErrorDevice();
+        if (device != NULL) {
+            deviceName = QString(tr("sound device \"%1\"")).arg(device->getDisplayName());
+            detailedError = device->getError();
+        }
+        switch (err) {
+        case SOUNDDEVICE_ERROR_DUPLICATE_OUTPUT_CHANNEL:
+            error = QString(tr("Two outputs cannot share channels on %1")).arg(deviceName);
+            break;
+        case SOUNDDEVICE_ERROR_DUPLICATE_INPUT_CHANNEL:
+            error = QString(tr("Two inputs cannot share channels on %1")).arg(deviceName);
+            break;
+        default:
+            error = QString(tr("Error opening %1\n%2")).arg(deviceName).arg(detailedError);
+            break;
+        }
+        QMessageBox::warning(NULL, tr("Configuration error"), error);
+    }
+    m_settingsModified = false;
+    applyButton->setEnabled(false);
+    loadSettings(); // in case SM decided to change anything it didn't like
+}
+
+/**
+ * Slot called by DlgPrefVinyl when it needs slotApply here to call setupDevices.
+ * We're graced with this kludge because VC proxies are only initialized in
+ * SoundManager::setupDevices and reinit is the only way to make them reread
+ * their config.
+ */
+void DlgPrefSound::forceApply() {
+    m_forceApply = true;
+}
+
+/**
+ * Initializes (and creates) all the path items. Each path item widget allows
+ * the user to input a sound device name and channel number given a description
+ * of what will be done with that info. Inputs and outputs are grouped by tab,
+ * and each path item has an identifier (Master, Headphones, ...) and an index,
+ * if necessary.
+ */
+void DlgPrefSound::initializePaths() {
+    QList<DlgPrefSoundItem*> items;
+    foreach (AudioPathType type, AudioOutput::getSupportedTypes()) {
+        DlgPrefSoundItem *toInsert;
+        if (AudioPath::isIndexed(type)) {
+            for (unsigned int i = 0; i < m_deckCount; ++i) {
+                toInsert = new DlgPrefSoundItem(outputScrollAreaContents, type,
+                        m_outputDevices, false, i);
+                connect(this, SIGNAL(refreshOutputDevices(const QList<SoundDevice*>&)),
+                        toInsert, SLOT(refreshDevices(const QList<SoundDevice*>&)));
+                outputVLayout->insertWidget(outputVLayout->count() - 1, toInsert);
+                items.append(toInsert);
+            }
+        } else {
+            toInsert = new DlgPrefSoundItem(outputScrollAreaContents, type,
+                m_outputDevices, false);
+            connect(this, SIGNAL(refreshOutputDevices(const QList<SoundDevice*>&)),
+                    toInsert, SLOT(refreshDevices(const QList<SoundDevice*>&)));
+            outputVLayout->insertWidget(outputVLayout->count() - 1, toInsert);
+            items.append(toInsert);
+        }
+    }
+    foreach (AudioPathType type, AudioInput::getSupportedTypes()) {
+        DlgPrefSoundItem *toInsert;
+        if (AudioPath::isIndexed(type)) {
+            for (unsigned int i = 0; i < m_deckCount; ++i) {
+                toInsert = new DlgPrefSoundItem(inputScrollAreaContents, type,
+                        m_inputDevices, true, i);
+                connect(this, SIGNAL(refreshInputDevices(const QList<SoundDevice*>&)),
+                        toInsert, SLOT(refreshDevices(const QList<SoundDevice*>&)));
+                inputVLayout->insertWidget(inputVLayout->count() - 1, toInsert);
+                items.append(toInsert);
+            }
+        } else {
+            toInsert = new DlgPrefSoundItem(inputScrollAreaContents, type,
+                m_inputDevices, true);
+            connect(this, SIGNAL(refreshInputDevices(const QList<SoundDevice*>&)),
+                    toInsert, SLOT(refreshDevices(const QList<SoundDevice*>&)));
+            inputVLayout->insertWidget(inputVLayout->count() - 1, toInsert);
+            items.append(toInsert);
+        }
+    }
+    foreach (DlgPrefSoundItem *item, items) {
+        connect(item, SIGNAL(settingChanged()),
+                this, SLOT(settingChanged()));
+        connect(this, SIGNAL(loadPaths(const SoundManagerConfig&)),
+                item, SLOT(loadPath(const SoundManagerConfig&)));
+        connect(this, SIGNAL(writePaths(SoundManagerConfig*)),
+                item, SLOT(writePath(SoundManagerConfig*)));
+        connect(this, SIGNAL(updatingAPI()),
+                item, SLOT(save()));
+        connect(this, SIGNAL(updatedAPI()),
+                item, SLOT(reload()));
+    }
+}
+
+/**
+ * Convenience overload to load settings from the SoundManagerConfig owned by
+ * SoundManager.
+ */
+void DlgPrefSound::loadSettings() {
+    loadSettings(m_pSoundManager->getConfig());
+}
+
+/**
+ * Loads the settings in the given SoundManagerConfig into the dialog.
+ */
+void DlgPrefSound::loadSettings(const SoundManagerConfig &config) {
+    m_loading = true; // so settingsChanged ignores all our modifications here
+    m_config = config;
+    int apiIndex = apiComboBox->findData(m_config.getAPI());
+    if (apiIndex != -1) {
+        apiComboBox->setCurrentIndex(apiIndex);
+    }
+    int sampleRateIndex = sampleRateComboBox->findData(m_config.getSampleRate());
+    if (sampleRateIndex != -1) {
+        sampleRateComboBox->setCurrentIndex(sampleRateIndex);
+    }
+    int latencyIndex = latencyComboBox->findData(m_config.getLatency());
+    if (latencyIndex != -1) {
+        latencyComboBox->setCurrentIndex(latencyIndex);
+    }
+    emit(loadPaths(m_config));
+    m_loading = false;
+}
+
+/**
+ * Slot called when the user selects a different API, or the
+ * software changes it programatically (for instance, when it
+ * loads a value from SoundManager). Refreshes the device lists
+ * for the new API and pushes those to the path items.
+ */
+void DlgPrefSound::apiChanged(int index) {
+    m_config.setAPI(apiComboBox->itemData(index).toString());
+    refreshDevices();
+    // JACK sets its own latency
+    if (m_config.getAPI() == MIXXX_PORTAUDIO_JACK_STRING) {
+        latencyLabel->setEnabled(false);
+        latencyComboBox->setEnabled(false);
+    } else {
+        latencyLabel->setEnabled(true);
+        latencyComboBox->setEnabled(true);
+    }
+}
+
+/**
+ * Updates the list of APIs, trying to keep the API and device selections
+ * constant if possible.
+ */
+void DlgPrefSound::updateAPIs() {
+    QString currentAPI(apiComboBox->itemData(apiComboBox->currentIndex()).toString());
+    emit(updatingAPI());
+    while (apiComboBox->count() > 1) {
+        apiComboBox->removeItem(apiComboBox->count() - 1);
+    }
+    foreach (QString api, m_pSoundManager->getHostAPIList()) {
+        apiComboBox->addItem(api, api);
+    }
+    int newIndex = apiComboBox->findData(currentAPI);
+    if (newIndex > -1) {
+        apiComboBox->setCurrentIndex(newIndex);
+    }
+    emit(updatedAPI());
+}
+
+/**
+ * Slot called when the sample rate combo box changes to update the
+ * sample rate in the config.
+ */
+void DlgPrefSound::sampleRateChanged(int index) {
+    m_config.setSampleRate(
+            sampleRateComboBox->itemData(index).toUInt());
+}
+
+/**
+ * Slot called when the latency combo box is changed to update the
+ * latency in the config.
+ */
+void DlgPrefSound::latencyChanged(int index) {
+    m_config.setLatency(
+            latencyComboBox->itemData(index).toUInt());
+}
+
+/**
+ * Slot called whenever the selected sample rate is changed. Populates the
+ * latency input box with MAX_LATENCY values, starting at 1ms, representing
+ * a number of frames per buffer, which will always be a power of 2 (so the
+ * values displayed in ms won't be constant between sample rates, but they'll
+ * be close).
+ */
+void DlgPrefSound::updateLatencies(int sampleRateIndex) {
+    double sampleRate = sampleRateComboBox->itemData(sampleRateIndex).toDouble();
+    int oldLatency = latencyComboBox->currentIndex();
+    unsigned int framesPerBuffer = 1; // start this at 0 and inf loop happens
+    // we don't want to display any sub-1ms latencies (well maybe we do but I
+    // don't right now!), so we iterate over all the buffer sizes until we
+    // find the first that gives us a latency >= 1 ms -- bkgood
+    // no div-by-0 in the next line because we don't allow srates of 0 in our
+    // srate list when we construct it in the ctor -- bkgood
+    for (; framesPerBuffer / sampleRate * 1000 < 1.0; framesPerBuffer *= 2);
+    latencyComboBox->clear();
+    for (unsigned int i = 0; i < MAX_LATENCY; ++i) {
+        unsigned int latency = framesPerBuffer / sampleRate * 1000;
+        // i + 1 in the next line is a latency index as described in SSConfig
+        latencyComboBox->addItem(QString(tr("%1 ms")).arg(latency), i + 1);
+        framesPerBuffer <<= 1; // *= 2
+    }
+    if (oldLatency < latencyComboBox->count() && oldLatency >= 0) {
+        latencyComboBox->setCurrentIndex(oldLatency);
+    } else {
+        // set it to the max, let the user dig if they need better latency. better
+        // than having a user get the pops on first use and thinking poorly of mixxx
+        // because of it -- bkgood
+        latencyComboBox->setCurrentIndex(latencyComboBox->count() - 1);
+    }
+}
+
+/**
+ * Slot called when device lists go bad to refresh them, or the API
+ * just changes and we need to display new devices.
+ */
+void DlgPrefSound::refreshDevices() {
+    if (m_config.getAPI() == "None") {
+        m_outputDevices.clear();
+        m_inputDevices.clear();
+    } else {
+        m_outputDevices =
+            m_pSoundManager->getDeviceList(m_config.getAPI(), true, false);
+        m_inputDevices =
+            m_pSoundManager->getDeviceList(m_config.getAPI(), false, true);
+    }
+    emit(refreshOutputDevices(m_outputDevices));
+    emit(refreshInputDevices(m_inputDevices));
+}
+
+/**
+ * Called when any of the combo boxes in this dialog are changed. Enables the
+ * apply button and marks that settings have been changed so that
+ * DlgPrefSound::slotApply knows to apply them.
+ */
+void DlgPrefSound::settingChanged() {
+    if (m_loading) return; // doesn't count if we're just loading prefs
+    m_settingsModified = true;
+    if (!applyButton->isEnabled()) {
+        applyButton->setEnabled(true);
+    }
+}
+
+/**
+ * Slot called when the "Query Devices" button is clicked.
+ */
+void DlgPrefSound::queryClicked() {
+    m_pSoundManager->queryDevices();
+    updateAPIs();
+}
+
+/**
+ * Slot called when the "Reset to Defaults" button is clicked.
+ */
+void DlgPrefSound::resetClicked() {
+    SoundManagerConfig newConfig;
+    newConfig.loadDefaults(m_pSoundManager, SoundManagerConfig::ALL);
+    loadSettings(newConfig);
+    settingChanged(); // force the apply button to enable
+}

=== added file 'mixxx/src/dlgprefsound.h'
--- mixxx/src/dlgprefsound.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefsound.h	2010-08-15 07:24:02 +0000
@@ -0,0 +1,79 @@
+/**
+ * @file dlgprefsound.h
+ * @author Bill Good <bkgood at gmail dot com>
+ * @date 20100625
+ */
+
+/***************************************************************************
+ *                                                                         *
+ *   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 DLGPREFSOUND_H
+#define DLGPREFSOUND_H
+
+#include <QtCore>
+#include "ui_dlgprefsounddlg.h"
+#include "configobject.h"
+#include "soundmanagerconfig.h"
+
+class SoundManager;
+class ControlObject;
+class SoundDevice;
+
+/*
+ * TODO(bkgood) (n-decks) establish a signal/slot connection with a signal
+ * on EngineMaster that emits every time a channel is added, and a slot here
+ * that updates the dialog accordingly.
+ */
+
+/**
+ * Class representing a preferences pane to configure sound devices for Mixxx.
+ */
+class DlgPrefSound : public QWidget, public Ui::DlgPrefSoundDlg  {
+    Q_OBJECT;
+public:
+    DlgPrefSound(QWidget *parent, SoundManager *soundManager,
+            ConfigObject<ConfigValue> *config);
+    ~DlgPrefSound();
+signals:
+    void loadPaths(const SoundManagerConfig &config);
+    void writePaths(SoundManagerConfig *config);
+    void refreshOutputDevices(const QList<SoundDevice*> &devices);
+    void refreshInputDevices(const QList<SoundDevice*> &devices);
+    void updatingAPI();
+    void updatedAPI();
+public slots:
+    void slotUpdate(); // called on show
+    void slotApply();  // called on ok button
+    void forceApply(); // called by DlgPrefVinyl to make slotApply call setupDevices
+private:
+    void initializePaths();
+    void loadSettings();
+    void loadSettings(const SoundManagerConfig &config);
+    SoundManager *m_pSoundManager;
+    ConfigObject<ConfigValue> *m_pConfig;
+    QList<SoundDevice*> m_inputDevices;
+    QList<SoundDevice*> m_outputDevices;
+    bool m_settingsModified;
+    SoundManagerConfig m_config;
+    bool m_loading;
+    bool m_forceApply;
+    unsigned int m_deckCount;
+private slots:
+    void apiChanged(int index);
+    void updateAPIs();
+    void sampleRateChanged(int index);
+    void latencyChanged(int index);
+    void updateLatencies(int sampleRateIndex);
+    void refreshDevices();
+    void settingChanged();
+    void queryClicked();
+    void resetClicked();
+};
+
+#endif

=== added file 'mixxx/src/dlgprefsounddlg.ui'
--- mixxx/src/dlgprefsounddlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefsounddlg.ui	2010-07-27 01:34:13 +0000
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefSoundDlg</class>
+ <widget class="QWidget" name="DlgPrefSoundDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>520</width>
+    <height>517</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="settingsVLayout">
+     <item>
+      <layout class="QHBoxLayout" name="apiHLayout">
+       <item>
+        <widget class="QLabel" name="apiLabel">
+         <property name="text">
+          <string>Sound API</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="apiComboBox"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="sampleRateHLayout">
+       <item>
+        <widget class="QLabel" name="sampleRateLabel">
+         <property name="text">
+          <string>Sample Rate</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="sampleRateComboBox"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="latencyHLayout">
+       <item>
+        <widget class="QLabel" name="latencyLabel">
+         <property name="text">
+          <string>Latency</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="latencyComboBox"/>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="latencyTipsGroupBox">
+     <property name="title">
+      <string>Latency Tips</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="latencyTipsLabel">
+        <property name="text">
+         <string>&lt;ul&gt;
+&lt;li&gt;Increase your latency if you hear pops during playback&lt;/li&gt;
+&lt;li&gt;Reduce your latency to improve Mixxx's responsiveness&lt;/li&gt;
+&lt;/ul&gt;</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="ioTabs">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="outputTab">
+      <attribute name="title">
+       <string>Output</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QScrollArea" name="outputScrollArea">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="outputScrollAreaContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>496</width>
+            <height>271</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="outputVLayout">
+           <property name="margin">
+            <number>0</number>
+           </property>
+           <item>
+            <spacer name="outputVSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>167</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="inputTab">
+      <attribute name="title">
+       <string>Input</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QScrollArea" name="inputScrollArea">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="inputScrollAreaContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>496</width>
+            <height>271</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="inputVLayout">
+           <property name="margin">
+            <number>0</number>
+           </property>
+           <item>
+            <spacer name="inputVSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonsHLayout">
+     <item>
+      <widget class="QPushButton" name="queryButton">
+       <property name="text">
+        <string>Query Devices</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="resetButton">
+       <property name="text">
+        <string>Reset to Defaults</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="buttonsHSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyButton">
+       <property name="text">
+        <string>Apply</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'mixxx/src/dlgreplaygaindlg.ui'
--- mixxx/src/dlgreplaygaindlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgreplaygaindlg.ui	2010-11-07 16:11:47 +0000
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefReplayGainDlg</class>
+ <widget class="QWidget" name="DlgPrefReplayGainDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>409</width>
+    <height>418</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form1</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <item>
+    <widget class="Q3GroupBox" name="GroupBox1">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font/>
+     </property>
+     <property name="title">
+      <string>Replay Gain Normalization</string>
+     </property>
+     <layout class="QVBoxLayout">
+      <item>
+       <widget class="QCheckBox" name="EnableGain">
+        <property name="text">
+         <string>Enable Replay Gain</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="EnableAnalyser">
+        <property name="text">
+         <string>Enable Replay Gain Analyser</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="AffectVolume">
+        <property name="text">
+         <string>Affect Desk Volume</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="AffectGain">
+        <property name="text">
+         <string>Affect Desk Pregain</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout">
+        <item>
+         <layout class="QVBoxLayout">
+          <item>
+           <layout class="QHBoxLayout">
+            <item>
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>Initial Boost</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QSlider" name="SliderBoost">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>100</number>
+            </property>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="pageStep">
+             <number>1</number>
+            </property>
+            <property name="value">
+             <number>50</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="tickInterval">
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout">
+            <item>
+             <widget class="QLabel" name="TextLabel8">
+              <property name="font">
+               <font/>
+              </property>
+              <property name="text">
+               <string>0  Db</string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="TextLabel8_2">
+              <property name="font">
+               <font/>
+              </property>
+              <property name="text">
+               <string>+15 Db </string>
+              </property>
+              <property name="wordWrap">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="PushButtonReset">
+       <property name="text">
+        <string>Reset</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>Q3GroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Qt3Support/Q3GroupBox</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'mixxx/src/engine/enginepregain.cpp'
--- mixxx/src/engine/enginepregain.cpp	2010-06-02 21:26:29 +0000
+++ mixxx/src/engine/enginepregain.cpp	2010-11-07 16:11:47 +0000
@@ -3,41 +3,76 @@
                              -------------------
     copyright            : (C) 2002 by Tue and Ken Haste Andersen
     email                :
-***************************************************************************/
+ ***************************************************************************/
 
 /***************************************************************************
-*                                                                         *
-*   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.                                   *
-*                                                                         *
-***************************************************************************/
+ *                                                                         *
+ *   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 "enginepregain.h"
 #include "controllogpotmeter.h"
+#include "controlpotmeter.h"
+#include "controlpushbutton.h"
+#include "configobject.h"
+#include "controlobject.h"
+
 #include "sampleutil.h"
 
+
 /*----------------------------------------------------------------
    A pregaincontrol is ... a pregain.
    ----------------------------------------------------------------*/
 EnginePregain::EnginePregain(const char * group)
 {
-  potmeterPregain = new ControlLogpotmeter(ConfigKey(group, "pregain"), 4.);
-  //  potmeterPregain = new ControlPotmeter(ConfigKey(group, "pregain"), -1., 1.);
+    potmeterPregain = new ControlLogpotmeter(ConfigKey(group, "pregain"), 4.);
+    //Replay Gain things
+    m_pControlReplayGain = new ControlObject(ConfigKey(group, "replaygain"));
+    m_pTotalGain = new ControlObject(ConfigKey(group, "total_gain"));
+
+
+    if(ControlObject::getControl(ConfigKey("[ReplayGain]", "InitialReplayGainBoost"))==NULL)
+    {
+        m_pReplayGainBoost = new ControlPotmeter(ConfigKey("[ReplayGain]", "InitialReplayGainBoost"),0., 15.);
+        m_pEnableRG = new ControlPotmeter(ConfigKey("[ReplayGain]", "ReplayGainEnabled"));
+    }
+    else
+    {
+        m_pReplayGainBoost = (ControlPotmeter*)ControlObject::getControl(ConfigKey("[ReplayGain]", "InitialReplayGainBoost"));
+        m_pEnableRG = (ControlPotmeter*)ControlObject::getControl(ConfigKey("[ReplayGain]", "ReplayGainEnabled"));
+    }
 
 }
 
 EnginePregain::~EnginePregain()
 {
     delete potmeterPregain;
+    delete m_pControlReplayGain;
+    delete m_pTotalGain;
 }
 
 void EnginePregain::process(const CSAMPLE * pIn, const CSAMPLE * pOut, const int iBufferSize)
 {
+
+    float fEnableRG = m_pEnableRG->get();
+    float fReplayGainBoost = m_pReplayGainBoost->get();
     CSAMPLE * pOutput = (CSAMPLE *)pOut;
     float fGain = potmeterPregain->get();
-    fGain = fGain/2;
+    float fRGain = m_pControlReplayGain->get();
+    m_fReplayGainCorrection=1;
+    if(fRGain*fEnableRG != 0)
+    {
+
+        //Passing a user defined boost
+        m_fReplayGainCorrection=fRGain*pow(10, fReplayGainBoost/20);
+    }
+    fGain = (fGain/2)*m_fReplayGainCorrection;
+    m_pTotalGain -> set(fGain);
+
 
     // SampleUtil deals with aliased buffers and gains of 1 or 0.
     SampleUtil::copyWithGain(pOutput, pIn, fGain, iBufferSize);

=== modified file 'mixxx/src/engine/enginepregain.h'
--- mixxx/src/engine/enginepregain.h	2009-01-24 04:39:32 +0000
+++ mixxx/src/engine/enginepregain.h	2010-11-07 16:11:47 +0000
@@ -18,18 +18,27 @@
 #define ENGINEPREGAIN_H
 
 #include "engineobject.h"
+#include "controlobject.h"
+
 
 class ControlLogpotmeter;
-
+class ControlPotmeter;
+class ControlObject;
 class EnginePregain : public EngineObject
 {
 public:
-    EnginePregain(const char *group);
+    EnginePregain( const char *group);
     ~EnginePregain();
     void process(const CSAMPLE *pIn, const CSAMPLE *pOut, const int iBufferSize);
 
+
+
 private:
     ControlLogpotmeter *potmeterPregain;
+    ControlPotmeter *m_pReplayGainBoost, *m_pEnableRG;
+    ControlObject *m_pControlReplayGain, *m_pTotalGain;
+    float m_fReplayGainCorrection;
+
 };
 
 #endif

=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2010-09-17 04:15:33 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2010-11-07 16:11:47 +0000
@@ -188,12 +188,12 @@
 void TrackDAO::prepareLibraryInsert(QSqlQuery& query) {
     query.prepare("INSERT INTO library (artist, title, album, year, genre, tracknumber, "
                   "filetype, location, comment, url, duration, "
-                  "bitrate, samplerate, cuepoint, bpm, wavesummaryhex, "
+                  "bitrate, samplerate, cuepoint, bpm, replaygain, wavesummaryhex, "
                   "channels, mixxx_deleted, header_parsed) "
                   "VALUES (:artist, "
                   ":title, :album, :year, :genre, :tracknumber, "
                   ":filetype, :location, :comment, :url, :duration, "
-                  ":bitrate, :samplerate, :cuepoint, :bpm, :wavesummaryhex, "
+                  ":bitrate, :samplerate, :cuepoint, :bpm, :replaygain, :wavesummaryhex, "
                   ":channels, :mixxx_deleted, :header_parsed)");
 }
 
@@ -213,6 +213,7 @@
     query.bindValue(":samplerate", pTrack->getSampleRate());
     query.bindValue(":cuepoint", pTrack->getCuePoint());
     query.bindValue(":bpm", pTrack->getBpm());
+    query.bindValue(":replaygain", pTrack->getRG());
     const QByteArray* pWaveSummary = pTrack->getWaveSummary();
     if (pWaveSummary) //Avoid null pointer deref
         query.bindValue(":wavesummaryhex", *pWaveSummary);
@@ -503,6 +504,7 @@
         int samplerate = query.value(query.record().indexOf("samplerate")).toInt();
         int cuepoint = query.value(query.record().indexOf("cuepoint")).toInt();
         QString bpm = query.value(query.record().indexOf("bpm")).toString();
+        QString replaygain = query.value(query.record().indexOf("replaygain")).toString();
         QByteArray* wavesummaryhex = new QByteArray(
             query.value(query.record().indexOf("wavesummaryhex")).toByteArray());
         //int timesplayed = query.value(query.record().indexOf("timesplayed")).toInt();
@@ -533,6 +535,7 @@
         track->setSampleRate(samplerate);
         track->setCuePoint((float)cuepoint);
         track->setBpm(bpm.toFloat());
+        track->setRG(replaygain.toFloat());
         track->setWaveSummary(wavesummaryhex, false);
         delete wavesummaryhex;
         //track->setTimesPlayed //Doesn't exist wtfbbq
@@ -607,7 +610,7 @@
     time.start();
     QSqlQuery query(m_database);
 
-    query.prepare("SELECT library.id, artist, title, album, year, genre, tracknumber, filetype, track_locations.location as location, track_locations.filesize as filesize, comment, url, duration, bitrate, samplerate, cuepoint, bpm, wavesummaryhex, channels, header_parsed FROM Library INNER JOIN track_locations ON library.location = track_locations.id WHERE library.id=" + QString("%1").arg(id));
+    query.prepare("SELECT library.id, artist, title, album, year, genre, tracknumber, filetype, track_locations.location as location, track_locations.filesize as filesize, comment, url, duration, bitrate, samplerate, cuepoint, bpm, replaygain, wavesummaryhex, channels, header_parsed FROM Library INNER JOIN track_locations ON library.location = track_locations.id WHERE library.id=" + QString("%1").arg(id));
     TrackPointer pTrack;
 
     if (query.exec()) {
@@ -643,7 +646,7 @@
                   "filetype=:filetype, tracknumber=:tracknumber, "
                   "comment=:comment, url=:url, duration=:duration, "
                   "bitrate=:bitrate, samplerate=:samplerate, cuepoint=:cuepoint, "
-                  "bpm=:bpm, wavesummaryhex=:wavesummaryhex, "
+                  "bpm=:bpm, replaygain=:replaygain, wavesummaryhex=:wavesummaryhex, "
                   "channels=:channels, header_parsed=:header_parsed "
                   "WHERE id="+QString("%1").arg(trackId));
     query.bindValue(":artist", pTrack->getArtist());
@@ -660,6 +663,7 @@
     query.bindValue(":samplerate", pTrack->getSampleRate());
     query.bindValue(":cuepoint", pTrack->getCuePoint());
     query.bindValue(":bpm", pTrack->getBpm());
+    query.bindValue(":replaygain", pTrack->getRG());
     const QByteArray* pWaveSummary = pTrack->getWaveSummary();
     if (pWaveSummary) //Avoid null pointer deref
         query.bindValue(":wavesummaryhex", *pWaveSummary);

=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2010-09-13 06:23:38 +0000
+++ mixxx/src/library/dao/trackdao.h	2010-11-07 16:11:47 +0000
@@ -30,6 +30,7 @@
 const QString LIBRARYTABLE_DURATION = "duration";
 const QString LIBRARYTABLE_BITRATE = "bitrate";
 const QString LIBRARYTABLE_BPM = "bpm";
+const QString LIBRARYTABLE_REPLAYGAIN = "replaygain";
 const QString LIBRARYTABLE_CUEPOINT = "cuepoint";
 const QString LIBRARYTABLE_URL = "url";
 const QString LIBRARYTABLE_SAMPLERATE = "samplerate";

=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp	2010-10-28 06:41:43 +0000
+++ mixxx/src/library/librarytablemodel.cpp	2010-11-07 16:11:47 +0000
@@ -201,6 +201,7 @@
     if ((column == fieldIndex(LIBRARYTABLE_ID)) ||
         (column == fieldIndex(LIBRARYTABLE_URL)) ||
         (column == fieldIndex(LIBRARYTABLE_CUEPOINT)) ||
+        (column == fieldIndex(LIBRARYTABLE_REPLAYGAIN)) ||
         (column == fieldIndex(LIBRARYTABLE_WAVESUMMARYHEX)) ||
         (column == fieldIndex(LIBRARYTABLE_SAMPLERATE)) ||
         (column == fieldIndex(LIBRARYTABLE_MIXXXDELETED)) ||

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2010-10-26 08:02:18 +0000
+++ mixxx/src/library/trackcollection.cpp	2010-11-07 16:11:47 +0000
@@ -65,7 +65,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 5;
+    int requiredSchemaVersion = 6;
     if (!SchemaManager::upgradeToSchemaVersion(m_pConfig, m_db,
                                                requiredSchemaVersion)) {
         QMessageBox::warning(0, tr("Cannot upgrade database schema"),

=== modified file 'mixxx/src/player.cpp'
--- mixxx/src/player.cpp	2010-11-01 06:44:32 +0000
+++ mixxx/src/player.cpp	2010-11-07 16:11:47 +0000
@@ -77,6 +77,8 @@
     //BPM of the current song
     m_pBPM = new ControlObjectThreadMain(
         ControlObject::getControl(ConfigKey(m_strChannel, "file_bpm")));
+    m_pRG = new ControlObjectThreadMain(
+            ControlObject::getControl(ConfigKey(m_strChannel, "replaygain")));
 
     // Create WaveformRenderer last, because it relies on controls created above
     // (e.g. EngineBuffer)
@@ -100,6 +102,7 @@
     delete m_pLoopOutPoint;
     delete m_pPlayPosition;
     delete m_pBPM;
+    delete m_pRG;
 }
 
 void Player::slotLoadTrack(TrackPointer track, bool bStartFromEndPos)
@@ -144,6 +147,10 @@
     connect(m_pLoadedTrack.data(), SIGNAL(bpmUpdated(double)),
             m_pBPM, SLOT(slotSet(double)));
 
+    // Listen for updates to the file's Replay Gain
+    connect(m_pLoadedTrack.data(), SIGNAL(RGUpdated(double)),
+            m_pRG, SLOT(slotSet(double)));
+
     //Request a new track from the reader
     emit(loadTrack(track));
 }
@@ -167,6 +174,7 @@
     }
     m_pDuration->set(0);
     m_pBPM->slotSet(0);
+    m_pRG->slotSet(0);
     m_pLoopInPoint->slotSet(-1);
     m_pLoopOutPoint->slotSet(-1);
     m_pLoadedTrack.clear();
@@ -193,7 +201,7 @@
     //Update the BPM and duration values that are stored in ControlObjects
     m_pDuration->set(m_pLoadedTrack->getDuration());
     m_pBPM->slotSet(m_pLoadedTrack->getBpm());
-
+    m_pRG->slotSet(m_pLoadedTrack->getRG());
     // Update the PlayerInfo class that is used in EngineShoutcast to replace
     // the metadata of a stream
     PlayerInfo::Instance().setTrackInfo(m_strChannel.mid(8,1).toInt(), m_pLoadedTrack);

=== modified file 'mixxx/src/player.h'
--- mixxx/src/player.h	2010-11-01 06:44:32 +0000
+++ mixxx/src/player.h	2010-11-07 16:11:47 +0000
@@ -43,6 +43,7 @@
     ControlObjectThreadMain* m_pPlayPosition;
     ControlObject* m_pDuration;
     ControlObjectThreadMain* m_pBPM;
+    ControlObjectThreadMain* m_pRG;
     WaveformRenderer* m_pWaveformRenderer;
 };
 

=== added directory 'mixxx/src/replaygain'
=== added file 'mixxx/src/replaygain/replaygain_analysis.c'
--- mixxx/src/replaygain/replaygain_analysis.c	1970-01-01 00:00:00 +0000
+++ mixxx/src/replaygain/replaygain_analysis.c	2010-11-07 16:11:47 +0000
@@ -0,0 +1,431 @@
+/*
+ *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ *  Copyright (C) 2001 David Robinson and Glen Sawyer
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  concept and filter values by David Robinson ([e-mail])
+ *    -- blame him if you think the idea is flawed
+ *  original coding by Glen Sawyer ([e-mail])
+ *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+ *
+ *  lots of code improvements by Frank Klemm ( http://www.uni-jena.de/~pfk/mpp/ )
+ *    -- credit him for all the _good_ programming ;)
+ *
+ *  minor cosmetic tweaks to integrate with FLAC by Josh Coalson
+ *
+ *
+ *  For an explanation of the concepts and the basic algorithms involved, go to:
+ *    http://www.replaygain.org/
+ */
+
+/*
+ *  Here's the deal. Call
+ *
+ *    InitGainAnalysis ( long samplefreq );
+ *
+ *  to initialize everything. Call
+ *
+ *    AnalyzeSamples ( const Float_t*  left_samples,
+ *                     const Float_t*  right_samples,
+ *                     size_t          num_samples,
+ *                     int             num_channels );
+ *
+ *  as many times as you want, with as many or as few samples as you want.
+ *  If mono, pass the sample buffer in through left_samples, leave
+ *  right_samples NULL, and make sure num_channels = 1.
+ *
+ *    GetTitleGain()
+ *
+ *  will return the recommended dB level change for all samples analyzed
+ *  SINCE THE LAST TIME you called GetTitleGain() OR InitGainAnalysis().
+ *
+ *    GetAlbumGain()
+ *
+ *  will return the recommended dB level change for all samples analyzed
+ *  since InitGainAnalysis() was called and finalized with GetTitleGain().
+ *
+ *  Pseudo-code to process an album:
+ *
+ *    Float_t       l_samples [4096];
+ *    Float_t       r_samples [4096];
+ *    size_t        num_samples;
+ *    unsigned int  num_songs;
+ *    unsigned int  i;
+ *
+ *    InitGainAnalysis ( 44100 );
+ *    for ( i = 1; i <= num_songs; i++ ) {
+ *        while ( ( num_samples = getSongSamples ( song[i], left_samples, right_samples ) ) > 0 )
+ *            AnalyzeSamples ( left_samples, right_samples, num_samples, 2 );
+ *        fprintf ("Recommended dB change for song %2d: %+6.2f dB\n", i, GetTitleGain() );
+ *    }
+ *    fprintf ("Recommended dB change for whole album: %+6.2f dB\n", GetAlbumGain() );
+ */
+
+/*
+ *  So here's the main source of potential code confusion:
+ *
+ *  The filters applied to the incoming samples are IIR filters,
+ *  meaning they rely on up to <filter order> number of previous samples
+ *  AND up to <filter order> number of previous filtered samples.
+ *
+ *  I set up the AnalyzeSamples routine to minimize memory usage and interface
+ *  complexity. The speed isn't compromised too much (I don't think), but the
+ *  internal complexity is higher than it should be for such a relatively
+ *  simple routine.
+ *
+ *  Optimization/clarity suggestions are welcome.
+ */
+
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "replaygain_analysis.h"
+
+Float_t ReplayGainReferenceLoudness = 89.0; /* in dB SPL */
+
+typedef unsigned short  Uint16_t;
+typedef signed short    Int16_t;
+typedef unsigned int    Uint32_t;
+typedef signed int      Int32_t;
+
+#define YULE_ORDER         10
+#define BUTTER_ORDER        2
+#define RMS_PERCENTILE      0.95        /* percentile which is louder than the proposed level */
+#define MAX_SAMP_FREQ   48000.          /* maximum allowed sample frequency [Hz] */
+#define RMS_WINDOW_TIME     0.050       /* Time slice size [s] */
+#define STEPS_per_dB      100.          /* Table entries per dB */
+#define MAX_dB            120.          /* Table entries for 0...MAX_dB (normal max. values are 70...80 dB) */
+
+#define MAX_ORDER               (BUTTER_ORDER > YULE_ORDER ? BUTTER_ORDER : YULE_ORDER)
+/* [JEC] the following was originally #defined as:
+ *   (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME)
+ * but that seemed to fail to take into account the ceil() part of the
+ * sampleWindow calculation in ResetSampleFrequency(), and was causing
+ * buffer overflows for 48kHz analysis, hence the +1.
+ */
+#ifndef __sun
+ #define MAX_SAMPLES_PER_WINDOW  (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME + 1.)   /* max. Samples per Time slice */
+#else
+ /* [JEC] Solaris Forte compiler doesn't like float calc in array indices */
+ #define MAX_SAMPLES_PER_WINDOW  (size_t) (2401)
+#endif
+#define PINK_REF                64.82 /* 298640883795 */                          /* calibration value */
+
+static Float_t          linprebuf [MAX_ORDER * 2];
+static Float_t*         linpre;                                          /* left input samples, with pre-buffer */
+static Float_t          lstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+static Float_t*         lstep;                                           /* left "first step" (i.e. post first filter) samples */
+static Float_t          loutbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+static Float_t*         lout;                                            /* left "out" (i.e. post second filter) samples */
+static Float_t          rinprebuf [MAX_ORDER * 2];
+static Float_t*         rinpre;                                          /* right input samples ... */
+static Float_t          rstepbuf  [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+static Float_t*         rstep;
+static Float_t          routbuf   [MAX_SAMPLES_PER_WINDOW + MAX_ORDER];
+static Float_t*         rout;
+static unsigned int              sampleWindow;                           /* number of samples required to reach number of milliseconds required for RMS window */
+static unsigned long    totsamp;
+static double           lsum;
+static double           rsum;
+static int              freqindex;
+#ifndef __sun
+static Uint32_t  A [(size_t)(STEPS_per_dB * MAX_dB)];
+/*static Uint32_t  B [(size_t)(STEPS_per_dB * MAX_dB)];*/
+#else
+/* [JEC] Solaris Forte compiler doesn't like float calc in array indices */
+static Uint32_t  A [12000];
+/*static Uint32_t  B [12000];*/
+#endif
+
+/* for each filter:
+   [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz */
+
+#ifdef WIN32
+#pragma warning ( disable : 4305 )
+#endif
+
+static const Float_t  AYule [9] [11] = {
+    { 1., -3.84664617118067,  7.81501653005538,-11.34170355132042, 13.05504219327545,-12.28759895145294,  9.48293806319790, -5.87257861775999,  2.75465861874613, -0.86984376593551, 0.13919314567432 },
+    { 1., -3.47845948550071,  6.36317777566148, -8.54751527471874,  9.47693607801280, -8.81498681370155,  6.85401540936998, -4.39470996079559,  2.19611684890774, -0.75104302451432, 0.13149317958808 },
+    { 1., -2.37898834973084,  2.84868151156327, -2.64577170229825,  2.23697657451713, -1.67148153367602,  1.00595954808547, -0.45953458054983,  0.16378164858596, -0.05032077717131, 0.02347897407020 },
+    { 1., -1.61273165137247,  1.07977492259970, -0.25656257754070, -0.16276719120440, -0.22638893773906,  0.39120800788284, -0.22138138954925,  0.04500235387352,  0.02005851806501, 0.00302439095741 },
+    { 1., -1.49858979367799,  0.87350271418188,  0.12205022308084, -0.80774944671438,  0.47854794562326, -0.12453458140019, -0.04067510197014,  0.08333755284107, -0.04237348025746, 0.02977207319925 },
+    { 1., -0.62820619233671,  0.29661783706366, -0.37256372942400,  0.00213767857124, -0.42029820170918,  0.22199650564824,  0.00613424350682,  0.06747620744683,  0.05784820375801, 0.03222754072173 },
+    { 1., -1.04800335126349,  0.29156311971249, -0.26806001042947,  0.00819999645858,  0.45054734505008, -0.33032403314006,  0.06739368333110, -0.04784254229033,  0.01639907836189, 0.01807364323573 },
+    { 1., -0.51035327095184, -0.31863563325245, -0.20256413484477,  0.14728154134330,  0.38952639978999, -0.23313271880868, -0.05246019024463, -0.02505961724053,  0.02442357316099, 0.01818801111503 },
+    { 1., -0.25049871956020, -0.43193942311114, -0.03424681017675, -0.04678328784242,  0.26408300200955,  0.15113130533216, -0.17556493366449, -0.18823009262115,  0.05477720428674, 0.04704409688120 }
+};
+
+static const Float_t  BYule [9] [11] = {
+    { 0.03857599435200, -0.02160367184185, -0.00123395316851, -0.00009291677959, -0.01655260341619,  0.02161526843274, -0.02074045215285,  0.00594298065125,  0.00306428023191,  0.00012025322027,  0.00288463683916 },
+    { 0.05418656406430, -0.02911007808948, -0.00848709379851, -0.00851165645469, -0.00834990904936,  0.02245293253339, -0.02596338512915,  0.01624864962975, -0.00240879051584,  0.00674613682247, -0.00187763777362 },
+    { 0.15457299681924, -0.09331049056315, -0.06247880153653,  0.02163541888798, -0.05588393329856,  0.04781476674921,  0.00222312597743,  0.03174092540049, -0.01390589421898,  0.00651420667831, -0.00881362733839 },
+    { 0.30296907319327, -0.22613988682123, -0.08587323730772,  0.03282930172664, -0.00915702933434, -0.02364141202522, -0.00584456039913,  0.06276101321749, -0.00000828086748,  0.00205861885564, -0.02950134983287 },
+    { 0.33642304856132, -0.25572241425570, -0.11828570177555,  0.11921148675203, -0.07834489609479, -0.00469977914380, -0.00589500224440,  0.05724228140351,  0.00832043980773, -0.01635381384540, -0.01760176568150 },
+    { 0.44915256608450, -0.14351757464547, -0.22784394429749, -0.01419140100551,  0.04078262797139, -0.12398163381748,  0.04097565135648,  0.10478503600251, -0.01863887810927, -0.03193428438915,  0.00541907748707 },
+    { 0.56619470757641, -0.75464456939302,  0.16242137742230,  0.16744243493672, -0.18901604199609,  0.30931782841830, -0.27562961986224,  0.00647310677246,  0.08647503780351, -0.03788984554840, -0.00588215443421 },
+    { 0.58100494960553, -0.53174909058578, -0.14289799034253,  0.17520704835522,  0.02377945217615,  0.15558449135573, -0.25344790059353,  0.01628462406333,  0.06920467763959, -0.03721611395801, -0.00749618797172 },
+    { 0.53648789255105, -0.42163034350696, -0.00275953611929,  0.04267842219415, -0.10214864179676,  0.14590772289388, -0.02459864859345, -0.11202315195388, -0.04060034127000,  0.04788665548180, -0.02217936801134 }
+};
+
+static const Float_t  AButter [9] [3] = {
+    { 1., -1.97223372919527, 0.97261396931306 },
+    { 1., -1.96977855582618, 0.97022847566350 },
+    { 1., -1.95835380975398, 0.95920349965459 },
+    { 1., -1.95002759149878, 0.95124613669835 },
+    { 1., -1.94561023566527, 0.94705070426118 },
+    { 1., -1.92783286977036, 0.93034775234268 },
+    { 1., -1.91858953033784, 0.92177618768381 },
+    { 1., -1.91542108074780, 0.91885558323625 },
+    { 1., -1.88903307939452, 0.89487434461664 }
+};
+
+static const Float_t  BButter [9] [3] = {
+    { 0.98621192462708, -1.97242384925416, 0.98621192462708 },
+    { 0.98500175787242, -1.97000351574484, 0.98500175787242 },
+    { 0.97938932735214, -1.95877865470428, 0.97938932735214 },
+    { 0.97531843204928, -1.95063686409857, 0.97531843204928 },
+    { 0.97316523498161, -1.94633046996323, 0.97316523498161 },
+    { 0.96454515552826, -1.92909031105652, 0.96454515552826 },
+    { 0.96009142950541, -1.92018285901082, 0.96009142950541 },
+    { 0.95856916599601, -1.91713833199203, 0.95856916599601 },
+    { 0.94597685600279, -1.89195371200558, 0.94597685600279 }
+};
+
+#ifdef WIN32
+#pragma warning ( default : 4305 )
+#endif
+
+/* When calling this procedure, make sure that ip[-order] and op[-order] point to real data! */
+
+static void
+filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* a, const Float_t* b, size_t order )
+{
+    double  y;
+    size_t  i;
+    size_t  k;
+
+    for ( i = 0; i < nSamples; i++ ) {
+        y = input[i] * b[0];
+        for ( k = 1; k <= order; k++ )
+            y += input[i-k] * b[k] - output[i-k] * a[k];
+        output[i] = (Float_t)y;
+    }
+}
+
+/* returns a INIT_GAIN_ANALYSIS_OK if successful, INIT_GAIN_ANALYSIS_ERROR if not */
+
+int
+ResetSampleFrequency ( long samplefreq ) {
+    int  i;
+
+    /* zero out initial values */
+    for ( i = 0; i < MAX_ORDER; i++ )
+        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.;
+
+    switch ( (int)(samplefreq) ) {
+        case 48000: freqindex = 0; break;
+        case 44100: freqindex = 1; break;
+        case 32000: freqindex = 2; break;
+        case 24000: freqindex = 3; break;
+        case 22050: freqindex = 4; break;
+        case 16000: freqindex = 5; break;
+        case 12000: freqindex = 6; break;
+        case 11025: freqindex = 7; break;
+        case  8000: freqindex = 8; break;
+        default:    return INIT_GAIN_ANALYSIS_ERROR;
+    }
+
+    sampleWindow = (int) ceil (samplefreq * RMS_WINDOW_TIME);
+
+    lsum         = 0.;
+    rsum         = 0.;
+    totsamp      = 0;
+
+    memset ( A, 0, sizeof(A) );
+
+	return INIT_GAIN_ANALYSIS_OK;
+}
+
+int
+InitGainAnalysis ( long samplefreq )
+{
+	if (ResetSampleFrequency(samplefreq) != INIT_GAIN_ANALYSIS_OK) {
+		return INIT_GAIN_ANALYSIS_ERROR;
+	}
+
+    linpre       = linprebuf + MAX_ORDER;
+    rinpre       = rinprebuf + MAX_ORDER;
+    lstep        = lstepbuf  + MAX_ORDER;
+    rstep        = rstepbuf  + MAX_ORDER;
+    lout         = loutbuf   + MAX_ORDER;
+    rout         = routbuf   + MAX_ORDER;
+
+    //memset ( B, 0, sizeof(B) );
+
+    return INIT_GAIN_ANALYSIS_OK;
+}
+
+/* returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not */
+
+int
+AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels )
+{
+    const Float_t*  curleft;
+    const Float_t*  curright;
+    long            batchsamples;
+    long            cursamples;
+    long            cursamplepos;
+    int             i;
+
+    if ( num_samples == 0 )
+        return GAIN_ANALYSIS_OK;
+
+    cursamplepos = 0;
+    batchsamples = num_samples;
+
+    switch ( num_channels) {
+    case  1: right_samples = left_samples;
+    case  2: break;
+    default: return GAIN_ANALYSIS_ERROR;
+    }
+
+    if ( num_samples < MAX_ORDER ) {
+        memcpy ( linprebuf + MAX_ORDER, left_samples , num_samples * sizeof(Float_t) );
+        memcpy ( rinprebuf + MAX_ORDER, right_samples, num_samples * sizeof(Float_t) );
+    }
+    else {
+        memcpy ( linprebuf + MAX_ORDER, left_samples,  MAX_ORDER   * sizeof(Float_t) );
+        memcpy ( rinprebuf + MAX_ORDER, right_samples, MAX_ORDER   * sizeof(Float_t) );
+    }
+
+    while ( batchsamples > 0 ) {
+        cursamples = batchsamples > (long)(sampleWindow-totsamp)  ?  (long)(sampleWindow - totsamp)  :  batchsamples;
+        if ( cursamplepos < MAX_ORDER ) {
+            curleft  = linpre+cursamplepos;
+            curright = rinpre+cursamplepos;
+            if (cursamples > MAX_ORDER - cursamplepos )
+                cursamples = MAX_ORDER - cursamplepos;
+        }
+        else {
+            curleft  = left_samples  + cursamplepos;
+            curright = right_samples + cursamplepos;
+        }
+
+        filter ( curleft , lstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
+        filter ( curright, rstep + totsamp, cursamples, AYule[freqindex], BYule[freqindex], YULE_ORDER );
+
+        filter ( lstep + totsamp, lout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
+        filter ( rstep + totsamp, rout + totsamp, cursamples, AButter[freqindex], BButter[freqindex], BUTTER_ORDER );
+
+        for ( i = 0; i < cursamples; i++ ) {             /* Get the squared values */
+            lsum += lout [totsamp+i] * lout [totsamp+i];
+            rsum += rout [totsamp+i] * rout [totsamp+i];
+        }
+
+        batchsamples -= cursamples;
+        cursamplepos += cursamples;
+        totsamp      += cursamples;
+        if ( totsamp == sampleWindow ) {  /* Get the Root Mean Square (RMS) for this set of samples */
+            double  val  = STEPS_per_dB * 10. * log10 ( (lsum+rsum) / totsamp * 0.5 + 1.e-37 );
+            int     ival = (int) val;
+            if ( ival <                     0 ) ival = 0;
+            if ( ival >= (int)(sizeof(A)/sizeof(*A)) ) ival = (int)(sizeof(A)/sizeof(*A)) - 1;
+            A [ival]++;
+            lsum = rsum = 0.;
+            memmove ( loutbuf , loutbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( routbuf , routbuf  + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( lstepbuf, lstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
+            memmove ( rstepbuf, rstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) );
+            totsamp = 0;
+        }
+        if ( totsamp > sampleWindow )   /* somehow I really screwed up: Error in programming! Contact author about totsamp > sampleWindow */
+            return GAIN_ANALYSIS_ERROR;
+    }
+    if ( num_samples < MAX_ORDER ) {
+        memmove ( linprebuf,                           linprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
+        memmove ( rinprebuf,                           rinprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) );
+        memcpy  ( linprebuf + MAX_ORDER - num_samples, left_samples,          num_samples             * sizeof(Float_t) );
+        memcpy  ( rinprebuf + MAX_ORDER - num_samples, right_samples,         num_samples             * sizeof(Float_t) );
+    }
+    else {
+        memcpy  ( linprebuf, left_samples  + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
+        memcpy  ( rinprebuf, right_samples + num_samples - MAX_ORDER, MAX_ORDER * sizeof(Float_t) );
+    }
+
+    return GAIN_ANALYSIS_OK;
+}
+
+
+static Float_t
+analyzeResult ( Uint32_t* Array, size_t len )
+{
+    Uint32_t  elems;
+    Int32_t   upper;
+    size_t    i;
+
+    elems = 0;
+    for ( i = 0; i < len; i++ )
+        elems += Array[i];
+    if ( elems == 0 )
+        return GAIN_NOT_ENOUGH_SAMPLES;
+
+    upper = (Int32_t) ceil (elems * (1. - RMS_PERCENTILE));
+    for ( i = len; i-- > 0; ) {
+        if ( (upper -= Array[i]) <= 0 )
+            break;
+    }
+
+   return (Float_t) ((Float_t)PINK_REF - (Float_t)i / (Float_t)STEPS_per_dB);
+   // return (Float_t)  ((Float_t)i / (Float_t)STEPS_per_dB);
+}
+
+
+Float_t
+GetTitleGain ( void )
+{
+    Float_t  retval;
+    unsigned int    i;
+
+    retval = analyzeResult ( A, sizeof(A)/sizeof(*A) );
+
+    for ( i = 0; i < sizeof(A)/sizeof(*A); i++ ) {
+        //B[i] += A[i];
+        A[i]  = 0;
+    }
+
+    for ( i = 0; i < MAX_ORDER; i++ )
+        linprebuf[i] = lstepbuf[i] = loutbuf[i] = rinprebuf[i] = rstepbuf[i] = routbuf[i] = 0.f;
+
+    totsamp = 0;
+    lsum    = rsum = 0.;
+    return retval;
+}
+
+
+//Float_t
+//GetAlbumGain ( void )
+//{
+//    return analyzeResult ( B, sizeof(B)/sizeof(*B) );
+//}
+
+/* end of replaygain_analysis.c */

=== added file 'mixxx/src/replaygain/replaygain_analysis.h'
--- mixxx/src/replaygain/replaygain_analysis.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/replaygain/replaygain_analysis.h	2010-11-07 16:11:47 +0000
@@ -0,0 +1,58 @@
+/*
+ *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ *  Copyright (C) 2001 David Robinson and Glen Sawyer
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  concept and filter values by David Robinson ([e-mail])
+ *    -- blame him if you think the idea is flawed
+ *  coding by Glen Sawyer ([e-mail]) 442 N 700 E, Provo, UT 84606 USA
+ *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+ *  minor cosmetic tweaks to integrate with FLAC by Josh Coalson
+ *
+ *  For an explanation of the concepts and the basic algorithms involved, go to:
+ *    http://www.replaygain.org/
+ */
+
+#ifndef GAIN_ANALYSIS_H
+#define GAIN_ANALYSIS_H
+
+#include <stddef.h>
+
+#define GAIN_NOT_ENOUGH_SAMPLES  -24601
+#define GAIN_ANALYSIS_ERROR           0
+#define GAIN_ANALYSIS_OK              1
+#define INIT_GAIN_ANALYSIS_ERROR      0
+#define INIT_GAIN_ANALYSIS_OK         1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef float   Float_t;         /* Type used for filtering */
+
+extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
+
+int     InitGainAnalysis ( long samplefreq );
+int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
+int		ResetSampleFrequency ( long samplefreq );
+Float_t GetTitleGain     ( void );
+/*Float_t GetAlbumGain     ( void );*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GAIN_ANALYSIS_H */

=== modified file 'mixxx/src/soundsource.cpp'
--- mixxx/src/soundsource.cpp	2010-10-21 01:16:19 +0000
+++ mixxx/src/soundsource.cpp	2010-11-07 16:11:47 +0000
@@ -25,6 +25,7 @@
 #include <taglib/id3v1tag.h>
 #include <taglib/tmap.h>
 #include <taglib/tstringlist.h>
+#include <taglib/textidentificationframe.h>
 #include <taglib/wavpackfile.h>
 
 
@@ -50,6 +51,7 @@
     m_qFilename = qFilename;
     m_iSampleRate = 0;
     m_fBPM = 0.0f;
+    m_fRG = 0.0f;
     m_iDuration = 0;
     m_iBitrate = 0;
     m_iChannels = 0;
@@ -109,6 +111,10 @@
 {
     return m_sTrackNumber;
 }
+float SoundSource::getRG()
+{
+	return m_fRG;
+}
 float SoundSource::getBPM()
 {
     return m_fBPM;
@@ -162,6 +168,10 @@
 {
     m_sTrackNumber = trackNumber;
 }
+void SoundSource::setRG(float replaygain)
+{
+	m_fRG = replaygain;
+}
 void SoundSource::setBPM(float bpm)
 {
     m_fBPM = bpm;
@@ -245,6 +255,17 @@
     return false;
 }
 
+void SoundSource::parseRGString (QString sRG) {
+    QString RGstring = sRG.remove( " dB" );
+    float fRG = pow(10,(RGstring.toFloat())/20);
+    //I found some mp3s of mine with replaygain tag set to 0dB even if not normalized.
+    //This is because of Rapid Evolution 3, I suppose. I prefer to rescan them by setting value to 0 (i.e. rescan via analyserrg)
+    if(fRG==1.0f){
+        fRG= 0.0f;
+    }
+    setRG(fRG);
+}
+
 void SoundSource::processBpmString(QString tagName, QString sBpm) {
     if (s_bDebugMetadata)
         qDebug() << tagName << "BPM" << sBpm;
@@ -262,7 +283,7 @@
         TagLib::ID3v2::FrameList::ConstIterator it = id3v2->frameList().begin();
         for(; it != id3v2->frameList().end(); it++) {
             qDebug() << "ID3V2" << (*it)->frameID().data() << "-"
-                     << TStringToQString((*it)->toString());
+                    << TStringToQString((*it)->toString());
         }
     }
 
@@ -279,6 +300,28 @@
             qDebug() << "KEY" << sKey;
         // TODO(XXX) write key to SoundSource and copy that to the Track
     }
+    // Foobar2000-style ID3v2.3.0 tags
+    // TODO: Check if everything is ok.
+    TagLib::ID3v2::FrameList frames = id3v2->frameListMap()["TXXX"];
+    for ( TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it ) {
+        TagLib::ID3v2::UserTextIdentificationFrame* RGframe =
+                dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>( *it );
+        if ( RGframe && RGframe->fieldList().size() >= 2 )
+        {
+            QString desc = TStringToQString( RGframe->description() ).toLower();
+            if ( desc == "replaygain_album_gain" ){
+                QString sRG = TStringToQString( RGframe->fieldList()[1]);
+                parseRGString(sRG);
+            }
+            if ( desc == "replaygain_track_gain" ){
+                QString sRG = TStringToQString( RGframe->fieldList()[1]);
+                parseRGString(sRG);
+            }
+        }
+    }
+
+
+
 
     return true;
 }
@@ -286,7 +329,7 @@
 bool SoundSource::processAPETag(TagLib::APE::Tag* ape) {
     if (s_bDebugMetadata) {
         for(TagLib::APE::ItemListMap::ConstIterator it = ape->itemListMap().begin();
-            it != ape->itemListMap().end(); ++it) {
+                it != ape->itemListMap().end(); ++it) {
             qDebug() << "APE" << TStringToQString((*it).first) << "-" << TStringToQString((*it).second.toString());
         }
     }
@@ -295,13 +338,25 @@
         QString sBpm = TStringToQString(ape->itemListMap()["BPM"].toString());
         processBpmString("APE", sBpm);
     }
+
+    if ( ape->itemListMap().contains("REPLAYGAIN_ALBUM_GAIN") ) {
+        QString sRG = TStringToQString(ape->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString());
+        parseRGString(sRG);
+    }
+
+    //Prefer track gain over album gain.
+    if ( ape->itemListMap().contains("REPLAYGAIN_TRACK_GAIN") ) {
+        QString sRG = TStringToQString(ape->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString());
+        qDebug()<<"APE value" << sRG;
+        parseRGString(sRG);
+    }
     return true;
 }
 
 bool SoundSource::processXiphComment(TagLib::Ogg::XiphComment* xiph) {
     if (s_bDebugMetadata) {
         for (TagLib::Ogg::FieldListMap::ConstIterator it = xiph->fieldListMap().begin();
-             it != xiph->fieldListMap().end(); ++it) {
+                it != xiph->fieldListMap().end(); ++it) {
             qDebug() << "XIPH" << TStringToQString((*it).first) << "-" << TStringToQString((*it).second.toString());
         }
     }
@@ -320,6 +375,20 @@
         processBpmString("XIPH-TEMPO", sBpm);
     }
 
+
+    if (xiph->fieldListMap().contains("REPLAYGAIN_ALBUM_GAIN")) {
+        TagLib::StringList rgainString = xiph->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"];
+        QString sRG = TStringToQString(rgainString.toString());
+        parseRGString(sRG);
+    }
+
+    if (xiph->fieldListMap().contains("REPLAYGAIN_TRACK_GAIN")) {
+        TagLib::StringList rgainString = xiph->fieldListMap()["REPLAYGAIN_TRACK_GAIN"];
+        QString sRG = TStringToQString(rgainString.toString());
+        parseRGString(sRG);
+    }
+
+
     return true;
 }
 

=== modified file 'mixxx/src/soundsource.h'
--- mixxx/src/soundsource.h	2010-09-10 23:41:49 +0000
+++ mixxx/src/soundsource.h	2010-11-07 16:11:47 +0000
@@ -69,6 +69,7 @@
     virtual QString getYear();
     virtual QString getGenre();
     virtual QString getTrackNumber();
+    virtual float getRG();
     virtual float getBPM();
     virtual int getDuration();
     virtual int getBitrate();
@@ -83,6 +84,7 @@
     virtual void setYear(QString);
     virtual void setGenre(QString);
     virtual void setTrackNumber(QString);
+    virtual void setRG(float);
     virtual void setBPM(float);
     virtual void setDuration(int);
     virtual void setBitrate(int);
@@ -99,7 +101,7 @@
     bool processXiphComment(TagLib::Ogg::XiphComment* xiph);
     bool processMP4Tag(TagLib::MP4::Tag* mp4);
     void processBpmString(QString tagName, QString sBpm);
-
+    void parseRGString(QString sRG);
 
     /** File name */
     QString m_qFilename;
@@ -112,6 +114,7 @@
     QString m_sYear;
     QString m_sGenre;
     QString m_sTrackNumber;
+    float m_fRG;
     float m_fBPM;
     int m_iDuration;
     int m_iBitrate;

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2010-10-14 04:25:11 +0000
+++ mixxx/src/soundsourceproxy.cpp	2010-11-07 16:11:47 +0000
@@ -287,6 +287,7 @@
         p->setGenre(sndsrc->getGenre());
 	p->setComment(sndsrc->getComment());
         p->setTrackNumber(sndsrc->getTrackNumber());
+        p->setRG(sndsrc->getRG());
         p->setBpm(sndsrc->getBPM());
         p->setDuration(sndsrc->getDuration());
         p->setBitrate(sndsrc->getBitrate());

=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2010-10-07 03:05:48 +0000
+++ mixxx/src/trackinfoobject.cpp	2010-11-07 16:11:47 +0000
@@ -68,6 +68,7 @@
     m_iBitrate = XmlParse::selectNodeQString(nodeHeader, "Bitrate").toInt();
     m_iLength = XmlParse::selectNodeQString(nodeHeader, "Length").toInt();
     m_iTimesPlayed = XmlParse::selectNodeQString(nodeHeader, "TimesPlayed").toInt();
+    m_fRG = XmlParse::selectNodeQString(nodeHeader, "replaygain").toFloat();
     m_fBpm = XmlParse::selectNodeQString(nodeHeader, "Bpm").toFloat();
     m_bBpmConfirm = XmlParse::selectNodeQString(nodeHeader, "BpmConfirm").toInt();
     m_fBeatFirst = XmlParse::selectNodeQString(nodeHeader, "BeatFirst").toFloat();
@@ -113,6 +114,7 @@
     m_iBitrate = 0;
     m_iTimesPlayed = 0;
     m_fBpm = 0.;
+    m_fRG = 0.;
     m_bBpmConfirm = false;
     m_bIsValid = false;
     m_bHeaderParsed = false;
@@ -160,6 +162,7 @@
     XmlParse::addElement( doc, header, "Bitrate", QString("%1").arg(m_iBitrate));
     XmlParse::addElement( doc, header, "Length", QString("%1").arg(m_iLength) );
     XmlParse::addElement( doc, header, "TimesPlayed", QString("%1").arg(m_iTimesPlayed) );
+    XmlParse::addElement( doc, header, "replaygain", QString("%1").arg(m_fRG) );
     XmlParse::addElement( doc, header, "Bpm", QString("%1").arg(m_fBpm) );
     XmlParse::addElement( doc, header, "BpmConfirm", QString("%1").arg(m_bBpmConfirm) );
     XmlParse::addElement( doc, header, "BeatFirst", QString("%1").arg(m_fBeatFirst) );
@@ -261,6 +264,25 @@
     return m_bExists;
 }
 
+//Added for replaygain
+
+float TrackInfoObject::getRG() const
+{
+    QMutexLocker lock(&m_qMutex);
+    return m_fRG;
+}
+
+void TrackInfoObject::setRG(float f)
+{
+    QMutexLocker lock(&m_qMutex);
+    bool dirty = m_fRG != f;
+    m_fRG = f;
+    //qDebug() << "Reported ReplayGain value: " << m_fRG;
+    if (dirty)
+        setDirty(true);
+    emit(RGUpdated(f));
+    lock.unlock();
+}
 
 float TrackInfoObject::getBpm() const
 {
@@ -268,6 +290,8 @@
     return m_fBpm;
 }
 
+
+
 void TrackInfoObject::setBpm(float f)
 {
     QMutexLocker lock(&m_qMutex);
@@ -275,8 +299,8 @@
     m_fBpm = f;
     if (dirty)
         setDirty(true);
+
     lock.unlock();
-
     //Tell the GUI to update the bpm label...
     //qDebug() << "TrackInfoObject signaling BPM update to" << f;
     emit(bpmUpdated(f));

=== modified file 'mixxx/src/trackinfoobject.h'
--- mixxx/src/trackinfoobject.h	2010-10-22 21:35:42 +0000
+++ mixxx/src/trackinfoobject.h	2010-11-07 16:11:47 +0000
@@ -98,6 +98,12 @@
     // the TrackInfoObject is created, or when setLocation() is called.
     bool exists() const;
 
+
+
+    /** Returns ReplayGain*/
+    float getRG() const;
+    /** Set ReplayGain*/
+    void setRG(float);
     /** Returns BPM */
     float getBpm() const;
     /** Set BPM */
@@ -227,6 +233,7 @@
   signals:
     void wavesummaryUpdated(TrackInfoObject*);
     void bpmUpdated(double bpm);
+    void RGUpdated(double replaygain);
     void cuesUpdated();
     void changed();
     void dirty();
@@ -301,6 +308,8 @@
     int m_iBitrate;
     /** Number of times the track has been played */
     int m_iTimesPlayed;
+    /** Replay Gain volume */
+    float m_fRG;
     /** Beat per minutes (BPM) */
     float m_fBpm;
     /** Minimum BPM range. If this is 0.0, then the config min BPM will be used */

=== modified file 'mixxx/src/waveform/waveformrenderbeat.cpp'
--- mixxx/src/waveform/waveformrenderbeat.cpp	2010-07-15 19:07:16 +0000
+++ mixxx/src/waveform/waveformrenderbeat.cpp	2010-11-07 16:11:47 +0000
@@ -113,6 +113,8 @@
     if(m_dBpm == -1 || m_dBpm == 0)
         return;
 
+    slotUpdateTrackSamples(m_pTrackSamples->get());
+
     if(m_iSampleRate == -1 || m_iSampleRate == 0 || m_iNumSamples == 0)
         return;
 

=== modified file 'mixxx/src/waveform/waveformrendersignal.cpp'
--- mixxx/src/waveform/waveformrendersignal.cpp	2010-09-10 04:44:28 +0000
+++ mixxx/src/waveform/waveformrendersignal.cpp	2010-11-07 16:11:47 +0000
@@ -18,12 +18,26 @@
 #include "trackinfoobject.h"
 
 WaveformRenderSignal::WaveformRenderSignal(const char* group, WaveformRenderer *parent)
-        : m_pParent(parent),
-          m_iWidth(0),
-          m_iHeight(0),
-          m_lines(0),
-          m_pTrack(NULL),
-          signalColor(255,255,255) {
+: m_pParent(parent),
+  m_iWidth(0),
+  m_iHeight(0),
+  m_lines(0),
+  m_pTrack(NULL),
+  m_fGain(1),
+  signalColor(255,255,255) {
+
+    m_pGain = new ControlObjectThreadMain(
+            ControlObject::getControl(ConfigKey(group, "total_gain")));
+    if(m_pGain != NULL) {
+        connect(m_pGain, SIGNAL(valueChanged(double)),
+                this, SLOT(slotUpdateGain(double)));
+    }
+}
+
+WaveformRenderSignal::~WaveformRenderSignal() {
+    if(m_pGain)
+        delete m_pGain;
+    m_pGain = NULL;
 }
 
 void WaveformRenderSignal::resize(int w, int h) {
@@ -31,15 +45,22 @@
     m_iHeight = h;
 }
 
+
+
 void WaveformRenderSignal::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
 }
 
+void WaveformRenderSignal::slotUpdateGain(double v) {
+    m_fGain = v;
+}
+
 void WaveformRenderSignal::setup(QDomNode node) {
     signalColor.setNamedColor(WWidget::selectNodeQString(node, "SignalColor"));
     signalColor = WSkinColor::getCorrectColor(signalColor);
 }
 
+
 void WaveformRenderSignal::draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double dPlayPos, double rateAdjust) {
     if(buffer == NULL)
         return;
@@ -74,11 +95,11 @@
         // Start at curPos minus half the waveform viewer
         int thisIndex = iCurPos+2*(i-halfw);
         if(thisIndex >= 0 && (thisIndex+1) < numBufferSamples) {
-            float sampl = baseBuffer[thisIndex];
-            float sampr = baseBuffer[thisIndex+1];
+            float sampl = math_min(1,baseBuffer[thisIndex]*m_fGain);
+            float sampr = math_min(1,baseBuffer[thisIndex+1]*m_fGain);
             const qreal xPos = i/subpixelsPerPixel;
             m_lines[i].setLine(xPos, -sampr*0.40*m_iHeight,
-                               xPos, sampl*0.40*m_iHeight);
+                    xPos, sampl*0.40*m_iHeight);
         } else {
             m_lines[i].setLine(0,0,0,0);
         }
@@ -88,4 +109,5 @@
     pPainter->drawLines(m_lines.data(), subpixelWidth);
 
     pPainter->restore();
+
 }

=== modified file 'mixxx/src/waveform/waveformrendersignal.h'
--- mixxx/src/waveform/waveformrendersignal.h	2010-07-15 19:07:16 +0000
+++ mixxx/src/waveform/waveformrendersignal.h	2010-11-07 16:11:47 +0000
@@ -10,6 +10,7 @@
 
 #include "renderobject.h"
 
+
 class QDomNode;
 class QPainter;
 class QPaintEvent;
@@ -23,13 +24,22 @@
     Q_OBJECT
 public:
     WaveformRenderSignal(const char *group, WaveformRenderer *parent);
+    ~WaveformRenderSignal();
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
+    void drawgain(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust, double gain);
     void newTrack(TrackPointer pTrack);
 
+public slots:
+    void slotUpdateGain(double gain);
+
 private:
+    float m_fGain;
+
     WaveformRenderer *m_pParent;
+    ControlObjectThreadMain *m_pGain;
+
     int m_iWidth, m_iHeight;
     QVector<QLineF> m_lines;
     TrackPointer m_pTrack;