Merge lp:~mattmik/mixxx/features_passthrough into lp:~mixxxdevelopers/mixxx/trunk

[Matthew Mikolay]

Passthrough has been implemented through the EngineDeck class. This required some modifications to additional classes.

Passthrough for a certain deck is enabled using a ControlPushButton linked to the ConfigKey "passthrough_enabled". Passthrough uses the vinyl inputs for a deck specified in the Preferences dialog.

Please ignore all modifications to the EnginePassthrough class, as passthrough using this class is deprecated.

If there are any questions, please contact me!

[lp:~mattmik/mixxx/features_passthrough]

3255. By Daniel Schürmann on 2012-06-12

merged with lp:mixxx/1.10

3256. By RJ Skerry-Ryan on 2012-06-13

Add patch from Max Linke for Bug #1002330 to fix some more star-rating issues.

3257. By RJ Skerry-Ryan on 2012-06-14

Merging bkgood's lp:~mixxxdevelopers/mixxx/fixes_midi_burnout branch to lp:mixxx.

3258. By RJ Skerry-Ryan on 2012-06-14

On Linux, use a 5ms polling interval instead of 1ms. Workaround for Bug #990992 until we have a better fix.

3259. By jus on 2012-06-15

ic_template_keyboard_mapping_sheet.svg re-drawn and arranged more clearly. Makes future maintainance easier if keyboard shortcuts change.

3260. By Daniel Schürmann on 2012-06-15

set default recording folder to QDesktopServices::MusicLocation

3261. By RJ Skerry-Ryan on 2012-06-20

Add Max Linke's patch to add a 'Hidden Tracks' view to Mixxx and change default terminology from 'remove' to 'hide'. Fixes Bug #949828

3262. By RJ Skerry-Ryan on 2012-06-20

Remove redundant rollback since ScopedTransaction auto-rollbacks when it leaves scope w/o being committed.

3263. By RJ Skerry-Ryan on 2012-06-20

For some reason bzr patch did not add hiddentablemodel.cpp from Max's patch.

3264. By RJ Skerry-Ryan on 2012-06-20

Not my day today .. add hiddentablemodel.h

3265. By RJ Skerry-Ryan on 2012-06-20

Add mutil's patch to close the preference dialog when quitting Mixxx. Fixes Bug #1007958

3266. By RJ Skerry-Ryan on 2012-06-20

Add Max Linke's patch to fix external drag and drop. Fixes Bug #1014842

3267. By RJ Skerry-Ryan on 2012-06-20

Add patch from daschuer and mutil that warns the user if the skin does not match their screen resolution. Fixes Bug #1011002

3268. By RJ Skerry-Ryan on 2012-06-20

Add Numark OMNI control preset from Baxter.

3269. By RJ Skerry-Ryan on 2012-06-20

Re-enable bitrate column and allow bitrate: search queries. Fixes Bug #1008872

3270. By RJ Skerry-Ryan on 2012-06-20

When a CO does not exist, make it a toggle ControlPushButton by default instead of a ControlObject. Fixes Bug #1009547

3271. By RJ Skerry-Ryan on 2012-06-20

Add missing warning icon.

3272. By jus on 2012-06-20

Add new preferences icon for controllers & update icon template accordingly, fixes lp:992813

3273. By RJ Skerry-Ryan on 2012-06-21

Add Max Linke's patch to clean up cues, analyses, crates and playlists on purge of tracks from the library. Fixes Bug #949828

3274. By RJ Skerry-Ryan on 2012-06-21

Add patch from daschuer to improve schema upgrade error messages. Fixes Bug #963408

3275. By RJ Skerry-Ryan on 2012-06-21

Version bump to 1.11.0 beta1

3276. By RJ Skerry-Ryan on 2012-06-21

Add 1.11.0~beta1-0ubuntu1 to Debian changelog.

3277. By RJ Skerry-Ryan on 2012-06-22

