Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headers

6 files changed, 14 insertions, 14 deletions

diff --git a/src/vinylcontrol/vinylcontrol.cpp b/src/vinylcontrol/vinylcontrol.cpp
index bf8552e3cd..9f89c12281 100644
--- a/src/vinylcontrol/vinylcontrol.cpp
+++ b/src/vinylcontrol/vinylcontrol.cpp
@@ -2,11 +2,12 @@
 #include "control/controlproxy.h"
 #include "control/controlobject.h"
 
-VinylControl::VinylControl(UserSettingsPointer pConfig, QString group)
+VinylControl::VinylControl(UserSettingsPointer pConfig, const QString& group)
         : m_pConfig(pConfig),
           m_group(group),
           m_iLeadInTime(m_pConfig->getValueString(
-                  ConfigKey(group, "vinylcontrol_lead_in_time")).toInt()),
+                                         ConfigKey(group, "vinylcontrol_lead_in_time"))
+                                .toInt()),
           m_dVinylPosition(0.0),
           m_fTimecodeQuality(0.0f) {
     // Get Control objects
diff --git a/src/vinylcontrol/vinylcontrol.h b/src/vinylcontrol/vinylcontrol.h
index 5d3d591396..c3ffd02a2b 100644
--- a/src/vinylcontrol/vinylcontrol.h
+++ b/src/vinylcontrol/vinylcontrol.h
@@ -10,7 +10,7 @@ class ControlProxy;
 
 class VinylControl : public QObject {
   public:
-    VinylControl(UserSettingsPointer pConfig, QString group);
+    VinylControl(UserSettingsPointer pConfig, const QString& group);
     virtual ~VinylControl();
 
     virtual void toggleVinylControl(bool enable);
diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp
index 1fd8e6a202..a7b5379d28 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.cpp
+++ b/src/vinylcontrol/vinylcontrolprocessor.cpp
@@ -153,7 +153,7 @@ void VinylControlProcessor::reloadConfig() {
     }
 }
 
-void VinylControlProcessor::onInputConfigured(AudioInput input) {
+void VinylControlProcessor::onInputConfigured(const AudioInput& input) {
     if (input.getType() != AudioInput::VINYLCONTROL) {
         qDebug() << "WARNING: AudioInput type is not VINYLCONTROL. Ignoring.";
         return;
@@ -177,7 +177,7 @@ void VinylControlProcessor::onInputConfigured(AudioInput input) {
     delete pCurrent;
 }
 
-void VinylControlProcessor::onInputUnconfigured(AudioInput input) {
+void VinylControlProcessor::onInputUnconfigured(const AudioInput& input) {
     if (input.getType() != AudioInput::VINYLCONTROL) {
         qDebug() << "WARNING: AudioInput type is not VINYLCONTROL. Ignoring.";
         return;
@@ -203,9 +203,9 @@ bool VinylControlProcessor::deckConfigured(int index) const {
     return m_processors[index] != NULL;
 }
 
-void VinylControlProcessor::receiveBuffer(AudioInput input,
-                                          const CSAMPLE* pBuffer,
-                                          unsigned int nFrames) {
+void VinylControlProcessor::receiveBuffer(const AudioInput& input,
+        const CSAMPLE* pBuffer,
+        unsigned int nFrames) {
     ScopedTimer t("VinylControlProcessor::receiveBuffer");
     if (input.getType() != AudioInput::VINYLCONTROL) {
         qDebug() << "WARNING: AudioInput type is not VINYLCONTROL. Ignoring incoming buffer.";
diff --git a/src/vinylcontrol/vinylcontrolprocessor.h b/src/vinylcontrol/vinylcontrolprocessor.h
index 7b236c021f..5666db0af7 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.h
+++ b/src/vinylcontrol/vinylcontrolprocessor.h
@@ -40,8 +40,8 @@ class VinylControlProcessor : public QThread, public AudioDestination {
     }
 
   public slots:
-    virtual void onInputConfigured(AudioInput input);
-    virtual void onInputUnconfigured(AudioInput input);
+    virtual void onInputConfigured(const AudioInput& input);
+    virtual void onInputUnconfigured(const AudioInput& input);
 
     // Called by the engine callback. Must not touch any state in
     // VinylControlProcessor except for m_samplePipes. NOTE:
@@ -52,8 +52,7 @@ class VinylControlProcessor : public QThread, public AudioDestination {
     // method is re-entrant since the VinylControlProcessor is registered for
     // multiple AudioDestinations, however it is not re-entrant for a given
     // AudioInput index.
-    void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
-                       unsigned int iNumFrames);
+    void receiveBuffer(const AudioInput& input, const CSAMPLE* pBuffer, unsigned int iNumFrames);
 
   protected:
     void run();
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index 2354d92949..84234060d2 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -26,7 +26,7 @@ const double kMinSignal = 75.0 / SAMPLE_MAX;
 bool VinylControlXwax::s_bLUTInitialized = false;
 QMutex VinylControlXwax::s_xwaxLUTMutex;
 
-VinylControlXwax::VinylControlXwax(UserSettingsPointer pConfig, QString group)
+VinylControlXwax::VinylControlXwax(UserSettingsPointer pConfig, const QString& group)
         : VinylControl(pConfig, group),
           m_dVinylPositionOld(0.0),
           m_pWorkBuffer(new short[MAX_BUFFER_LEN]),
diff --git a/src/vinylcontrol/vinylcontrolxwax.h b/src/vinylcontrol/vinylcontrolxwax.h
index aae53a0266..71a5f72a79 100644
--- a/src/vinylcontrol/vinylcontrolxwax.h
+++ b/src/vinylcontrol/vinylcontrolxwax.h
@@ -21,7 +21,7 @@ extern "C" {
 
 class VinylControlXwax : public VinylControl {
   public:
-    VinylControlXwax(UserSettingsPointer pConfig, QString group);
+    VinylControlXwax(UserSettingsPointer pConfig, const QString& group);
     virtual ~VinylControlXwax();
 
     static void freeLUTs();