Merge lp:~mixxxdevelopers/mixxx/features_vcman into lp:~mixxxdevelopers/mixxx/trunk

[William Good]

Branch:
* Moves all the vinyl control code to src/vinylcontrol/
* Moves all the vinyl control code from SoundManager to new VinylControlManager
* Sets VinylControlManager as the designated recipient of vinyl control samples from SoundManager

Features:
* Vinyl control prefs can now be applied without rebooting the portaudio callback (not a particularly useful feature but nice to keep unrelated things uncoupled)
* SoundManager now 100% unaware of vinyl control, as it ought to be.
* More stuff here I'm probably not thinking of

Bugs (???):
* The ordering in the sound prefs under the input tab is weird on my machine (order: VC1, mic, VC2). This is due to some weird Qt signal ordering, because the add-audiodest-to-prefs code is run before the event loop starts, we're at qt's mercy when it comes to spitting out signals in the same order it receives them (and it doesn't). I'll worry about this in trunk since that's where the bug (if you can call it that) is, I'll probably just do some intelligent sorting in DlgPrefSound.
* Regressions??? I've tested messing with config, single deck vinyl, both-deck vinyl. I think it's good, but testers are always great.

Please excuse any glaring errors, brain is a bit numb and eyes are a bit tired.

[lp:~mixxxdevelopers/mixxx/features_vcman]

2655. By William Good on 2011-04-17

Merge with lp:mixxx

[RJ Skerry-Ryan (rryan)]

Hey Bill,

Looking good -- here are my comments:

* In VinylControlManager, it's a little sketchy to me that SoundManager is passed in and that it's used to scan through its list of enabled inputs -- seems like VCManager shouldn't know those details of SoundManager. Would it be possible to determine which VC decks were enabled by just keeping track of onInputConnect/onInputDisconnect calls? Also naming the parameter 'deck' is a little misleading since one turntable can control multiple decks (or will in the future?) Since you're checking for a matching AudioInput index, doesn't this just test whether the N'th VC input is enabled? Anyway I would just replace this with a QSet<AudioInput> that you add to onInputConnect and remove from onInputDisconnect, that way you can just make this test whether an appropriate AudioInput is in the set.

* I don't think I understand how QSemaphore protects m_proxies in this case. QList is not thread safe so two threads should never access it at once -- this includes using QList::at, so all accesses to the list should be guarded by a monolithic QMutex (yea .. it sucks). I would use a QMutex and then make sure to unlock it the second you get the VCProxy that you need from the list (or in the case of creating the VC proxy, create it, then lock and insert it and unlock).

Otherwise everything seems fine to me -- we should have someone test it out first to verify that it actually works ;)

review: Needs Fixing

[lp:~mixxxdevelopers/mixxx/features_vcman]

2656. By William Good on 2011-04-17

Delete vcmanager before the engine to prevent a segfault on deref of a CO on exit

2657. By William Good on 2011-04-17

Move the vinyl control proxies to an array-based QVector (should be faster? also more in line with how I was using the data structure anyway)

2658. By William Good on 2011-04-17

Remove SoundManager usage from VinylControlManager

[William Good (bkgood)]

> * In VinylControlManager, it's a little sketchy to me that SoundManager is
> passed in and that it's used to scan through its list of enabled inputs --
> seems like VCManager shouldn't know those details of SoundManager. Would
> it be possible to determine which VC decks were enabled by just keeping
> track of onInputConnect/onInputDisconnect calls?

Fixed... ended up being way simpler once I wasn't just doing a straight copy+paste from the old code.

> Also naming the parameter
> 'deck' is a little misleading since one turntable can control multiple
> decks (or will in the future?) Since you're checking for a matching
> AudioInput index, doesn't this just test whether the N'th VC input is
> enabled?

The 'deck' parameter actually refers to the deck which the vinyl control input is to control (so deck=1 refers to [Channel1] stuff), so aside from perhaps misguided naming, I think this is correct. But yes, this just makes life easier (saves some code duplication) for some GUI code in mixxx.cpp.

> * I don't think I understand how QSemaphore protects m_proxies in this
> case. QList is not thread safe so two threads should never access it at
> once -- this includes using QList::at, so all accesses to the list should
> be guarded by a monolithic QMutex (yea .. it sucks). I would use a QMutex
> and then make sure to unlock it the second you get the VCProxy that you
> need from the list (or in the case of creating the VC proxy, create it,
> then lock and insert it and unlock).
>

Is QList::at (now QVector::at) really not save to call concurrently? I had a look at the Qt source and it looks like a totally safe operation (immediately, ::at is const so state isn't being modified). The only case I could think of in which this would be a problem is if the list was being modified while ::at was called, which was how I came to the semaphore use: any number of callback threads (which will never be greater than the number of vinyl control objects) can call receiveBuffer and submit samples, but writing requires a total lockout of all list readers so I acquire all of the semaphore's 'resources' (and block until I do) before doing any modification. As I only allocate memory for the vector once and simply replace elements afterwards, I'm wondering if I could just make a mutex for each individual vector slot and use that to keep from replacing a pointer while I'm reading it in another thread.

[RJ Skerry-Ryan (rryan)]

Some minor fixes below but looks good to me.

> Is QList::at (now QVector::at) really not save to call concurrently?

Basically, no none of them are. The Qt docs don't claim they are thread safe at all. While you're right, the many-reader case will generally not cause issues since it doesn't update state we don't have guarantees that the list/vector isn't being grown/shrunk when we do something to it.

You're assuming that m_proxies never changes. Things like m_proxies.size() aren't ok to call without a lock protecting the entire list if the size of that list changes. Today it's a safe assumption that m_proxies never changes, so they should happen to work fine, but in the future we might change things and forget to update the locking strategy for m_proxies. I would switch to using a QReadWriteLock just to be safe.. it allows many readers concurrently but locks them out when someone is locking it for writing.

- In mixxx.cpp the else block sets m_pVCManager to NULL, but this variable doesn't exist if VINYLCONTROL isn't defined.

Today we don't really support updating the # of decks on the fly and there are only as many spots for proxies as there are physical decks. I'm a little wary of passing in the number of decks a fixed value that doesn't change because this will be a pain later when potentially we let you add decks to Mixxx on the fly, or when the skin can specify how many decks it's made for, etc. etc. What I mean is that it isn't un-imaginable that the number of decks could change on the fly. We can fix this when we n-deck'ify vinyl control though.

review: Approve

[lp:~mixxxdevelopers/mixxx/features_vcman]

2659. By William Good on 2011-04-18

Move fun semaphore locking to QReadWriteLock

2660. By William Good on 2011-04-18

Always declare VinylControlManager instance in MixxxApp

2661. By William Good on 2011-04-18

Don't hardcode VinylControlManager to a set number of VinylControlProxies, allow arbitrary number.

[William Good (bkgood)]

> You're assuming that m_proxies never changes. Things like m_proxies.size()
> aren't ok to call without a lock protecting the entire list if the size of
> that list changes. Today it's a safe assumption that m_proxies never changes,
> so they should happen to work fine, but in the future we might change things
> and forget to update the locking strategy for m_proxies. I would switch to
> using a QReadWriteLock just to be safe.. it allows many readers concurrently
> but locks them out when someone is locking it for writing.
>

Indeed, I wrote my locking strategy under the assumptions of how I wrote the code today and not how it might be modified in a year, but I don't guess I see this as making it particularly wrong -- but QReadWriteLock does everything I want, and that's the more obvious approach anyway.

> - In mixxx.cpp the else block sets m_pVCManager to NULL, but this variable
> doesn't exist if VINYLCONTROL isn't defined.
>
Good catch, I have to have it declared as it's passed to the DlgPreferences ctor (which is why it's NULLed) but I think I discovered this after I wrote the VinylControlManager instance into mixxx.h.

