Merge lp:~mixxxdevelopers/mixxx/features_xwax2_albert into lp:~ywwg/mixxx/features_xwax2

[Albert Santoni]

Here's the vinyl control signal quality widget changes and cleanup we discussed last night.

Thanks!
Albert

[Albert Santoni (gamegod)]

P.S. Here's a video: http://dl.dropbox.com/u/215333/mixxx_vinylsig.ogg

=== modified file 'mixxx/src/dlgprefvinyl.cpp'
--- mixxx/src/dlgprefvinyl.cpp	2010-11-14 16:18:42 +0000
+++ mixxx/src/dlgprefvinyl.cpp	2011-02-16 07:37:07 +0000
@@ -43,17 +43,6 @@
     vinylControlMode.addButton(AbsoluteMode);
     vinylControlMode.addButton(RelativeMode);
 
-    //Get access to the timecode strength ControlObjects
-    m_timecodeQuality1 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlQuality")));
-    m_timecodeQuality2 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlQuality")));
-
-    m_vinylControlInput1L = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlInputL")));
-    m_vinylControlInput1R = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylControlInputR")));
-    m_vinylControlInput2L = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlInputL")));
-    m_vinylControlInput2R = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylControlInputR")));
-
-
-
     m_signalWidget1.setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     m_signalWidget2.setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     const unsigned signalWidgetWidth = 75;
@@ -62,8 +51,6 @@
     m_signalWidget2.setMinimumSize(signalWidgetWidth, signalWidgetHeight);
     m_signalWidget1.setMaximumSize(signalWidgetWidth, signalWidgetHeight);
     m_signalWidget2.setMaximumSize(signalWidgetWidth, signalWidgetHeight);
-    m_signalWidget1.setupWidget();
-    m_signalWidget2.setupWidget();
 
     delete groupBoxSignalQuality->layout();
     QHBoxLayout *layout = new QHBoxLayout;
@@ -98,14 +85,11 @@
 /** @brief Performs any necessary actions that need to happen when the prefs dialog is opened */
 void DlgPrefVinyl::slotShow()
 {
-    //Connect the signal quality ControlObjects to this dialog, so they start updating
-    connect(m_timecodeQuality1, SIGNAL(valueChanged(double)), this, SLOT(updateSignalQuality1(double)));
-    connect(m_timecodeQuality2, SIGNAL(valueChanged(double)), this, SLOT(updateSignalQuality2(double)));
-
-    connect(m_vinylControlInput1L, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelLeft1(double)));
-    connect(m_vinylControlInput1R, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelRight1(double)));
-    connect(m_vinylControlInput2L, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelLeft2(double)));
-    connect(m_vinylControlInput2R, SIGNAL(valueChanged(double)), this, SLOT(updateInputLevelRight2(double)));
+    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));
 
     //(Re)Initialize the signal quality indicators
     m_signalWidget1.resetWidget();
@@ -121,12 +105,6 @@
     //Stop updating the vinyl control signal indicators when the prefs dialog is closed.
     m_signalWidget1.stopDrawing();
     m_signalWidget2.stopDrawing();
-    m_timecodeQuality1->disconnect(this);
-    m_timecodeQuality2->disconnect(this);
-    m_vinylControlInput1L->disconnect(this);
-    m_vinylControlInput1R->disconnect(this);
-    m_vinylControlInput2L->disconnect(this);
-    m_vinylControlInput2R->disconnect(this);
 }
 
 void DlgPrefVinyl::slotUpdate()
@@ -174,7 +152,6 @@
     //Apply updates for everything else...
     VinylTypeSlotApply();
     VinylGainSlotApply();
-    AutoCalibrationSlotApply();
 
     int iMode = 0;
     if (AbsoluteMode->isChecked())
@@ -201,11 +178,6 @@
     config->set(ConfigKey("[VinylControl]","strVinylType"), ConfigValue(ComboBoxVinylType->currentText()));
 }
 