Add Numark N4 preset from dj.stuartbrand.

3278. By RJ Skerry-Ryan on 2012-06-22

Merging lp:~hile/mixxx/forumlinks into lp:mixxx/1.11

3279. By RJ Skerry-Ryan on 2012-06-22

Add support for displaying wiki links from presets in the controller preferences dialog.

3280. By RJ Skerry-Ryan on 2012-06-22

Minor preset cleanups.

3281. By RJ Skerry-Ryan on 2012-06-22

Potentially fix PPA upload by supporting an explicit ubuntu_ppa SConscript command and allowing ubuntu_dist to be a comma separated list of distros to upload for. This allows us to have one original source tarball for all the individual Ubuntu versions we support.

3282. By RJ Skerry-Ryan on 2012-06-22

Merging from lp:mixxx

3283. By RJ Skerry-Ryan on 2012-06-22

Hack the mixxx_version when we're doing a PPA upload by appending -bzrXXXX.

3284. By RJ Skerry-Ryan on 2012-06-25

Merging from lp:mixxx/1.11

3285. By RJ Skerry-Ryan on 2012-06-26

Merging from lp:mixxx/1.11

3286. By Daniel Schürmann on 2012-07-04

Merging from lp:mixxx/1.11

3287. By RJ Skerry-Ryan on 2012-07-09

Merging from lp:mixxx/1.11

3288. By Daniel Schürmann on 2012-07-09

merged with lp:mixxx/1.11

3289. By Daniel Schürmann on 2012-07-13

merged with lp:mixxx/1.11

3290. By RJ Skerry-Ryan on 2012-07-20

Merging from lp:mixxx/1.11

3291. By Daniel Schürmann on 2012-08-02

merged with lp:mixxx/1.11

3292. By Matthew Mikolay on 2012-08-07

Merging from lp:mixxx/1.11

3293. By Matthew Mikolay on 2012-09-03

Merging from lp:mixxx/1.11

3294. By Matthew Mikolay on 2012-10-22

Merging from lp:mixxx

[RJ Skerry-Ryan (rryan)]

Thanks Matt -- Owen merged this a few days ago.

review: Approve

Unmerged revisions

3294. By Matthew Mikolay on 2012-10-22

Merging from lp:mixxx

3293. By Matthew Mikolay on 2012-09-03

Merging from lp:mixxx/1.11

3292. By Matthew Mikolay on 2012-08-07

Merging from lp:mixxx/1.11

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2012-09-05 06:24:48 +0000
+++ mixxx/build/depends.py	2012-10-22 14:36:20 +0000
@@ -458,7 +458,6 @@
                    "engine/enginexfader.cpp",
                    "engine/enginemicrophone.cpp",
                    "engine/enginedeck.cpp",
-                   "engine/enginepassthrough.cpp",
 
                    "engine/enginecontrol.cpp",
                    "engine/ratecontrol.cpp",

=== modified file 'mixxx/res/skins/Deere1280x800-WXGA/skin.xml'
--- mixxx/res/skins/Deere1280x800-WXGA/skin.xml	2012-09-09 09:25:58 +0000
+++ mixxx/res/skins/Deere1280x800-WXGA/skin.xml	2012-10-22 14:36:20 +0000
@@ -3873,7 +3873,7 @@
 
 			<!--
 			**********************************************
-			Button - Quantize
+			Button - Quantize <ConfigKey>[Channel1],quantize</ConfigKey>
 			**********************************************
 			-->
 			<PushButton>

=== modified file 'mixxx/src/basetrackplayer.cpp'
--- mixxx/src/basetrackplayer.cpp	2012-06-25 00:02:38 +0000
+++ mixxx/src/basetrackplayer.cpp	2012-10-22 14:36:20 +0000
@@ -9,7 +9,6 @@
 #include "controlpotmeter.h"
 #include "trackinfoobject.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "soundsourceproxy.h"
 #include "engine/cuecontrol.h"