> Today we don't really support updating the # of decks on the fly and there are
> only as many spots for proxies as there are physical decks. I'm a little wary
> of passing in the number of decks a fixed value that doesn't change because
> this will be a pain later when potentially we let you add decks to Mixxx on
> the fly, or when the skin can specify how many decks it's made for, etc. etc.
> What I mean is that it isn't un-imaginable that the number of decks could
> change on the fly. We can fix this when we n-deck'ify vinyl control though.

VinylControlManager will now create a VinylControlProxy for whatever index it receives, from 0 to 255 (and why _not_ support 256 decks, VDJ has 99...). I didn't bother to mess with the big config-load/save blocks, those will have to be fixed (i.e. generalized and iterated-over) for n-decks.

Let me know about these changes and I'll merge into trunk if I still get the thumbs-up, thanks for looking at it! fyi, I've tested using a couple of instances of mixxx and crazy jack routing so I'm fairly confident in its correctness, at least in the cases I tested it.

[RJ Skerry-Ryan (rryan)]

LGTM

review: Approve

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2011-04-17 02:42:45 +0000
+++ mixxx/build/features.py	2011-04-18 08:02:27 +0000
@@ -287,12 +287,13 @@
         build.env.Append(CPPPATH='#lib/scratchlib')
 
     def sources(self, build):
-        sources = ['vinylcontrol.cpp',
-                   'vinylcontrolproxy.cpp',
-                   'vinylcontrolxwax.cpp',
+        sources = ['vinylcontrol/vinylcontrol.cpp',
+                   'vinylcontrol/vinylcontrolproxy.cpp',
+                   'vinylcontrol/vinylcontrolxwax.cpp',
                    'dlgprefvinyl.cpp',
-                   'vinylcontrolsignalwidget.cpp',
-                   'engine/vinylcontrolcontrol.cpp']
+                   'vinylcontrol/vinylcontrolsignalwidget.cpp',
+                   'vinylcontrol/vinylcontrolmanager.cpp',
+                   'engine/vinylcontrolcontrol.cpp',]
         if build.platform_is_windows:
             sources.append("#lib/xwax/timecoder_win32.cpp")
             sources.append("#lib/xwax/lut.cpp")

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2011-04-16 20:03:36 +0000
+++ mixxx/src/dlgpreferences.cpp	2011-04-18 08:02:27 +0000
@@ -50,7 +50,8 @@
 
 DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
                                SoundManager * soundman, PlayerManager* pPlayerManager,