-void DlgPrefVinyl::AutoCalibrationSlotApply()
-{
-    // Do the scratchlib calibration steps.
-}
-
 void DlgPrefVinyl::VinylGainSlotApply()
 {
     qDebug() << "in VinylGainSlotApply()" << "with gain:" << VinylGain->value();
@@ -220,56 +192,16 @@
     //gain->setText(config->getValueString(ConfigKey("[VinylControl]","VinylControlGain")));        //this is probably ineffecient...
 }
 
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new signal quality level for channel 1 (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateSignalQuality1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGQUALITY, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new signal quality level for channel 2 (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateSignalQuality2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGQUALITY, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the left channel of the first deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelLeft1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the right channel of the first deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelRight1(double value)
-{
-    m_signalWidget1.updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the left channel of the second deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelLeft2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, value);
-}
-
-/** @brief Wraps updateSignalQuality to work nicely with slots
-  * @param value The new input level for the right channel of the second deck (0.0f-1.0f)
-  */
-void DlgPrefVinyl::updateInputLevelRight2(double value)
-{
-    m_signalWidget2.updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, 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));
+    }
 }

=== modified file 'mixxx/src/dlgprefvinyl.h'
--- mixxx/src/dlgprefvinyl.h	2010-11-01 01:23:18 +0000
+++ mixxx/src/dlgprefvinyl.h	2011-02-16 07:37:07 +0000
@@ -45,14 +45,7 @@
     void slotApply();
 	void EnableRelativeModeSlotApply();
 	void VinylTypeSlotApply();
-	void AutoCalibrationSlotApply();
     void VinylGainSlotApply();
-    void updateSignalQuality1(double value);
-    void updateSignalQuality2(double value);
-    void updateInputLevelLeft1(double value);
-    void updateInputLevelRight1(double value);
-    void updateInputLevelLeft2(double value);
-    void updateInputLevelRight2(double value);
     void slotClose();
     void slotShow();
 

=== modified file 'mixxx/src/soundmanager.cpp'
--- mixxx/src/soundmanager.cpp	2011-02-09 17:17:20 +0000
+++ mixxx/src/soundmanager.cpp	2011-02-16 07:37:07 +0000
@@ -55,12 +55,6 @@
     ControlObjectThreadMain* pControlObjectVinylControlMode1 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel1]", "VinylMode")));
     ControlObjectThreadMain* pControlObjectVinylControlMode2 = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey("[Channel2]", "VinylMode")));
     ControlObjectThreadMain* pControlObjectVinylControlGain = new ControlObjectThreadMain(new ControlObject(ConfigKey("[VinylControl]", "VinylControlGain")));
-    ControlObjectThreadMain* pControlObjectVinylControlSignalQuality1 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel1]", "VinylControlQuality")));
-    ControlObjectThreadMain* pControlObjectVinylControlSignalQuality2 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel2]", "VinylControlQuality")));
-    ControlObjectThreadMain* pControlObjectVinylControlInputStrengthL1 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel1]", "VinylControlInputL")));
-    ControlObjectThreadMain* pControlObjectVinylControlInputStrengthR1 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel1]", "VinylControlInputR")));
-    ControlObjectThreadMain* pControlObjectVinylControlInputStrengthL2 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel2]", "VinylControlInputL")));
-    ControlObjectThreadMain* pControlObjectVinylControlInputStrengthR2 = new ControlObjectThreadMain(new ControlObject(ConfigKey("[Channel2]", "VinylControlInputR")));
 
     //Hack because PortAudio samplerate enumeration is slow as hell on Linux (ALSA dmix sucks, so we can't blame PortAudio)
     m_samplerates.push_back(44100);
@@ -371,6 +365,8 @@
     QHash<QString, VinylControlProxy*> vinyl_inputs;
     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];
 	m_VinylMapping.clear();
 #endif
     foreach (SoundDevice *device, m_devices) {
@@ -501,6 +497,11 @@
 	return m_VinylControl[deck] && 
 		m_inputBuffers.contains(m_VinylMapping[vinyl_control]);
 }
