# HG changeset patch
# User Chris Cannam
# Date 1402915745 -3600
# Node ID 80f2cd8a30f717d53c96f932c20fa60a3c8c66cd
# Parent  6d9adf82347da53c31e94928ca33908c92202e00# Parent  6f545a46746bd675e1b63f0eb1454bdd93209dbd
Merge

diff -r 6f545a46746b -r 80f2cd8a30f7 .hgsubstate
--- a/.hgsubstate	Mon Jun 16 11:44:14 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 11:49:05 2014 +0100
@@ -3,5 +3,5 @@
 27eee0f7a4f66b3dc39bc3c83d9c3f93f3845cc1 pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
-85879408f6657f4076d73839d590c9fb80b78e73 svcore
-d6b79166ae0d6dcf0ed55aba08f50fdfcd229647 svgui
+3efc20c59a947a137ed7fc715b2a3b0de6c02200 svcore
+8be221f1831388b523b88a74fb2e3d30d2d23291 svgui
diff -r 6f545a46746b -r 80f2cd8a30f7 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Mon Jun 16 11:44:14 2014 +0100
+++ b/src/MainWindow.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -216,6 +216,7 @@
     connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
     m_playSpeed = new AudioDial(frame);
+    m_playSpeed->setMeterColor(Qt::darkBlue);
     m_playSpeed->setMinimum(0);
     m_playSpeed->setMaximum(200);
     m_playSpeed->setValue(100);
@@ -234,6 +235,7 @@
 
     // Gain controls
     m_gainAudio = new AudioDial(frame);
+    m_gainAudio->setMeterColor(Qt::darkRed);
     m_gainAudio->setMinimum(-50);
     m_gainAudio->setMaximum(50);
     m_gainAudio->setValue(0);
@@ -252,6 +254,7 @@
     connect(m_gainAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
     m_gainPitch = new AudioDial(frame);
+    m_gainPitch->setMeterColor(Qt::darkRed);
     m_gainPitch->setMinimum(-50);
     m_gainPitch->setMaximum(50);
     m_gainPitch->setValue(0);
@@ -269,6 +272,7 @@
     connect(m_gainPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
     m_gainNotes = new AudioDial(frame);
+    m_gainNotes->setMeterColor(Qt::darkRed);
     m_gainNotes->setMinimum(-50);
     m_gainNotes->setMaximum(50);
     m_gainNotes->setValue(0);
@@ -288,6 +292,7 @@
 
     // Pan controls
     m_panAudio = new AudioDial(frame);
+    m_panAudio->setMeterColor(Qt::darkGreen);
     m_panAudio->setMinimum(-100);
     m_panAudio->setMaximum(100);
     m_panAudio->setValue(-100);
@@ -306,6 +311,7 @@
     connect(m_panAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
     m_panPitch = new AudioDial(frame);
+    m_panPitch->setMeterColor(Qt::darkGreen);
     m_panPitch->setMinimum(-100);
     m_panPitch->setMaximum(100);
     m_panPitch->setValue(100);
@@ -323,6 +329,7 @@
     connect(m_panPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
     m_panNotes = new AudioDial(frame);
+    m_panNotes->setMeterColor(Qt::darkGreen);
     m_panNotes->setMinimum(-100);
     m_panNotes->setMaximum(100);
     m_panNotes->setValue(100);