-                               MidiDeviceManager * midi, ConfigObject<ConfigValue> * _config)
+                               MidiDeviceManager * midi, VinylControlManager *pVCManager,
+                               ConfigObject<ConfigValue> * _config)
         :  QDialog(), Ui::DlgPreferencesDlg() {
     m_pMixxx = mixxx;
     m_pMidiDeviceManager = midi;
@@ -76,7 +77,7 @@
     wreplaygain = new DlgPrefReplayGain(this, config);
     wrecord = new DlgPrefRecord(this, config);
 #ifdef __VINYLCONTROL__
-    wvinylcontrol = new DlgPrefVinyl(this, soundman, config);
+    wvinylcontrol = new DlgPrefVinyl(this, pVCManager, config);
 #else
     wnovinylcontrol = new DlgPrefNoVinyl(this, soundman, config);
 #endif
@@ -139,8 +140,6 @@
 #endif
 
 #ifdef __VINYLCONTROL__
-    connect(wvinylcontrol, SIGNAL(refreshVCProxies()), wsound, SLOT(forceApply()));
-    connect(wvinylcontrol, SIGNAL(applySound()), wsound, SLOT(slotApply()));
     connect(buttonBox, SIGNAL(accepted()), wvinylcontrol,    SLOT(slotApply())); //It's important for this to be before the
                                                                                  //connect for wsound...
 #endif

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2011-04-16 20:03:36 +0000
+++ mixxx/src/dlgpreferences.h	2011-04-18 08:02:27 +0000
@@ -49,6 +49,7 @@
 class MidiDeviceManager;
 class SkinLoader;
 class PlayerManager;
+class VinylControlManager;
 
 /**
   *@author Tue & Ken Haste Andersen
@@ -60,7 +61,7 @@
 public:
     DlgPreferences(MixxxApp *mixxx, SkinLoader* pSkinLoader, SoundManager *soundman,
                    PlayerManager* pPlayerManager, MidiDeviceManager* midi,
-                   ConfigObject<ConfigValue> *config);
+                   VinylControlManager *pVCManager, ConfigObject<ConfigValue> *config);
 
     ~DlgPreferences();
     void createIcons();

=== modified file 'mixxx/src/dlgprefsound.cpp'
--- mixxx/src/dlgprefsound.cpp	2011-04-15 07:08:16 +0000
+++ mixxx/src/dlgprefsound.cpp	2011-04-18 08:02:27 +0000
@@ -117,22 +117,6 @@
     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("[Channel1]", "vinylcontrol_vinyl_type"))
-            == MIXXX_VINYL_FINALSCRATCH  ||
-            m_pConfig->getValueString(ConfigKey("[Channel2]", "vinylcontrol_vinyl_type"))
-            == 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();

=== modified file 'mixxx/src/dlgprefvinyl.cpp'
--- mixxx/src/dlgprefvinyl.cpp	2011-04-16 20:15:25 +0000
+++ mixxx/src/dlgprefvinyl.cpp	2011-04-18 08:02:27 +0000
@@ -23,19 +23,17 @@
 #include <QtGui>
 #include "dlgprefvinyl.h"
 #include "controlobject.h"
-#include "soundmanager.h"
-#include "vinylcontrol.h" //For vinyl type string constants
+#include "vinylcontrol/vinylcontrolmanager.h"
+#include "vinylcontrol/vinylcontrol.h" //For vinyl type string constants
 #include "controlobjectthreadmain.h"
-#include "vinylcontrolsignalwidget.h"
 #include "dlgprefvinyl.h"
 
-DlgPrefVinyl::DlgPrefVinyl(QWidget * parent, SoundManager * soundman,
+DlgPrefVinyl::DlgPrefVinyl(QWidget * parent, VinylControlManager *pVCMan,
                            ConfigObject<ConfigValue> * _config) : QWidget(parent), Ui::DlgPrefVinylDlg(),
     m_COTMode(ControlObject::getControl(ConfigKey("[VinylControl]", "mode")))
 {
-    m_pSoundManager = soundman;
+    m_pVCManager = pVCMan;
     config = _config;
-    m_dontForce = false;
 
     setupUi(this);
 
@@ -75,17 +73,6 @@
     connect(applyButton, SIGNAL(clicked()), this, SLOT(slotApply()));
     connect(VinylGain, SIGNAL(sliderReleased()), this, SLOT(VinylGainSlotApply()));
     //connect(ComboBoxDeviceDeck1, SIGNAL(currentIndexChanged()), this, SLOT(()));
-
-    connect(VinylGain, SIGNAL(sliderReleased()), this, SLOT(settingsChanged()));
-    connect(ComboBoxVinylType1, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
-    connect(ComboBoxVinylType2, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
-    connect(ComboBoxVinylSpeed1, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
-    connect(ComboBoxVinylSpeed2, SIGNAL(currentIndexChanged(int)), this, SLOT(settingsChanged()));
-    connect(LeadinTime, SIGNAL(textChanged(const QString&)), this, SLOT(settingsChanged()));
-    connect(NeedleSkipEnable, SIGNAL(stateChanged(int)), this, SLOT(settingsChanged()));
-    connect(AbsoluteMode, SIGNAL(toggled(bool)), this, SLOT(settingsChanged()));
-    connect(RelativeMode, SIGNAL(toggled(bool)), this, SLOT(settingsChanged()));
-    connect(m_pSoundManager, SIGNAL(devicesSetup()), this, SLOT(settingsChanged()));
 }
 
 DlgPrefVinyl::~DlgPrefVinyl()
@@ -95,7 +82,7 @@
 /** @brief Performs any necessary actions that need to happen when the prefs dialog is opened */
 void DlgPrefVinyl::slotShow()
 {
-    QList<VinylControlProxy*> VCProxiesList = m_pSoundManager->getVinylControlProxies();
+    QList<VinylControlProxy*> VCProxiesList = m_pVCManager->vinylControlProxies();
     if (VCProxiesList.value(0) != NULL)
         m_signalWidget1.setVinylControlProxy(VCProxiesList.value(0));
     if (VCProxiesList.value(1) != NULL)
@@ -119,8 +106,6 @@
 
 void DlgPrefVinyl::slotUpdate()
 {
-    m_dontForce = true; // otherwise all the signals fired in here will cause
-                        // DlgPrefSound to call setupDevices needlessly :) -- bkgood
     // Set vinyl control types in the comboboxes
     int combo_index = ComboBoxVinylType1->findText(config->getValueString(ConfigKey("[Channel1]","vinylcontrol_vinyl_type")));
     if (combo_index != -1)
@@ -153,17 +138,26 @@
 
     //set vinyl control gain
     VinylGain->setValue( config->getValueString(ConfigKey("[VinylControl]","gain")).toInt());
-    m_dontForce = false;
+
+    QList<VinylControlProxy*> VCProxiesList = m_pVCManager->vinylControlProxies();
+    if (VCProxiesList.value(0) != NULL) {
+        m_signalWidget1.setVinylControlProxy(VCProxiesList.value(0));
+    }
+    if (VCProxiesList.value(1) != NULL) {
+        m_signalWidget2.setVinylControlProxy(VCProxiesList.value(1));
+    }
+
+    m_signalWidget1.setVinylActive(m_pVCManager->vinylInputEnabled(1));
+    m_signalWidget2.setVinylActive(m_pVCManager->vinylInputEnabled(2));
 }
 
 // Update the config object with parameters from dialog
 void DlgPrefVinyl::slotApply()
 {
-    QString device2;
     qDebug() << "DlgPrefVinyl::Apply";
 
     // Lead-in time
-    QString strLeadIn      = LeadinTime->text();
+    QString strLeadIn = LeadinTime->text();
     bool isInteger;
     strLeadIn.toInt(&isInteger);
     if (isInteger)
@@ -187,6 +181,7 @@
     config->set(ConfigKey("[VinylControl]","mode"), ConfigValue(iMode));
     config->set(ConfigKey("[VinylControl]","needle_skip_prevention" ), ConfigValue( (int)(NeedleSkipEnable->isChecked( )) ) );
 
+    m_pVCManager->reloadConfig();
     slotUpdate();
 }
 
@@ -201,7 +196,6 @@
     config->set(ConfigKey("[Channel2]","vinylcontrol_vinyl_type"), ConfigValue(ComboBoxVinylType2->currentText()));
     config->set(ConfigKey("[Channel1]","vinylcontrol_speed_type"), ConfigValue(ComboBoxVinylSpeed1->currentText()));
     config->set(ConfigKey("[Channel2]","vinylcontrol_speed_type"), ConfigValue(ComboBoxVinylSpeed2->currentText()));
-    emit(applySound());
 }
 
 void DlgPrefVinyl::VinylGainSlotApply()
@@ -214,20 +208,3 @@
     ControlObject* pControlObjectVinylControlGain = ControlObject::getControl(ConfigKey("[VinylControl]", "gain"));
     pControlObjectVinylControlGain->set(VinylGain->value());
 }
-
-void DlgPrefVinyl::settingsChanged() {
-    if (!m_dontForce) {
-        emit(refreshVCProxies());
-    }
-
-    QList<VinylControlProxy*> VCProxiesList = m_pSoundManager->getVinylControlProxies();
-    if (VCProxiesList.value(0) != NULL) {
-        m_signalWidget1.setVinylControlProxy(VCProxiesList.value(0));
-    }
-    if (VCProxiesList.value(1) != NULL) {
-        m_signalWidget2.setVinylControlProxy(VCProxiesList.value(1));
-    }
-
-    m_signalWidget1.setVinylActive(m_pSoundManager->hasVinylInput(0));
-    m_signalWidget2.setVinylActive(m_pSoundManager->hasVinylInput(1));
-}