+
+QList<VinylControlProxy*> SoundManager::getVinylControlProxies()
+{
+    return m_VinylControl;
+}
 #endif
 
 int SoundManager::setConfig(SoundManagerConfig config) {

=== modified file 'mixxx/src/soundmanager.h'
--- mixxx/src/soundmanager.h	2010-11-27 17:09:04 +0000
+++ mixxx/src/soundmanager.h	2011-02-16 07:37:07 +0000
@@ -59,6 +59,7 @@
         SoundManagerConfig getConfig() const;
 #ifdef __VINYLCONTROL__        
         bool hasVinylInput(int deck);
+        QList<VinylControlProxy*> getVinylControlProxies();
 #endif
         int setConfig(SoundManagerConfig config);
         void checkConfig();

=== modified file 'mixxx/src/vinylcontrol.cpp'
--- mixxx/src/vinylcontrol.cpp	2011-01-17 15:42:43 +0000
+++ mixxx/src/vinylcontrol.cpp	2011-02-16 07:37:07 +0000
@@ -19,9 +19,6 @@
     mode                = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "VinylMode")));
 	enabled     		= new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "vinylcontrol")));
     rateRange           = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "rateRange")));
-    timecodeQuality     = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "VinylControlQuality")));
-    timecodeInputL      = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "VinylControlInputL")));
-    timecodeInputR      = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "VinylControlInputR")));
     //vinylStatus			= new ControlObject(ConfigKey(group,"VinylStatus"));
     vinylStatus     = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "VinylStatus")));
     rateDir         = new ControlObjectThread(ControlObject::getControl(ConfigKey(group, "rate_dir")));
@@ -32,6 +29,9 @@
     dVinylScratch = 0.0f;
     dDriftControl   = 0.0f;
     fRateRange = 0.0f;
+    m_fSignalLeft = 0.0f;
+    m_fSignalRight = 0.0f;
+    m_fTimecodeQuality = 0.0f;
 
     //Get the vinyl type
     strVinylType = m_pConfig->getValueString(ConfigKey("[VinylControl]","strVinylType"));
@@ -76,12 +76,20 @@
 {
     return dVinylScratch;
 }
-
-//Returns some sort of indication of the vinyl's signal strength.
-//Range of fTimecodeStrength should be 0.0 to 1.0
-/*
-float VinylControl::getTimecodeStrength()
-{
-    return fTimecodeStrength;
-}
-*/
+float VinylControl::getSignalLeft()
+{
+    return m_fSignalLeft;
+}
+
+float VinylControl::getSignalRight()
+{
+    return m_fSignalRight;
+}
+
+/** Returns some sort of indication of the vinyl's signal quality. 
+    Range of m_fTimecodeQuality should be 0.0 to 1.0 */
+float VinylControl::getTimecodeQuality()
+{
+    return m_fTimecodeQuality;
+}
+

=== modified file 'mixxx/src/vinylcontrol.h'
--- mixxx/src/vinylcontrol.h	2011-01-17 15:42:43 +0000
+++ mixxx/src/vinylcontrol.h	2011-02-16 07:37:07 +0000
@@ -38,7 +38,9 @@
     	virtual void syncPosition() = 0; */
     	virtual void AnalyseSamples(short* samples, size_t size) = 0;
     	virtual float getSpeed();
-    	//virtual float getTimecodeStrength();
+        virtual float getSignalLeft();
+        virtual float getSignalRight();
+        virtual float getTimecodeQuality();
     protected:
 	    virtual void run() = 0;						// main thread loop
 
@@ -54,9 +56,6 @@
     	ControlObjectThread *mode;            //The ControlObject used to get the vinyl control mode (absolute/relative/scratch)
     	ControlObjectThread *enabled;         //The ControlObject used to get if the vinyl control is enabled or disabled.
     	ControlObjectThread *rateRange;         //The ControlObject used to the get the pitch range from the prefs.
-    	ControlObjectThread *timecodeQuality;   //The ControlObject used to notify the GUI about the quality of the timecode signal.
-        ControlObjectThread *timecodeInputL;    //The ControlObject used to notify the GUI about vinyl control left channel's volume.
-        ControlObjectThread *timecodeInputR;    //The ControlObject used to notify the GUI about vinyl control right channel's volume.
         ControlObjectThread *vinylStatus;
         ControlObjectThread *rateDir; //direction of rate
         ControlObjectThread *loopEnabled; //looping enabled?
@@ -70,6 +69,9 @@
                                         //... these two values naturally drift apart, so we need to keep making adjustments to the pitch
                                         //to stop it from getting bad.
         float fRateRange;               //The pitch range setting from Mixxx's preferences