@@ -34,10 +33,10 @@
     // pSafeGroupName is leaked. It's like 5 bytes so whatever.
     const char* pSafeGroupName = strdup(getGroup().toAscii().constData());
 
-    EngineDeck* pChannel = new EngineDeck(pSafeGroupName,
-                                          pConfig, defaultOrientation);
-    EngineBuffer* pEngineBuffer = pChannel->getEngineBuffer();
-    pMixingEngine->addChannel(pChannel);
+    m_pChannel = new EngineDeck(pSafeGroupName, pConfig, defaultOrientation);
+
+    EngineBuffer* pEngineBuffer = m_pChannel->getEngineBuffer();
+    pMixingEngine->addChannel(m_pChannel);
 
     ClockControl* pClockControl = new ClockControl(pSafeGroupName, pConfig);
     pEngineBuffer->addControl(pClockControl);
@@ -246,3 +245,8 @@
 TrackPointer BaseTrackPlayer::getLoadedTrack() const {
     return m_pLoadedTrack;
 }
+
+EngineDeck* BaseTrackPlayer::getEngineDeck() const {
+    return m_pChannel;
+}
+

=== modified file 'mixxx/src/basetrackplayer.h'
--- mixxx/src/basetrackplayer.h	2012-04-25 04:43:42 +0000
+++ mixxx/src/basetrackplayer.h	2012-10-22 14:36:20 +0000
@@ -6,6 +6,7 @@
 #include "baseplayer.h"
 #include "analyserqueue.h"
 #include "engine/enginechannel.h"
+#include "engine/enginedeck.h"
 
 class EngineMaster;
 class ControlObject;
@@ -25,6 +26,7 @@
 
     AnalyserQueue* getAnalyserQueue() const;
     TrackPointer getLoadedTrack() const;
+    EngineDeck* getEngineDeck() const;
 
   public slots:
     void slotLoadTrack(TrackPointer track, bool bStartFromEndPos=false);
@@ -53,6 +55,8 @@
     ControlObject* m_pDuration;
     ControlObjectThreadMain* m_pBPM;
     ControlObjectThreadMain* m_pReplayGain;
+
+    EngineDeck* m_pChannel;
 };
 
 

=== modified file 'mixxx/src/engine/enginedeck.cpp'
--- mixxx/src/engine/enginedeck.cpp	2011-06-11 22:55:41 +0000
+++ mixxx/src/engine/enginedeck.cpp	2012-10-22 14:36:20 +0000
@@ -26,11 +26,30 @@
 #include "enginevumeter.h"
 #include "enginefilteriir.h"
 
+#include "sampleutil.h"
+
 EngineDeck::EngineDeck(const char* group,
                              ConfigObject<ConfigValue>* pConfig,
                              EngineChannel::ChannelOrientation defaultOrientation)
         : EngineChannel(group, defaultOrientation),