=== modified file 'mixxx/src/dlgprefvinyl.h'
--- mixxx/src/dlgprefvinyl.h	2011-04-16 20:15:56 +0000
+++ mixxx/src/dlgprefvinyl.h	2011-04-18 08:02:27 +0000
@@ -20,14 +20,14 @@
 
 #include "ui_dlgprefvinyldlg.h"
 #include "configobject.h"
-#include "vinylcontrolsignalwidget.h"
+#include "vinylcontrol/vinylcontrolsignalwidget.h"
 #include "controlobjectthread.h"
 
 class QWidget;
 class PlayerProxy;
 class ControlObject;
 class ControlObjectThreadMain;
-class SoundManager;
+class VinylControlManager;
 
 /**
   *@author Stefan Langhammer
@@ -37,7 +37,7 @@
 class DlgPrefVinyl : public QWidget, Ui::DlgPrefVinylDlg  {
     Q_OBJECT
 public:
-    DlgPrefVinyl(QWidget *parent, SoundManager* soundman, ConfigObject<ConfigValue> *_config);
+    DlgPrefVinyl(QWidget *pParent, VinylControlManager *m_pVCMan, ConfigObject<ConfigValue> *_config);
     ~DlgPrefVinyl();
 
 public slots:
@@ -51,11 +51,6 @@
     void slotShow();
 
 signals:
-    void apply();
-    void refreshVCProxies();
-    void applySound();
-private slots:
-    void settingsChanged();
 private:
     VinylControlSignalWidget m_signalWidget1;
     VinylControlSignalWidget m_signalWidget2;
@@ -63,7 +58,7 @@
 
     /** Pointer to player device */
     //PlayerProxy *player;
-    SoundManager* m_pSoundManager;
+    VinylControlManager* m_pVCManager;
     /** Pointer to config object */
     ConfigObject<ConfigValue> *config;
     /** Indicates the strength of the timecode signal on each input */
@@ -74,7 +69,6 @@
     ControlObjectThreadMain* m_vinylControlInput2L;
     ControlObjectThreadMain* m_vinylControlInput2R;
     ControlObjectThread m_COTMode;
-    bool m_dontForce;
 };
 
 #endif

=== modified file 'mixxx/src/engine/enginebuffer.cpp'
--- mixxx/src/engine/enginebuffer.cpp	2011-04-17 02:42:45 +0000
+++ mixxx/src/engine/enginebuffer.cpp	2011-04-18 08:02:27 +0000
@@ -754,9 +754,9 @@
     }
 
     // Update indicators that are only updated after every
-    // sampleRate/UPDATE_RATE samples processed.  (e.g. playposSlider,
+    // sampleRate/kiUpdateRate samples processed.  (e.g. playposSlider,
     // rateEngine)
-    if (m_iSamplesCalculated > (m_pSampleRate->get()/UPDATE_RATE)) {
+    if (m_iSamplesCalculated > (m_pSampleRate->get()/kiUpdateRate)) {
         playposSlider->set(fFractionalPlaypos);
 
         if(rate != rateEngine->get())

=== modified file 'mixxx/src/engine/enginebuffer.h'
--- mixxx/src/engine/enginebuffer.h	2011-04-17 02:42:45 +0000
+++ mixxx/src/engine/enginebuffer.h	2011-04-18 08:02:27 +0000
@@ -58,7 +58,7 @@
 const int kiTempLength = 200000;
 
 // Rate at which the playpos slider is updated (using a sample rate of 44100 Hz):
-const int UPDATE_RATE = 10;
+const int kiUpdateRate = 10;
 
 // End of track mode constants
 const int TRACK_END_MODE_STOP = 0;

=== modified file 'mixxx/src/engine/vinylcontrolcontrol.cpp'
--- mixxx/src/engine/vinylcontrolcontrol.cpp	2011-04-17 02:42:45 +0000
+++ mixxx/src/engine/vinylcontrolcontrol.cpp	2011-04-18 08:02:27 +0000
@@ -1,6 +1,6 @@
 #include "engine/vinylcontrolcontrol.h"
 
-#include "vinylcontrol.h"
+#include "vinylcontrol/vinylcontrol.h"
 #include "library/dao/cue.h"
 
 VinylControlControl::VinylControlControl(const char* pGroup, ConfigObject<ConfigValue>* pConfig)

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2011-04-16 19:50:10 +0000
+++ mixxx/src/mixxx.cpp	2011-04-18 08:02:27 +0000
@@ -64,6 +64,11 @@
 
 #include "defs_version.h"
 
+#ifdef __VINYLCONTROL__
+#include "vinylcontrol/vinylcontrol.h"
+#include "vinylcontrol/vinylcontrolmanager.h"
+#endif
+
 #ifdef __C_METRICS__
 #include <cmetrics.h>
 #include "defs_mixxxcmetrics.h"
@@ -315,6 +320,17 @@
             AudioOutput(AudioOutput::DECK, 0, deck), m_pEngine);
     }
 
+#ifdef __VINYLCONTROL__
+    m_pVCManager = new VinylControlManager(this, m_pConfig);
+    for (unsigned int deck = 0; deck < m_pPlayerManager->numDecks(); ++deck) {
+        m_pSoundManager->registerInput(
+            AudioInput(AudioInput::VINYLCONTROL, 0, deck),
+            m_pVCManager);
+    }
+#else
+    m_pVCManager = NULL;
+#endif
+
     //Scan the library directory.
     m_pLibraryScanner = new LibraryScanner(m_pLibrary->getTrackCollection());
 
@@ -372,16 +388,8 @@
         m_pConfig->set(ConfigKey("[BPM]", "AnalyzeEntireSong"),ConfigValue(1));
     }
 
-#ifdef __VINYLCONTROL__
     //ControlObject::getControl(ConfigKey("[Channel1]","TrackEndMode"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[Controls]","TrackEndModeCh1")).toDouble());
     //ControlObject::getControl(ConfigKey("[Channel2]","TrackEndMode"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[Controls]","TrackEndModeCh2")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_enabled"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","enabled_ch1")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_enabled"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","enabled_ch2")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_mode"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","mode")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_mode"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","mode")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_cueing"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","cueing_ch1")).toDouble());
-    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_cueing"))->queueFromThread(m_pConfig->getValueString(ConfigKey("[VinylControl]","cueing_ch2")).toDouble());
-#endif
 
     qRegisterMetaType<MidiMessage>("MidiMessage");
     qRegisterMetaType<MidiStatusByte>("MidiStatusByte");