+        float m_fTimecodeQuality;       //Used as a measure of the quality of the timecode signal.
+        float m_fSignalLeft;            //Measures the left channel's volume.
+        float m_fSignalRight;           //Measures the right channel's volume.
 
 	    unsigned long iSampleRate;
 	    bool bIsEnabled;

=== modified file 'mixxx/src/vinylcontrolproxy.cpp'
--- mixxx/src/vinylcontrolproxy.cpp	2009-02-06 04:50:55 +0000
+++ mixxx/src/vinylcontrolproxy.cpp	2011-02-16 07:37:07 +0000
@@ -96,3 +96,30 @@
     else
         return 0.0f;
 }
+
+float VinylControlProxy::getSignalLeft()
+{
+    if (m_pVinylControl)
+        return m_pVinylControl->getSignalLeft();
+    else
+        return 0.0f;
+}
+
+float VinylControlProxy::getSignalRight()
+{
+    if (m_pVinylControl)
+        return m_pVinylControl->getSignalRight();
+    else
+        return 0.0f;
+}
+
+/** Returns some sort of indication of the vinyl's signal quality. 
+    Range of m_fTimecodeQuality should be 0.0 to 1.0 */
+float VinylControlProxy::getTimecodeQuality()
+{
+    if (m_pVinylControl)
+        return m_pVinylControl->getTimecodeQuality();
+    else
+        return 0.0f;
+}
+

=== modified file 'mixxx/src/vinylcontrolproxy.h'
--- mixxx/src/vinylcontrolproxy.h	2007-08-22 04:26:44 +0000
+++ mixxx/src/vinylcontrolproxy.h	2011-02-16 07:37:07 +0000
@@ -15,6 +15,9 @@
         void ToggleVinylControl(bool enable);
         void run();
         float getSpeed();
+        float getSignalLeft();
+        float getSignalRight();
+        float getTimecodeQuality();
     protected:
         VinylControl* m_pVinylControl; //Pointer to active VinylControl object
 };

=== modified file 'mixxx/src/vinylcontrolscratchlib.cpp'
--- mixxx/src/vinylcontrolscratchlib.cpp	2009-07-12 08:02:43 +0000
+++ mixxx/src/vinylcontrolscratchlib.cpp	2011-02-16 07:37:07 +0000
@@ -100,9 +100,9 @@
     }
 
     if (strVinylType == MIXXX_VINYL_FINALSCRATCH)
-        timecodeQuality->slotSet(analyzer->GetTimecodesPerSecond() / 32);
+        m_fTimecodeQuality = analyzer->GetTimecodesPerSecond() / 32;
     else if (strVinylType == MIXXX_VINYL_MIXVIBESDVSCD)
-        timecodeQuality->slotSet(analyzer->GetTimecodesPerSecond() / 32);
+        m_fTimecodeQuality = analyzer->GetTimecodesPerSecond() / 32;
 
     waitForNextInput.wakeAll();
     lockSamples.unlock();

=== modified file 'mixxx/src/vinylcontrolsignalwidget.cpp'
--- mixxx/src/vinylcontrolsignalwidget.cpp	2009-07-24 06:39:43 +0000
+++ mixxx/src/vinylcontrolsignalwidget.cpp	2011-02-16 07:37:07 +0000
@@ -15,30 +15,51 @@
 *                                                                         *
 ***************************************************************************/
 
+/**
+    TODO(XXX): Feb 2011 - asantoni 
+        * This class probably doesn't need the locking anymore. 
 
+*/
 
 #include <QtCore>
 #include <QtGui>
+#include <math.h>
 #include "vinylcontrolsignalwidget.h"
-#include <math.h>
-#include <stdlib.h>
+#include "vinylcontrolproxy.h"
 
 VinylControlSignalWidget::VinylControlSignalWidget()