-          m_pConfig(pConfig) {
+          m_pConfig(pConfig),
+          m_pPassing(new ControlPushButton(ConfigKey(group, "passthrough_enabled"))),
+          // Need a +1 here because the CircularBuffer only allows its size-1
+          // items to be held at once (it keeps a blank spot open persistently)
+          m_sampleBuffer(MAX_BUFFER_LEN+1) {
+
+    // Set up passthrough utilities and fields
+    m_pPassing->setButtonMode(ControlPushButton::TOGGLE);
+    m_pConversionBuffer = SampleUtil::alloc(MAX_BUFFER_LEN);
+    m_bPassthroughIsActive = false;
+    m_bPassthroughWasActive = false;
+
+    // Set up passthrough toggle button
+    connect(m_pPassing, SIGNAL(valueChanged(double)),
+            this, SLOT(slotPassingToggle(double)),
+            Qt::DirectConnection);
+
+    // Set up additional engines
     m_pPregain = new EnginePregain(group);
     m_pFilter = new EngineFilterBlock(group);
     m_pFlanger = new EngineFlanger(group);
@@ -41,6 +60,9 @@
 }
 
 EngineDeck::~EngineDeck() {
+    SampleUtil::free(m_pConversionBuffer);
+    delete m_pPassing;
+
     delete m_pBuffer;
     delete m_pClipping;
     delete m_pFilter;
@@ -50,11 +72,40 @@
     delete m_pVUMeter;
 }
 
-void EngineDeck::process(const CSAMPLE*, const CSAMPLE * pOut, const int iBufferSize) {
-    // Process the raw audio
-    m_pBuffer->process(0, pOut, iBufferSize);
-    // Emulate vinyl sounds
-    m_pVinylSoundEmu->process(pOut, pOut, iBufferSize);
+void EngineDeck::process(const CSAMPLE*, const CSAMPLE * pOutput, const int iBufferSize) {
+
+    CSAMPLE* pOut = const_cast<CSAMPLE*>(pOutput);
+
+    // Feed the incoming audio through if passthrough is active
+    if (isPassthroughActive()) {
+        int samplesRead = m_sampleBuffer.read(pOut, iBufferSize);
+        if (samplesRead < iBufferSize) {
+            // Buffer underflow. There aren't getting samples fast enough. This
+            // shouldn't happen since PortAudio should feed us samples just as fast
+            // as we consume them, right?
+            Q_ASSERT(false);
+        }
+
+        m_bPassthroughWasActive = true;
+
+    } else {
+
+        // If passthrough is no longer enabled, zero out the buffer
+        if (m_bPassthroughWasActive) {
+            SampleUtil::applyGain(pOut, 0.0, iBufferSize);
+            m_sampleBuffer.skip(iBufferSize);
+            m_bPassthroughWasActive = false;
+            return;
+        }
+
+        // Process the raw audio
+        m_pBuffer->process(0, pOut, iBufferSize);
+        // Emulate vinyl sounds
+        m_pVinylSoundEmu->process(pOut, pOut, iBufferSize);
+
+        m_bPassthroughWasActive = false;
+    }
+
     // Apply pregain
     m_pPregain->process(pOut, pOut, iBufferSize);
     // Filter the channel with EQs
@@ -72,5 +123,79 @@
 }
 
 bool EngineDeck::isActive() {
-    return m_pBuffer->isTrackLoaded();
-}
+    if (m_bPassthroughWasActive && !m_bPassthroughIsActive) {
+        return true;
+    }
+
+    return (m_pBuffer->isTrackLoaded() || isPassthroughActive());
+}
+
+void EngineDeck::receiveBuffer(AudioInput input, const short* pBuffer, unsigned int nFrames) {
+
+    // Skip receiving audio input if passthrough is not active
+    if (!m_bPassthroughIsActive) {
+        return;
+    }
+
+    if (input.getType() != AudioPath::VINYLCONTROL) {
+        // This is an error!
+        qDebug() << "WARNING: EngineDeck receieved an AudioInput for a non-vinylcontrol type!";
+        return;
+    }
+
+    // Use the conversion buffer to both convert from short and double into
+    // stereo.
+
+    // Check that the number of mono samples doesn't exceed MAX_BUFFER_LEN/2
+    // because thats our conversion buffer size.
+    if (nFrames > MAX_BUFFER_LEN / 2) {
+        qDebug() << "WARNING: Dropping passthrough samples because the input buffer is too large.";
+        nFrames = MAX_BUFFER_LEN / 2;
+    }
+
+    // There isn't a suitable SampleUtil method that can do mono->stereo and
+    // short->float in one pass.
+    // SampleUtil::convert(m_pConversionBuffer, pBuffer, iNumSamples);
+    SampleUtil::convert(m_pConversionBuffer, pBuffer, nFrames*2);
+
+    // TODO(rryan) (or bkgood?) do we need to verify the input is the one we asked for? Oh well.
+    unsigned int samplesWritten = m_sampleBuffer.write(m_pConversionBuffer, nFrames*2);
+    if (samplesWritten < nFrames*2) {
+        // Buffer overflow. We aren't processing samples fast enough. This
+        // shouldn't happen since the deck spits out samples just as fast as they
+        // come in, right?
+   	Q_ASSERT(false);
+    }
+}
+
+void EngineDeck::onInputConnected(AudioInput input) {
+    if (input.getType() != AudioPath::VINYLCONTROL) {
+        // This is an error!
+        qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
+        return;
+    }
+    m_sampleBuffer.clear();
+}
+
+void EngineDeck::onInputDisconnected(AudioInput input) {
+    if (input.getType() != AudioPath::VINYLCONTROL) {
+        // This is an error!
+        qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
+        return;
+    }
+    m_sampleBuffer.clear();
+}
+
+bool EngineDeck::isPassthroughActive() {
+    return (m_bPassthroughIsActive && !m_sampleBuffer.isEmpty());
+}
+
+void EngineDeck::slotPassingToggle(double v) {
+    if (v > 0) {
+        m_bPassthroughIsActive = true;
+    }
+    else {
+        m_bPassthroughIsActive = false;
+    }
+}
+

=== modified file 'mixxx/src/engine/enginedeck.h'
--- mixxx/src/engine/enginedeck.h	2011-04-01 04:51:24 +0000
+++ mixxx/src/engine/enginedeck.h	2012-10-22 14:36:20 +0000
@@ -18,10 +18,14 @@
 #ifndef ENGINEDECK_H
 #define ENGINEDECK_H
 
+#include "circularbuffer.h"
+#include "controlpushbutton.h"
 #include "engine/engineobject.h"
 #include "engine/enginechannel.h"
 #include "configobject.h"
 
+#include "soundmanagerutil.h"
+
 class EngineBuffer;
 class EnginePregain;
 class EngineBuffer;
@@ -32,19 +36,40 @@
 class EngineVinylSoundEmu;
 class ControlPushButton;
 
-class EngineDeck : public EngineChannel {
+class EngineDeck : public EngineChannel, public AudioDestination {
     Q_OBJECT
   public:
     EngineDeck(const char *group, ConfigObject<ConfigValue>* pConfig,
                EngineChannel::ChannelOrientation defaultOrientation = CENTER);
     virtual ~EngineDeck();
 
-    virtual void process(const CSAMPLE *pIn, const CSAMPLE *pOut, const int iBufferSize);
+    virtual void process(const CSAMPLE *pInput, const CSAMPLE *pOutput, const int iBufferSize);
 
     // TODO(XXX) This hack needs to be removed.
     virtual EngineBuffer* getEngineBuffer();
 
     virtual bool isActive();
+
+    // Begin vinyl passthrough methods
+
+    // This is called by SoundManager whenever there are new samples from the
+    // deck to be processed
+    virtual void receiveBuffer(AudioInput input, const short *pBuffer, unsigned int nFrames);
+
+    // Called by SoundManager whenever the passthrough input is connected to a
+    // soundcard input.
+    virtual void onInputConnected(AudioInput input);
+
+    // Called by SoundManager whenever the passthrough input is disconnected from
+    // a soundcard input.
+    virtual void onInputDisconnected(AudioInput input);
+
+    // Return whether or not passthrough is active
+    bool isPassthroughActive();
+
+  public slots:
+    void slotPassingToggle(double v);
+
   private:
     ConfigObject<ConfigValue>* m_pConfig;
     EngineBuffer* m_pBuffer;
@@ -54,6 +79,13 @@
     EnginePregain* m_pPregain;
     EngineVinylSoundEmu* m_pVinylSoundEmu;
     EngineVuMeter* m_pVUMeter;
+
+    // Begin vinyl passthrough fields
+    ControlPushButton* m_pPassing;
+    CSAMPLE* m_pConversionBuffer;
+    CircularBuffer<CSAMPLE> m_sampleBuffer;
+    bool m_bPassthroughIsActive;
+    bool m_bPassthroughWasActive;
 };
 
 #endif

=== modified file 'mixxx/src/engine/enginemaster.cpp'
--- mixxx/src/engine/enginemaster.cpp	2012-09-23 20:26:44 +0000
+++ mixxx/src/engine/enginemaster.cpp	2012-10-22 14:36:20 +0000
@@ -203,6 +203,8 @@
         }
     }
 