@@ -394,7 +402,7 @@
 
     // Initialize preference dialog
     m_pPrefDlg = new DlgPreferences(this, m_pSkinLoader, m_pSoundManager, m_pPlayerManager,
-                                 m_pMidiDeviceManager, m_pConfig);
+                                 m_pMidiDeviceManager, m_pVCManager, m_pConfig);
     m_pPrefDlg->setHidden(true);
 
     // Try open player device If that fails, the preference panel is opened.
@@ -529,18 +537,18 @@
     // Save state of End of track controls in config database
     //m_pConfig->set(ConfigKey("[Controls]","TrackEndModeCh1"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel1]","TrackEndMode"))->get()));
     //m_pConfig->set(ConfigKey("[Controls]","TrackEndModeCh2"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel2]","TrackEndMode"))->get()));
-#ifdef __VINYLCONTROL__
-    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch1"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_enabled"))->get()));
-    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch2"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_enabled"))->get()));
-    m_pConfig->set(ConfigKey("[VinylControl]","mode"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_mode"))->get()));
-    m_pConfig->set(ConfigKey("[VinylControl]","mode"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_mode"))->get()));
-    m_pConfig->set(ConfigKey("[VinylControl]","cueing_ch1"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_cueing"))->get()));
-    m_pConfig->set(ConfigKey("[VinylControl]","cueing_ch2"), ConfigValue((int)ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_cueing"))->get()));
-#endif
+
     // SoundManager depend on Engine and Config
     qDebug() << "delete soundmanager, " << qTime.elapsed();
     delete m_pSoundManager;
 
+#ifdef __VINYLCONTROL__
+    // VinylControlManager depends on a CO the engine owns
+    // (vinylcontrol_enabled in VinylControlControl)
+    qDebug() << "delete vinylcontrolmanager, " << qTime.elapsed();
+    delete m_pVCManager;
+#endif
+
     // View depends on MixxxKeyboard, PlayerManager, Library
     qDebug() << "delete view, " << qTime.elapsed();
     delete m_pView;
@@ -1143,7 +1151,7 @@
 void MixxxApp::slotControlVinylControl(double toggle)
 {
 #ifdef __VINYLCONTROL__
-    if (tryToggleVinylControl(0)) {
+    if (m_pVCManager->vinylInputEnabled(1)) {
         m_pConfig->set(
             ConfigKey("[VinylControl]", "enabled_ch1"), ConfigValue((int)toggle));
         m_pOptionsVinylControl->setChecked((bool)toggle);
@@ -1180,18 +1188,11 @@
 #endif
 }
 
-int MixxxApp::tryToggleVinylControl(int deck)
-{
-#ifdef __VINYLCONTROL__
-    return m_pSoundManager->hasVinylInput(deck);
-#endif
-}
-
 void MixxxApp::slotControlVinylControl2(double toggle)
 {
 #ifdef __VINYLCONTROL__
     //we just need at least 1 input (deck 1) because of single deck mode
-    if (tryToggleVinylControl(1)) {
+    if (m_pVCManager->vinylInputEnabled(2)) {
         m_pConfig->set(
             ConfigKey("[VinylControl]", "enabled_ch2"), ConfigValue((int)toggle));
            m_pOptionsVinylControl2->setChecked((bool)toggle);

=== modified file 'mixxx/src/mixxx.h'
--- mixxx/src/mixxx.h	2011-04-16 20:57:48 +0000
+++ mixxx/src/mixxx.h	2011-04-18 08:02:27 +0000
@@ -42,9 +42,6 @@
 #include "controlobject.h"
 #include "dlgpreferences.h"
 //#include "trackplaylist.h"
-#ifdef __VINYLCONTROL__
-#include "vinylcontrol.h"
-#endif
 #include "recording/recordingmanager.h"
 
 #ifdef __SCRIPT__
@@ -66,6 +63,8 @@
 class MixxxKeyboard;
 class SkinLoader;
 
+class VinylControlManager;
+
 /**
   * This Class is the base class for Mixxx. It sets up the main
   * window and providing a menubar.
@@ -105,7 +104,6 @@
     /** toggle vinyl control - Don't #ifdef this because MOC is dumb**/
     void slotControlVinylControl(double toggle);
     void slotCheckboxVinylControl(bool toggle);
-    int tryToggleVinylControl(int deck);
     void slotControlVinylControl2(double toggle);
     void slotCheckboxVinylControl2(bool toggle);
     /** toggle recording - Don't #ifdef this because MOC is dumb**/
@@ -168,6 +166,7 @@
 
     ConfigObject<ConfigValue> *m_pConfig;
 
+    VinylControlManager *m_pVCManager;
 
     MixxxKeyboard* m_pKeyboard;
     /** Library scanner object */

=== modified file 'mixxx/src/soundmanager.cpp'
--- mixxx/src/soundmanager.cpp	2011-04-16 15:25:20 +0000
+++ mixxx/src/soundmanager.cpp	2011-04-18 08:02:27 +0000
@@ -26,10 +26,6 @@
 #include "controlobjectthreadmain.h"
 #include "soundmanagerutil.h"
 
-#ifdef __VINYLCONTROL__
-#include "vinylcontrolxwax.h"
-#endif
-
 /** Initializes Mixxx's audio core
  *  @param pConfig The config key table
  *  @param _master A pointer to the audio engine's mastering class.
@@ -232,21 +228,6 @@
         }
     }
     m_inputBuffers.clear();
-
-#ifdef __VINYLCONTROL__
-    // TODO(bkgood) see comment where these objects are created in setupDevices,
-    // this should probably be in the dtor or at least somewhere other
-    // than here.
-    while (!m_vinylControl.empty()) {
-        VinylControlProxy *vc = m_vinylControl.takeLast();
-        if (vc != NULL) {
-            delete vc;
-        }
-        //xwax has a global LUT that we need to free after we've shut down our
-        //vinyl control threads because it's not thread-safe.
-        VinylControlXwax::freeLUTs();
-    }
-#endif
 }
 
 /** Closes all the devices and empties the list of devices we have. */
@@ -372,18 +353,6 @@
 
     // close open devices, close running vinyl control proxies
     closeDevices();
-#ifdef __VINYLCONTROL__
-    //Initialize vinyl control
-    // TODO(bkgood) this ought to be done in the ctor or something. Not here. Really
-    // shouldn't be any reason for these to be reinitialized every time the
-    // audio prefs are updated. Will require work in DlgPrefVinyl.
-    m_vinylControl.append(new VinylControlProxy(m_pConfig, "[Channel1]"));
-    m_vinylControl.append(new VinylControlProxy(m_pConfig, "[Channel2]"));
-    qDebug() << "Created VinylControlProxies" <<
-                m_vinylControl[0] << m_vinylControl[1];
-    registerInput(AudioInput(AudioInput::VINYLCONTROL, 0, 0), m_vinylControl[0]);
-    registerInput(AudioInput(AudioInput::VINYLCONTROL, 0, 1), m_vinylControl[1]);
-#endif
     foreach (SoundDevice *device, m_devices) {
         bool isInput = false;
         bool isOutput = false;
@@ -471,32 +440,6 @@
     return m_config;
 }
 
-#ifdef __VINYLCONTROL__
-bool SoundManager::hasVinylInput(int deck)
-{
-    if (deck >= m_vinylControl.length())
-        return false;
-    VinylControlProxy* vinyl_control = m_vinylControl[deck];
-
-    bool hasInput = false;
-    QList<AudioInput> inputs = getConfig().getInputs().values();
-    foreach (AudioInput in, inputs) {
-        if (in.getType() == AudioInput::VINYLCONTROL
-                && in.getIndex() == deck) {
-            hasInput = true;
-            break;
-        }
-    }
-
-    return vinyl_control != NULL && hasInput;
-}
-
-QList<VinylControlProxy*> SoundManager::getVinylControlProxies()
-{
-    return m_vinylControl;
-}
-#endif
-
 int SoundManager::setConfig(SoundManagerConfig config) {
     int err = OK;
     m_config = config;

=== modified file 'mixxx/src/soundmanager.h'
--- mixxx/src/soundmanager.h	2011-04-15 07:08:16 +0000
+++ mixxx/src/soundmanager.h	2011-04-18 08:02:27 +0000
@@ -21,9 +21,6 @@
 #include "configobject.h"
 #include "controlobject.h"
 #include "defs.h"
-#ifdef __VINYLCONTROL__
-#include "vinylcontrolproxy.h"
-#endif
 #include "soundmanagerconfig.h"
 #include <QTimer>
 
@@ -59,10 +56,6 @@
         QList<unsigned int> getSampleRates() const;
         QList<QString> getHostAPIList() const;
         SoundManagerConfig getConfig() const;
-#ifdef __VINYLCONTROL__
-        bool hasVinylInput(int deck);
-        QList<VinylControlProxy*> getVinylControlProxies();
-#endif
         int setConfig(SoundManagerConfig config);
         void checkConfig();
         QHash<AudioOutput, const CSAMPLE*>
@@ -92,9 +85,6 @@
         QHash<AudioInput, short*> m_inputBuffers; /** Audio received from input */
         QHash<SoundDevice*, long> m_deviceFrameCount;   /** Sound card sync */
         SoundDevice* m_pClkRefDevice;  /** Sound card sync */
-#ifdef __VINYLCONTROL__
-        QList<VinylControlProxy*> m_vinylControl;
-#endif
         unsigned int iNumDevicesOpenedForOutput;
         unsigned int iNumDevicesOpenedForInput;
         QMutex requestBufferMutex;

=== added directory 'mixxx/src/vinylcontrol'
=== renamed file 'mixxx/src/vinylcontrol.cpp' => 'mixxx/src/vinylcontrol/vinylcontrol.cpp'
--- mixxx/src/vinylcontrol.cpp	2011-04-16 21:06:35 +0000
+++ mixxx/src/vinylcontrol/vinylcontrol.cpp	2011-04-18 08:02:27 +0000
@@ -1,10 +1,10 @@
 #include "vinylcontrol.h"
 #include "controlobjectthread.h"
 
-VinylControl::VinylControl(ConfigObject<ConfigValue> * pConfig, const char * _group)
+VinylControl::VinylControl(ConfigObject<ConfigValue> * pConfig, QString group)
 {
     m_pConfig = pConfig;
-    group = _group;
+    m_group = group;
     iRIAACorrection = 0;
 
     iSampleRate = m_pConfig->getValueString(ConfigKey("[Soundcard]","Samplerate")).toULong();
@@ -59,7 +59,7 @@
 {
     bIsEnabled = enable;
     if (m_pConfig)
-        m_pConfig->set(ConfigKey(group,"vinylcontrol_enabled"), ConfigValue((int)enable));
+        m_pConfig->set(ConfigKey(m_group,"vinylcontrol_enabled"), ConfigValue((int)enable));
 
     enabled->slotSet(enable);
 

=== renamed file 'mixxx/src/vinylcontrol.h' => 'mixxx/src/vinylcontrol/vinylcontrol.h'
--- mixxx/src/vinylcontrol.h	2011-04-16 21:06:35 +0000
+++ mixxx/src/vinylcontrol/vinylcontrol.h	2011-04-18 08:02:27 +0000
@@ -1,5 +1,5 @@
-#ifndef __VINYLCONTROL_H__
-#define __VINYLCONTROL_H__
+#ifndef VINYLCONTROL_H
+#define VINYLCONTROL_H
 
 #include <qthread.h>
 #include "configobject.h"
@@ -39,7 +39,7 @@
 class VinylControl : public QThread
 {
   public:
-    VinylControl(ConfigObject<ConfigValue> *pConfig, const char *_group);
+    VinylControl(ConfigObject<ConfigValue> *pConfig, QString group);
     virtual ~VinylControl();
     virtual void ToggleVinylControl(bool enable) = 0;
     virtual bool isEnabled() = 0;
@@ -56,7 +56,7 @@
     QString strVinylType;
     QString strVinylSpeed;
     ConfigObject<ConfigValue> *m_pConfig;    /** Pointer to config database */
-    const char* group;
+    QString m_group;
     ControlObjectThread *playButton; //The ControlObject used to start/stop playback of the song.
     ControlObjectThread *playPos; //The ControlObject used to read the playback position in the song.
     ControlObjectThread *vinylSeek; //The ControlObject used to change the playback position in the song.

=== added file 'mixxx/src/vinylcontrol/vinylcontrolmanager.cpp'
--- mixxx/src/vinylcontrol/vinylcontrolmanager.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolmanager.cpp	2011-04-18 08:02:27 +0000
@@ -0,0 +1,148 @@
+/**
+ * @file vinylcontrolmanager.cpp
+ * @author Bill Good <[e-mail]>
+ * @date April 15, 2011
+ */
+
+#include "vinylcontrolmanager.h"
+#include "vinylcontrolproxy.h"
+#include "vinylcontrolxwax.h"
+#include "soundmanager.h"
+
+const int kNumberOfDecks = 4; // set to 4 because it will ideally not be more
+// or less than the number of vinyl-controlled decks but will probably be
+// forgotten in any 2->4 deck switchover. Only real consequence is
+// sizeof(void*)*2 bytes of wasted memory if we're only using 2 decks -bkgood
+
+const QString kVCProxyGroup = QString("[Channel%1]");
+
+VinylControlManager::VinylControlManager(QObject *pParent,
+        ConfigObject<ConfigValue> *pConfig)
+  : QObject(pParent)
+  , m_pConfig(pConfig)
+  , m_proxies(kNumberOfDecks, NULL) {
+    // load a bunch of stuff
+    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_enabled"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","enabled_ch1")).toDouble());
+    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_enabled"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","enabled_ch2")).toDouble());
+    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_mode"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","mode")).toDouble());
+    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_mode"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","mode")).toDouble());
+    ControlObject::getControl(ConfigKey("[Channel1]","vinylcontrol_cueing"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","cueing_ch1")).toDouble());
+    ControlObject::getControl(ConfigKey("[Channel2]","vinylcontrol_cueing"))
+        ->queueFromThread(m_pConfig->getValueString(
+                ConfigKey("[VinylControl]","cueing_ch2")).toDouble());
+}
+
+VinylControlManager::~VinylControlManager() {
+    m_proxiesLock.lockForWrite();
+    for (int i = 0; i < m_proxies.size(); ++i) {
+        if (m_proxies.at(i)) {
+            delete m_proxies.at(i);
+            m_proxies.replace(i, NULL);
+        }
+    }
+    m_proxiesLock.unlock();
+
+    // xwax has a global LUT that we need to free after we've shut down our
+    // vinyl control threads because it's not thread-safe.
+    VinylControlXwax::freeLUTs();
+
+    // save a bunch of stuff to config
+    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch1"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel1]","vinylcontrol_enabled"))->get()));
+    m_pConfig->set(ConfigKey("[VinylControl]","enabled_ch2"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel2]","vinylcontrol_enabled"))->get()));
+    m_pConfig->set(ConfigKey("[VinylControl]","mode"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel1]","vinylcontrol_mode"))->get()));
+    m_pConfig->set(ConfigKey("[VinylControl]","mode"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel2]","vinylcontrol_mode"))->get()));
+    m_pConfig->set(ConfigKey("[VinylControl]","cueing_ch1"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel1]","vinylcontrol_cueing"))->get()));
+    m_pConfig->set(ConfigKey("[VinylControl]","cueing_ch2"),
+        ConfigValue((int)ControlObject::getControl(
+            ConfigKey("[Channel2]","vinylcontrol_cueing"))->get()));
+}
+
+void VinylControlManager::receiveBuffer(AudioInput input,
+        const short *pBuffer, unsigned int nFrames) {
+    Q_ASSERT(input.getType() == AudioInput::VINYLCONTROL);
+    if (m_proxiesLock.tryLockForRead()) {
+        Q_ASSERT(input.getIndex() < m_proxies.size());
+        VinylControlProxy *pProxy(m_proxies.at(input.getIndex()));
+        Q_ASSERT(pProxy);
+        pProxy->AnalyseSamples(pBuffer, nFrames);
+        m_proxiesLock.unlock();
+    }
+}
+
+void VinylControlManager::onInputConnected(AudioInput input) {
+    Q_ASSERT(input.getType() == AudioInput::VINYLCONTROL);
+    unsigned char index = input.getIndex();
+    VinylControlProxy *pNewVC = new VinylControlProxy(m_pConfig,
+            kVCProxyGroup.arg(index + 1));
+    m_proxiesLock.lockForWrite();
+    if (index < m_proxies.size()) {
+        if (m_proxies.at(index)) {
+            delete m_proxies.at(index);
+        }
+        m_proxies.replace(index, pNewVC);
+    } else {
+        m_proxies.resize(index + 1);
+        m_proxies.replace(index, pNewVC);
+    }
+    m_proxiesLock.unlock();
+}
+
+void VinylControlManager::onInputDisconnected(AudioInput input) {
+    Q_ASSERT(input.getType() == AudioInput::VINYLCONTROL);
+    m_proxiesLock.lockForWrite();
+    Q_ASSERT(input.getIndex() < m_proxies.size());
+    Q_ASSERT(m_proxies.at(input.getIndex()));
+
+    delete m_proxies.at(input.getIndex());
+    m_proxies.replace(input.getIndex(), NULL);
+    m_proxiesLock.unlock();
+}
+
+void VinylControlManager::reloadConfig() {
+    m_proxiesLock.lockForWrite();
+    for (int i = 0; i < m_proxies.size(); ++i) {
+        if (!m_proxies.at(i)) continue;
+        VinylControlProxy *pProxy = m_proxies.at(i);
+        QString group = kVCProxyGroup.arg(i + 1);
+        delete pProxy;
+        pProxy = new VinylControlProxy(m_pConfig, group);
+        m_proxies.replace(i, pProxy);
+    }
+    m_proxiesLock.unlock();
+}
+
+QList<VinylControlProxy*> VinylControlManager::vinylControlProxies() {
+    m_proxiesLock.lockForRead();
+    QList<VinylControlProxy*> list(m_proxies.toList());
+    m_proxiesLock.unlock();
+    return list;
+}
+
+bool VinylControlManager::vinylInputEnabled(int deck) {
+    // a vinylcontrolproxy is only created if vinyl control is enabled for
+    // a deck, so...
+    m_proxiesLock.lockForRead();
+    bool ret = (deck - 1) < m_proxies.size() && m_proxies[deck-1];
+    m_proxiesLock.unlock();
+    return ret;
+}

=== added file 'mixxx/src/vinylcontrol/vinylcontrolmanager.h'
--- mixxx/src/vinylcontrol/vinylcontrolmanager.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolmanager.h	2011-04-18 08:02:27 +0000
@@ -0,0 +1,36 @@
+/**
+ * @file vinylcontrolmanager.h
+ * @author Bill Good <[e-mail]>
+ * @date April 15, 2011
+ */
+
+#ifndef VINYLCONTROLMANAGER_H
+#define VINYLCONTROLMANAGER_H
+
+#include <QtCore>
+#include "soundmanagerutil.h"
+#include "configobject.h"
+
+class VinylControlProxy;
+class SoundManager;
+
+class VinylControlManager : public QObject, public AudioDestination {
+    Q_OBJECT;
+  public:
+    VinylControlManager(QObject *pParent, ConfigObject<ConfigValue> *pConfig);
+    virtual ~VinylControlManager();
+    virtual void receiveBuffer(AudioInput input, const short *pBuffer, unsigned int nFrames);
+    virtual void onInputConnected(AudioInput input);
+    virtual void onInputDisconnected(AudioInput input);
+    QList<VinylControlProxy*> vinylControlProxies();
+    bool vinylInputEnabled(int deck);
+  public slots:
+    void reloadConfig();
+  signals:
+  private:
+    ConfigObject<ConfigValue> *m_pConfig;
+    QVector<VinylControlProxy*> m_proxies;
+    QReadWriteLock m_proxiesLock;
+};
+
+#endif // VINYLCONTROLMANAGER_H

=== renamed file 'mixxx/src/vinylcontrolproxy.cpp' => 'mixxx/src/vinylcontrol/vinylcontrolproxy.cpp'
--- mixxx/src/vinylcontrolproxy.cpp	2011-04-15 07:18:41 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolproxy.cpp	2011-04-18 08:02:27 +0000
@@ -8,7 +8,7 @@
 
 //IVinylControl *VinylControlProxy::m_pVinylControl = 0;
 
-VinylControlProxy::VinylControlProxy(ConfigObject<ConfigValue> * pConfig, const char * _group) : VinylControl(pConfig, _group)
+VinylControlProxy::VinylControlProxy(ConfigObject<ConfigValue> * pConfig, QString group) : VinylControl(pConfig, group)
 {
     QList<QString> xwax_timecodes;
     QList<QString> scratchlib_timecodes;
@@ -20,20 +20,20 @@
     xwax_timecodes.push_back(MIXXX_VINYL_TRAKTORSCRATCHSIDEB);
 
     //Figure out which type of timecoded vinyl we're using.
-    strVinylType = m_pConfig->getValueString(ConfigKey(_group,"vinylcontrol_vinyl_type"));
+    strVinylType = m_pConfig->getValueString(ConfigKey(m_group,"vinylcontrol_vinyl_type"));
 
     //Create the VinylControl object that matches the type of vinyl selected in the prefs...
     if (xwax_timecodes.contains(strVinylType))
     {
-        m_pVinylControl = new VinylControlXwax(pConfig, _group);
+        m_pVinylControl = new VinylControlXwax(pConfig, m_group);
     }
     else
     {
         qDebug() << "VinylControlProxy: Unknown vinyl type " << strVinylType;
         qDebug() << "Defaulting to Serato...";
         strVinylType = MIXXX_VINYL_SERATOCV02VINYLSIDEA;
-        pConfig->set(ConfigKey(_group,"vinylcontrol_vinyl_type"), ConfigValue(MIXXX_VINYL_SERATOCV02VINYLSIDEA));
-        m_pVinylControl = new VinylControlXwax(pConfig, _group);
+        pConfig->set(ConfigKey(m_group,"vinylcontrol_vinyl_type"), ConfigValue(MIXXX_VINYL_SERATOCV02VINYLSIDEA));
+        m_pVinylControl = new VinylControlXwax(pConfig, m_group);
     }
 }
 
@@ -116,12 +116,3 @@
         return -1.0;
 }
 
-void VinylControlProxy::receiveBuffer(AudioInput input, const short* pBuffer,
-        unsigned int iNumFrames) {
-    if (input.getType() != AudioPath::VINYLCONTROL ||
-        QString("[Channel%1]").arg(input.getIndex()+1) != this->group) {
-        qDebug() << "WARNING: vinyl control proxy got a buffer for an "
-            "AudioInput it doesn't own";
-    }
-    AnalyseSamples(pBuffer, iNumFrames);
-}

=== renamed file 'mixxx/src/vinylcontrolproxy.h' => 'mixxx/src/vinylcontrol/vinylcontrolproxy.h'
--- mixxx/src/vinylcontrolproxy.h	2011-04-16 21:07:10 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolproxy.h	2011-04-18 08:02:27 +0000
@@ -4,12 +4,10 @@
 #include "vinylcontrol.h"
 #include "soundmanagerutil.h"
 
-//#include "vinylcontrolscratchlib.h"
-
-class VinylControlProxy : public VinylControl, public AudioDestination
+class VinylControlProxy : public VinylControl
 {
   public:
-    VinylControlProxy(ConfigObject<ConfigValue> *pConfig, const char *_group);
+    VinylControlProxy(ConfigObject<ConfigValue> *pConfig, QString group);
     ~VinylControlProxy();
     bool isEnabled();
     void AnalyseSamples(const short* samples, size_t size);
@@ -19,7 +17,6 @@
     float getTimecodeQuality();
     unsigned char* getScopeBytemap();
     float getAngle();
-    virtual void receiveBuffer(AudioInput input, const short *pBuffer, unsigned int iNumFrames);
   protected:
     VinylControl* m_pVinylControl; //Pointer to active VinylControl object
 };

=== renamed file 'mixxx/src/vinylcontrolsignalwidget.cpp' => 'mixxx/src/vinylcontrol/vinylcontrolsignalwidget.cpp'
=== renamed file 'mixxx/src/vinylcontrolsignalwidget.h' => 'mixxx/src/vinylcontrol/vinylcontrolsignalwidget.h'
=== renamed file 'mixxx/src/vinylcontrolxwax.cpp' => 'mixxx/src/vinylcontrol/vinylcontrolxwax.cpp'
--- mixxx/src/vinylcontrolxwax.cpp	2011-04-15 07:08:16 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolxwax.cpp	2011-04-18 08:02:27 +0000
@@ -37,7 +37,7 @@
 bool VinylControlXwax::m_bLUTInitialized = false;
 QMutex VinylControlXwax::s_xwaxLUTMutex;
 
-VinylControlXwax::VinylControlXwax(ConfigObject<ConfigValue> * pConfig, const char * _group) : VinylControl(pConfig, _group)
+VinylControlXwax::VinylControlXwax(ConfigObject<ConfigValue> * pConfig, QString group) : VinylControl(pConfig, group)
 {
     dOldPos                 = 0.0f;
     m_samples               = NULL;
@@ -380,7 +380,7 @@
                 {
                     qDebug() << "discontinuing select mode, selecting track";
                     if (trackLoader == NULL)
-                        trackLoader = new ControlObjectThread(ControlObject::getControl(ConfigKey(group,"LoadSelectedTrack")));
+                        trackLoader = new ControlObjectThread(ControlObject::getControl(ConfigKey(m_group,"LoadSelectedTrack")));
 
                     if (!trackLoader)
                         qDebug() << "ERROR: couldn't get track loading object?";

=== renamed file 'mixxx/src/vinylcontrolxwax.h' => 'mixxx/src/vinylcontrol/vinylcontrolxwax.h'
--- mixxx/src/vinylcontrolxwax.h	2011-04-16 22:32:31 +0000
+++ mixxx/src/vinylcontrol/vinylcontrolxwax.h	2011-04-18 08:02:27 +0000
@@ -23,7 +23,7 @@
 class VinylControlXwax : public VinylControl
 {
   public:
-    VinylControlXwax(ConfigObject<ConfigValue> *pConfig, const char *_group);
+    VinylControlXwax(ConfigObject<ConfigValue> *pConfig, QString group);
     virtual ~VinylControlXwax();
     void ToggleVinylControl(bool enable);
     bool isEnabled();