-    : QGraphicsView(),
-      m_iTimerId(0) {
+    : QWidget(),
+      m_iTimerId(0),
+      m_pVinylControl(NULL) {
     for (int type = 0; type < (int) VINYLCONTROL_SIGTYPE_NUM; type++) {
-        m_signalRectItem[type] = NULL;
     }
-    setupWidget();
+
 }
 
 VinylControlSignalWidget::~VinylControlSignalWidget()
 {
 }
 
+/** This gets called before the VinylControlProxy objects get destroyed, in
+    order to prevent us from having bad pointers dangling. */
+void VinylControlSignalWidget::invalidateVinylControl()
+{
+    m_pVinylControl = NULL;
+}
+
+void VinylControlSignalWidget::setVinylControlProxy(VinylControlProxy* vc)
+{
+
+    m_pVinylControl = vc;
+    //Catch when the VinylControl objects get deleted (like when
+    //you change your vinyl type)
+    connect(m_pVinylControl, SIGNAL(destroyed()),
+            this, SLOT(invalidateVinylControl()));
+}
+
 void VinylControlSignalWidget::startDrawing() {
     if (m_iTimerId == 0) {
-        m_iTimerId = startTimer(50);
+        m_iTimerId = startTimer(60);
     }
 }
 
@@ -50,134 +71,76 @@
 }
 
 void VinylControlSignalWidget::timerEvent(QTimerEvent *event) {
-    updateScene();
+    if (m_pVinylControl) {
+        updateSignalQuality(VINYLCONTROL_SIGQUALITY, 
+                            m_pVinylControl->getTimecodeQuality());
+        updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, 
+                            m_pVinylControl->getSignalLeft());
+        updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, 
+                            m_pVinylControl->getSignalRight());
+    } 
+    else {
+        updateSignalQuality(VINYLCONTROL_SIGQUALITY, 
+                            0.0f);
+        updateSignalQuality(VINYLCONTROL_SIGLEFTCHANNEL, 
+                            0.0f);
+        updateSignalQuality(VINYLCONTROL_SIGRIGHTCHANNEL, 
+                            0.0f);
+    }
+    update();
 }
 