+    // qDebug() << "Total active channels: " << totalActive;
+
     if (totalActive == 0) {
         SampleUtil::applyGain(pOutput, 0.0f, iBufferSize);
     } else if (totalActive == 1) {

=== removed file 'mixxx/src/engine/enginepassthrough.h'
--- mixxx/src/engine/enginepassthrough.h	2011-04-08 08:27:29 +0000
+++ mixxx/src/engine/enginepassthrough.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-// enginepassthrough.h
-// created 4/8/2011 by Bill Good ([e-mail])
-// unapologetically copied from enginemicrophone.h from RJ
-
-#ifndef ENGINEPASSTHROUGH_H
-#define ENGINEPASSTHROUGH_H
-
-#include "circularbuffer.h"
-#include "controlpushbutton.h"
-#include "engine/enginechannel.h"
-#include "engine/engineclipping.h"
-#include "engine/enginevumeter.h"
-#include "soundmanagerutil.h"
-
-// EnginePassthrough is an EngineChannel that implements a mixing source whose
-// samples are fed directly from the SoundManager
-class EnginePassthrough : public EngineChannel, public AudioDestination {
-    Q_OBJECT
-  public:
-    EnginePassthrough(const char *pGroup);
-    virtual ~EnginePassthrough();
-
-    bool isActive();
-    bool isPFL();
-    bool isMaster();
-
-    // Called by EngineMaster whenever is requesting a new buffer of audio.
-    virtual void process(const CSAMPLE *pInput, const CSAMPLE *pOutput, const int iBufferSize);
-
-    // This is called by SoundManager whenever there are new samples from the
-    // deck to be processed
-    virtual void receiveBuffer(AudioInput input, const short *pBuffer, unsigned int nFrames);
-
-    // Called by SoundManager whenever the passthrough input is connected to a
-    // soundcard input.
-    virtual void onInputConnected(AudioInput input);
-
-    // Called by SoundManager whenever the passthrough input is disconnected from
-    // a soundcard input.
-    virtual void onInputDisconnected(AudioInput input);
-
-  private:
-    EngineClipping m_clipping;
-    EngineVuMeter m_vuMeter;
-    ControlObject *m_pEnabled;
-    ControlPushButton *m_pPassing;
-    CSAMPLE *m_pConversionBuffer;
-    CircularBuffer<CSAMPLE> m_sampleBuffer;
-};
-
-#endif /* ENGINEPASSTHROUGH_H */

=== modified file 'mixxx/src/engine/enginepregain.cpp'
--- mixxx/src/engine/enginepregain.cpp	2012-08-10 23:57:22 +0000
+++ mixxx/src/engine/enginepregain.cpp	2012-10-22 14:36:20 +0000
@@ -38,6 +38,7 @@
     //Replay Gain things
     m_pControlReplayGain = new ControlObject(ConfigKey(group, "replaygain"));
     m_pTotalGain = new ControlObject(ConfigKey(group, "total_gain"));
+    m_pPassthroughEnabled = ControlObject::getControl(ConfigKey(group, "passthrough_enabled"));
 
     if (s_pReplayGainBoost == NULL) {
         s_pReplayGainBoost = new ControlPotmeter(ConfigKey("[ReplayGain]", "InitialReplayGainBoost"),0., 15.);
@@ -72,58 +73,53 @@
     float fGain = potmeterPregain->get();
     float fReplayGain = m_pControlReplayGain->get();
     m_fReplayGainCorrection=1;
+    float fPassing = m_pPassthroughEnabled->get();
     // TODO(XXX) Why do we do this? Removing it results in clipping at unity
     // gain so I think it was trying to compensate for some issue when we added
     // replaygain but even at unity gain (no RG) we are clipping. rryan 5/2012
     fGain = fGain/2;
-    if(fReplayGain*fEnableReplayGain != 0)
-    {
+
+    // Override replaygain value if passing through
+    if (fPassing == 0.0) {
+        fReplayGain = 1.0;
+    }
+
+    else if (fReplayGain*fEnableReplayGain != 0) {
         // Here is the point, when ReplayGain Analyser takes its action, suggested gain changes from 0 to a nonzero value
         // We want to smoothly fade to this last.
         // Anyway we have some the problem that code cannot block the full process for one second.
         // So we need to alter gain each time ::process is called.
+        if (m_bSmoothFade) { // This means that a ReplayGain value has been calculated after the track has been loaded
 
-        if(m_bSmoothFade)//This means that a ReplayGain value has been calculated after the track has been loaded
-        {
-            if(m_fClock==0)
+            if (m_fClock==0) {
                 m_fClock=clock();
+            }
             m_fSumClock += (float)((clock()-m_fClock)/CLOCKS_PER_SEC);
             m_fClock=clock();
-            if(m_fSumClock<1)
-            {
+            if (m_fSumClock<1) {
                 //Fade smoothly
-
                 m_fReplayGainCorrection=(1-m_fSumClock)+(m_fSumClock)*fReplayGain*pow(10, fReplayGainBoost/20);
-
             }
-            else
-            {
+            else {
                 m_bSmoothFade = false;
             }
         }
-        else
-        {
+        else {
             //Passing a user defined boost
             m_fReplayGainCorrection=fReplayGain*pow(10, fReplayGainBoost/20);
         }
     }
-    else
-    {
+    else {
         // If track has not ReplayGain value and ReplayGain is enabled
         // we prepare for smoothfading to ReplayGain suggested gain
-        if(fEnableReplayGain != 0)
-        {
+        if(fEnableReplayGain != 0) {
             m_bSmoothFade=true;
             m_fClock=0;
             m_fSumClock=0;
         }
     }
 
-    // Clamp gain to within [0, 10.0] to prevent insane gains. This can happen
-    // (some corrupt files get really high replay gain values).
-    // 10 allows a maximum replay Gain Boost * calculated replay gain of ~2
-    fGain = fGain * math_max(0.0, math_min(10.0, m_fReplayGainCorrection));
-
+    fGain = fGain*m_fReplayGainCorrection;
     m_pTotalGain->set(fGain);
 
     //qDebug()<<"Clock"<<(float)clock()/CLOCKS_PER_SEC;

=== modified file 'mixxx/src/engine/enginepregain.h'
--- mixxx/src/engine/enginepregain.h	2012-07-22 09:31:52 +0000
+++ mixxx/src/engine/enginepregain.h	2012-10-22 14:36:20 +0000
@@ -35,7 +35,8 @@
 private:
     ControlLogpotmeter *potmeterPregain;
     ControlObject *m_pTotalGain;
-    ControlObject *m_pControlReplayGain;
+    ControlObject* m_pControlReplayGain;
+    ControlObject* m_pPassthroughEnabled;
     static ControlPotmeter *s_pReplayGainBoost;
     static ControlObject *s_pEnableReplayGain;
     float m_fReplayGainCorrection, m_fReplayGain, m_fOldReplayGainCorrection;

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2012-10-09 20:07:04 +0000
+++ mixxx/src/mixxx.cpp	2012-10-22 14:36:20 +0000
@@ -26,10 +26,12 @@
 #include "build.h" // Generated by SCons
 #include "controlobjectthreadmain.h"
 #include "controlpotmeter.h"
+#include "deck.h"
 #include "defs_urls.h"
 #include "defs_version.h"
 #include "dlgabout.h"
 #include "dlgpreferences.h"
+#include "engine/enginedeck.h"
 #include "engine/enginemaster.h"
 #include "engine/enginemicrophone.h"
 #include "library/library.h"
@@ -309,10 +311,21 @@
 
     // Create the player manager.
     m_pPlayerManager = new PlayerManager(m_pConfig, m_pEngine, m_pLibrary);
-    m_pPlayerManager->addDeck();
-    m_pPlayerManager->addDeck();
-    m_pPlayerManager->addDeck();
-    m_pPlayerManager->addDeck();
+
+    // Set up four decks for with the player manager
+    for (unsigned int deck = 0; deck < 4; ++deck) {
+
+        // Add deck to the player manager
+        Deck* pDeck = m_pPlayerManager->addDeck();
+
+#ifdef __VINYLCONTROL__
+        EngineDeck* pEngineDeck = pDeck->getEngineDeck();
+        // Register vinyl input signal with deck for passthrough
+        m_pSoundManager->registerInput(AudioInput(AudioInput::VINYLCONTROL, 0, deck), pEngineDeck);
+#endif
+
+    }
+
     m_pPlayerManager->addSampler();
     m_pPlayerManager->addSampler();
     m_pPlayerManager->addSampler();

=== modified file 'mixxx/src/soundmanager.cpp'
--- mixxx/src/soundmanager.cpp	2012-10-06 00:31:03 +0000
+++ mixxx/src/soundmanager.cpp	2012-10-22 14:36:20 +0000
@@ -177,7 +177,11 @@
         // Need to tell all registered AudioDestinations for this AudioInput
         // that the input was disconnected.
         if (m_registeredDestinations.contains(in)) {
-            m_registeredDestinations[in]->onInputDisconnected(in);
+            QList<AudioDestination*> destList = m_registeredDestinations.values(in);
+            AudioDestination* dest;
+            foreach(dest, destList) {
+                        dest->onInputDisconnected(in);
+            }
         }
 
         short *buffer = m_inputBuffers[in];
@@ -323,7 +327,11 @@
             // Check if any AudioDestination is registered for this AudioInput,
             // and call the onInputConnected method.
             if (m_registeredDestinations.contains(in)) {
-                m_registeredDestinations[in]->onInputConnected(in);
+                QList<AudioDestination*> destList = m_registeredDestinations.values(in);
+                AudioDestination* dest;
+                foreach(dest, destList) {
+                    dest->onInputConnected(in);
+                }
             }
         }
         foreach (AudioOutput out, m_config.getOutputs().values(device->getInternalName())) {
@@ -588,9 +596,12 @@
             short* pInputBuffer = m_inputBuffers[in];
 
             if (m_registeredDestinations.contains(in)) {
-                AudioDestination* destination = m_registeredDestinations[in];
-                if (destination) {
-                    destination->receiveBuffer(in, pInputBuffer, iFramesPerBuffer);
+                QList<AudioDestination*> destList = m_registeredDestinations.values(in);
+                AudioDestination* dest;
+                foreach(dest, destList) {
+                    if(dest) {
+                        dest->receiveBuffer(in, pInputBuffer, iFramesPerBuffer);
+                    }
                 }
             }
         }
@@ -613,7 +624,9 @@
         // AudioInput to be going to a different AudioDest -bkgood
         qDebug() << "WARNING: AudioInput already registered!";
     }
-    m_registeredDestinations[input] = dest;
+
+    m_registeredDestinations.insertMulti(input, dest);
+
     emit(inputRegistered(input, dest));
 }