From 6c0cfd1194e9fe2e354c5c28a619e8adfd3f82b2 Mon Sep 17 00:00:00 2001
From: raulbehl <raulbehl@gmail.com>
Date: Thu, 2 Oct 2014 03:11:39 +0530
Subject: [PATCH 6/6] Cleaning code a bit

---
 src/dlgprefwaveform.cpp                             | 5 ++++-
 src/dlgprefwaveform.h                               | 2 --
 src/waveform/renderers/waveformrendererendoftrack.h | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/dlgprefwaveform.cpp b/src/dlgprefwaveform.cpp
index e8d44bc..37083e4 100644
--- a/src/dlgprefwaveform.cpp
+++ b/src/dlgprefwaveform.cpp
@@ -34,15 +34,18 @@ DlgPrefWaveform::DlgPrefWaveform(QWidget* pParent, MixxxMainWindow* pMixxx,
     // slotUpdate can generate rebootMixxxView calls.
     // TODO(XXX): Improve this awkwardness.
     slotUpdate();
-    ControlObject* p_endTime = new ControlObject(ConfigKey("[Waveform]", "endTime"));
     connect(frameRateSpinBox, SIGNAL(valueChanged(int)),
             this, SLOT(slotSetFrameRate(int)));
     connect(endTimeSpinBox, SIGNAL(valueChanged(int)),
             this, SLOT(slotSetWaveformEndRender(int)));
     connect(frameRateSlider, SIGNAL(valueChanged(int)),
             frameRateSpinBox, SLOT(setValue(int)));
+    connect(frameRateSpinBox, SIGNAL(valueChanged(int)),
+            frameRateSlider, SLOT(setValue(int)));
     connect(endTimeSlider, SIGNAL(valueChanged(int)),
             endTimeSpinBox, SLOT(setValue(int)));
+    connect(endTimeSpinBox, SIGNAL(valueChanged(int)),
+            endTimeSlider, SLOT(setValue(int)));
 
     connect(waveformTypeComboBox, SIGNAL(activated(int)),
             this, SLOT(slotSetWaveformType(int)));
diff --git a/src/dlgprefwaveform.h b/src/dlgprefwaveform.h
index 515ee6c..eee626d 100644
--- a/src/dlgprefwaveform.h
+++ b/src/dlgprefwaveform.h
@@ -5,8 +5,6 @@
 
 #include "ui_dlgprefwaveformdlg.h"
 #include "configobject.h"
-#include "controlobject.h"
-#include "controlobjectthread.h"
 #include "preferences/dlgpreferencepage.h"
 
 class MixxxMainWindow;
diff --git a/src/waveform/renderers/waveformrendererendoftrack.h b/src/waveform/renderers/waveformrendererendoftrack.h
index 61e97f8..307c53e 100644
--- a/src/waveform/renderers/waveformrendererendoftrack.h
+++ b/src/waveform/renderers/waveformrendererendoftrack.h
@@ -5,7 +5,6 @@
 #include <QTime>
 //#include <QLinearGradient>
 
-#include "configobject.h"
 #include "util.h"
 #include "waveformrendererabstract.h"
 #include "skin/skincontext.h"
@@ -13,7 +12,6 @@
 
 class ControlObject;
 class ControlObjectThread;
-class WaveformWidgetFacctory;
 
 class WaveformRendererEndOfTrack : public WaveformRendererAbstract {
   public:
-- 
1.9.1