-void VinylControlSignalWidget::updateScene() {
+void VinylControlSignalWidget::resetWidget()
+{
     m_controlLock.lock();
+    for (int type = 0; type < (int)VINYLCONTROL_SIGTYPE_NUM; type++)
+    {
+        m_fRMSvolumeSum[type] = 0.0f;
+        m_fRMSvolume[type] = 0.0f;
+        m_samplesCalculated[type] = 0;
+    }
+    m_controlLock.unlock();
+}
+
+void VinylControlSignalWidget::paintEvent(QPaintEvent* event)
+{
+    int sizeX = this->width();
+    int sizeY = this->height();
+
+    QPainter painter(this);
+    //painter.fillRect(this->rect(), QBrush(Qt::black));
+
+    //Paint the background as a measure of whether or not the timecode is
+    //being successfully decoded.
+    painter.fillRect(this->rect(), QBrush(QColor(0, m_fRMSvolume[0]*255, 0)));
+
     for (int type = 0; type < (int)VINYLCONTROL_SIGTYPE_NUM; type++) {
         
         if (m_samplesCalculated[type] == 0)
             continue;
-        
         QBrush brush;
         if (type == VINYLCONTROL_SIGQUALITY) {
-            if (m_fRMSvolume[type] >= 0.990f) {
-                m_textItem->setPlainText(tr("OK"));
-                brush = QBrush(m_signalGradGood);
-            }
-            else {
-                m_textItem->setPlainText(tr(""));
-                brush = QBrush(m_signalGradBad);
-            }
+            //Hmmm.
         }
         else { //For the left/right channel signals.
-            if (m_fRMSvolume[type] < 0.90f && m_fRMSvolume[type] > 0.10f) { //This is totally empirical.
-                brush = QBrush(m_signalGradGood);
-            } else {
-                brush = QBrush(m_signalGradBad);
-            }
+            
+            painter.setPen(QPen(Qt::white));
+            int width = m_fRMSvolume[1]*sizeX;
+            int height = m_fRMSvolume[2]*sizeY;
+            int centerX = (sizeX-width) / 2;
+            int centerY = (sizeY-height) / 2;
+            painter.drawEllipse(centerX,
+                                centerY,
+                                width,
+                                height);
         }
-            
-        //The QGraphicsView coord system is upside down...
-        int sizeY = this->height();
-        m_signalRect[type].setHeight(-m_fRMSvolume[type] * sizeY);
-        m_signalRectItem[type]->setBrush(brush);
-        m_signalRectItem[type]->setRect(m_signalRect[type]);
 
         // Reset calculation:
         m_fRMSvolumeSum[type] = 0;
         m_samplesCalculated[type] = 0;
     }
-    m_controlLock.unlock();
-}
-
-void VinylControlSignalWidget::resetWidget()
-{
-    m_controlLock.lock();
-    for (int type = 0; type < (int)VINYLCONTROL_SIGTYPE_NUM; type++)
-    {
-        m_fRMSvolumeSum[type] = 0.0f;
-        m_fRMSvolume[type] = 0.0f;
-        m_samplesCalculated[type] = 0;
-    }
-    m_controlLock.unlock();
-}
-
-
-void VinylControlSignalWidget::setupWidget()
-{
-    int sizeX = this->width();
-    int sizeY = this->height();
-
-    m_signalScene.setSceneRect(0,0,sizeX, sizeY);
-    m_signalScene.setBackgroundBrush(Qt::black);
-
-    this->setInteractive(false);
-
-    //Disable any scrollbars on the QGraphicsView
-    this->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-    //Initialize QPens
-    QPen gridPen(Qt::green);
-    QPen graphLinePen(Qt::white);
-    QPen signalPen(Qt::black);
-
-    m_signalGradGood = QLinearGradient(0, 0, 0, rect().height());
-    m_signalGradBad = QLinearGradient(0, 0, 0, rect().height());
-    m_signalGradGood.setColorAt(0, Qt::green);
-    m_signalGradGood.setColorAt(1, Qt::darkGreen);    
-    m_signalGradBad.setColorAt(0, Qt::red);
-    m_signalGradBad.setColorAt(1, Qt::darkRed);
-      
-            
-    //QBrush signalBrush[VINYLCONTROL_SIGTYPE_NUM];
-    //QPixmap bg1(this->width() / 3, this->height());
-   /*
-    QPainter painter(m_bg[type]);
-    painter.fillRect(m_bg1->rect(), QBrush(QColor(0, 0, 255)));
-    painter.setPen(Qt::red);
-    painter.setFont(QFont("Tahoma", 8));
-    painter.drawText(rect(), tr("OK")); //Draw the OK text
-    painter.end();
-    */
-
-    //draw grid
-#define GRID_X_LINES 3
-#define GRID_Y_LINES 3
-    for(int i=1; i < GRID_X_LINES; i++)
-    {
-        QGraphicsItem* line = m_signalScene.addLine(QLineF(0, i *(sizeY/GRID_X_LINES),
-                                                           sizeX,i *(sizeY/GRID_X_LINES)), gridPen);
-        line->setZValue(0);
-    }
-    for(int i=1; i < GRID_Y_LINES; i++)
-    {
-        QGraphicsItem* line = m_signalScene.addLine(QLineF( i * (sizeX/GRID_Y_LINES), 0,
-                                                            i * (sizeX/GRID_Y_LINES), sizeY), gridPen);
-        line->setZValue(0);
-    }
-
-    for (int type = 0; type < (int)VINYLCONTROL_SIGTYPE_NUM; type++)
-    {
-        m_signalRect[type].setX(type * (sizeX / 3));
-        m_signalRect[type].setY(sizeY);
-        m_signalRect[type].setWidth(sizeX / 3);
-        m_signalRect[type].setHeight(1);
-        m_signalRectItem[type] = m_signalScene.addRect(m_signalRect[type],
-                                                       signalPen,
-                                                       QBrush(m_signalGradGood));
-        m_signalRectItem[type]->setZValue(1);
-    }
-
-    m_textItem = m_signalScene.addText("", QFont("Tahoma", 8));
-    m_textItem->setPos(QPointF(1, 1));
-    m_textItem->setDefaultTextColor(QColor(0,0,0));
-    m_textItem->setZValue(2);
-
-    this->setScene(&m_signalScene);
-}
+}
+
 
 /** @brief Wraps Updates the signal quality indicators with a given signal strength
   * @param indicator_index Identifies the corresponding channel and indicator to be updated.

=== modified file 'mixxx/src/vinylcontrolsignalwidget.h'
--- mixxx/src/vinylcontrolsignalwidget.h	2009-07-24 06:39:43 +0000
+++ mixxx/src/vinylcontrolsignalwidget.h	2011-02-16 07:37:07 +0000
@@ -8,11 +8,12 @@
 #ifndef VINYLCONTROLSIGNALWIDGET_H_
 #define VINYLCONTROLSIGNALWIDGET_H_
 
-
 #include <QtGui>
 #include <QPainter>
 #include <QTimerEvent>
 
+class VinylControlProxy;
+
 enum VinylControlSignalType {
     VINYLCONTROL_SIGQUALITY = 0,
     VINYLCONTROL_SIGLEFTCHANNEL,
@@ -20,35 +21,31 @@
     VINYLCONTROL_SIGTYPE_NUM
 };
 
-class VinylControlSignalWidget : public QGraphicsView
+class VinylControlSignalWidget : public QWidget
 {
     Q_OBJECT
 public:
     VinylControlSignalWidget();
     ~VinylControlSignalWidget();
+    void setVinylControlProxy(VinylControlProxy* vc);
+    void paintEvent(QPaintEvent* event);
     
     void resetWidget();
     void startDrawing();
     void stopDrawing();
-    void updateScene();
-    void setupWidget();
                       
 public slots:
     void updateSignalQuality(VinylControlSignalType type, double value);
+    void invalidateVinylControl();
 
 protected:
     void timerEvent (QTimerEvent* event);
     
 private:
     QMutex m_controlLock;
-    QGraphicsScene m_signalScene;
-    QGraphicsRectItem* m_signalRectItem[VINYLCONTROL_SIGTYPE_NUM];
-    QGraphicsTextItem* m_textItem;
+    VinylControlProxy* m_pVinylControl;
     QRectF m_signalRect[VINYLCONTROL_SIGTYPE_NUM];
     
-    QLinearGradient m_signalGradGood;
-    QLinearGradient m_signalGradBad;
-
     float m_fRMSvolumeSum[VINYLCONTROL_SIGTYPE_NUM];
     float m_fRMSvolume[VINYLCONTROL_SIGTYPE_NUM];
     long m_samplesCalculated[VINYLCONTROL_SIGTYPE_NUM];

=== modified file 'mixxx/src/vinylcontrolxwax.cpp'
--- mixxx/src/vinylcontrolxwax.cpp	2011-01-30 15:37:55 +0000
+++ mixxx/src/vinylcontrolxwax.cpp	2011-02-16 07:37:07 +0000
@@ -131,9 +131,8 @@
         timecoder_submit(&timecoder, samples, size);
 
         //Update the input signal strength
-        //qDebug() << group << (float)fabs((float)samples[0]);
-        timecodeInputL->slotSet((float)fabs((float)samples[0]) / SHRT_MAX * 2.0f);
-        timecodeInputR->slotSet((float)fabs((float)samples[1]) / SHRT_MAX * 2.0f);
+        m_fSignalLeft = ((float)fabs((float)samples[0])) / SHRT_MAX * 2.0f;
+        m_fSignalRight = ((float)fabs((float)samples[1])) / SHRT_MAX * 2.0f;
         
         bHaveSignal = fabs((float)samples[0]) + fabs((float)samples[1]) > MIN_SIGNAL;
         //qDebug() << "signal?" << bHaveSignal;
@@ -325,7 +324,7 @@
             {
             	//POSITION: MAYBE  PITCH: YES
 				//Notify the UI that the timecode quality is good
-                timecodeQuality->slotSet(1.0f);
+                m_fTimecodeQuality = 1.0f;
                 
                 //dVinylPitch = (dOldPitch * (XWAX_SMOOTHING - 1) + dVinylPitch) / XWAX_SMOOTHING;
                 				
@@ -453,7 +452,7 @@
 		            
 		            dOldPos = filePosition + dDriftAmt;
 		            if (uiUpdateTime(filePosition))
-		        		timecodeQuality->slotSet(0.75f);
+		        		m_fTimecodeQuality = 0.75f;
 		        	
 		        	if (dVinylPitch > 0.2)
 		        	{	
@@ -522,7 +521,7 @@
 			        controlScratch->slotSet(0.0f);
 			        //resetSteadyPitch(dVinylPitch, filePosition);
 			        //Notify the UI that the timecode quality is garbage/missing.
-			        timecodeQuality->slotSet(0.0f);
+			        m_fTimecodeQuality = 0.0f;
 			        ringPos = 0;
 			        ringFilled = 0;
 			        vinylStatus->slotSet(VINYL_STATUS_OK);