summaryrefslogtreecommitdiffstats
path: root/src/engine/channels
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/channels')
-rw-r--r--src/engine/channels/engineaux.cpp8
-rw-r--r--src/engine/channels/engineaux.h9
-rw-r--r--src/engine/channels/enginedeck.cpp7
-rw-r--r--src/engine/channels/enginedeck.h9
-rw-r--r--src/engine/channels/enginemicrophone.cpp8
-rw-r--r--src/engine/channels/enginemicrophone.h9
6 files changed, 27 insertions, 23 deletions
diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp
index 08748e71a7..ecba74bc13 100644
--- a/src/engine/channels/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -42,7 +42,7 @@ bool EngineAux::isActive() {
return m_wasActive;
}
-void EngineAux::onInputConfigured(AudioInput input) {
+void EngineAux::onInputConfigured(const AudioInput& input) {
if (input.getType() != AudioPath::AUXILIARY) {
// This is an error!
qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!";
@@ -52,7 +52,7 @@ void EngineAux::onInputConfigured(AudioInput input) {
m_pInputConfigured->forceSet(1.0);
}
-void EngineAux::onInputUnconfigured(AudioInput input) {
+void EngineAux::onInputUnconfigured(const AudioInput& input) {
if (input.getType() != AudioPath::AUXILIARY) {
// This is an error!
qDebug() << "WARNING: EngineAux connected to AudioInput for a non-auxiliary type!";
@@ -62,8 +62,8 @@ void EngineAux::onInputUnconfigured(AudioInput input) {
m_pInputConfigured->forceSet(0.0);
}
-void EngineAux::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
- unsigned int nFrames) {
+void EngineAux::receiveBuffer(
+ const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) {
Q_UNUSED(input);
Q_UNUSED(nFrames);
m_sampleBuffer = pBuffer;
diff --git a/src/engine/channels/engineaux.h b/src/engine/channels/engineaux.h
index 296055e1f3..2362c32c0d 100644
--- a/src/engine/channels/engineaux.h
+++ b/src/engine/channels/engineaux.h
@@ -30,16 +30,17 @@ class EngineAux : public EngineChannel, public AudioDestination {
/// the soundcard this AudioDestination was registered for! Beware, in the
/// case of multiple soundcards, this method is not re-entrant but it may be
/// concurrent with EngineMaster processing.
- virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
- unsigned int nFrames);
+ virtual void receiveBuffer(const AudioInput& input,
+ const CSAMPLE* pBuffer,
+ unsigned int nFrames);
/// Called by SoundManager whenever the aux input is connected to a
/// soundcard input.
- virtual void onInputConfigured(AudioInput input);
+ virtual void onInputConfigured(const AudioInput& input);
/// Called by SoundManager whenever the aux input is disconnected from
/// a soundcard input.
- virtual void onInputUnconfigured(AudioInput input);
+ virtual void onInputUnconfigured(const AudioInput& input);
private:
QScopedPointer<ControlObject> m_pInputConfigured;
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index 27431078c6..8eeb3d1bad 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -131,7 +131,8 @@ bool EngineDeck::isActive() {
return active;
}
-void EngineDeck::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, unsigned int nFrames) {
+void EngineDeck::receiveBuffer(
+ const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) {
Q_UNUSED(input);
Q_UNUSED(nFrames);
// Skip receiving audio input if passthrough is not active
@@ -143,7 +144,7 @@ void EngineDeck::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer, unsigne
}
}
-void EngineDeck::onInputConfigured(AudioInput input) {
+void EngineDeck::onInputConfigured(const AudioInput& input) {
if (input.getType() != AudioPath::VINYLCONTROL) {
// This is an error!
qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
@@ -153,7 +154,7 @@ void EngineDeck::onInputConfigured(AudioInput input) {
m_sampleBuffer = NULL;
}
-void EngineDeck::onInputUnconfigured(AudioInput input) {
+void EngineDeck::onInputUnconfigured(const AudioInput& input) {
if (input.getType() != AudioPath::VINYLCONTROL) {
// This is an error!
qDebug() << "WARNING: EngineDeck connected to AudioInput for a non-vinylcontrol type!";
diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h
index f571dadb38..cc0006c9c7 100644
--- a/src/engine/channels/enginedeck.h
+++ b/src/engine/channels/enginedeck.h
@@ -62,16 +62,17 @@ class EngineDeck : public EngineChannel, public AudioDestination {
// the soundcard this AudioDestination was registered for! Beware, in the
// case of multiple soundcards, this method is not re-entrant but it may be
// concurrent with EngineMaster processing.
- virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
- unsigned int nFrames);
+ virtual void receiveBuffer(const AudioInput& input,
+ const CSAMPLE* pBuffer,
+ unsigned int nFrames);
// Called by SoundManager whenever the passthrough input is connected to a
// soundcard input.
- virtual void onInputConfigured(AudioInput input);
+ virtual void onInputConfigured(const AudioInput& input);
// Called by SoundManager whenever the passthrough input is disconnected
// from a soundcard input.
- virtual void onInputUnconfigured(AudioInput input);
+ virtual void onInputUnconfigured(const AudioInput& input);
// Return whether or not passthrough is active
bool isPassthroughActive() const;
diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index 0e22b88d7d..884c5633d1 100644
--- a/src/engine/channels/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -40,7 +40,7 @@ bool EngineMicrophone::isActive() {
return m_wasActive;
}
-void EngineMicrophone::onInputConfigured(AudioInput input) {
+void EngineMicrophone::onInputConfigured(const AudioInput& input) {
if (input.getType() != AudioPath::MICROPHONE) {
// This is an error!
qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!";
@@ -50,7 +50,7 @@ void EngineMicrophone::onInputConfigured(AudioInput input) {
m_pInputConfigured->forceSet(1.0);
}
-void EngineMicrophone::onInputUnconfigured(AudioInput input) {
+void EngineMicrophone::onInputUnconfigured(const AudioInput& input) {
if (input.getType() != AudioPath::MICROPHONE) {
// This is an error!
qWarning() << "EngineMicrophone connected to AudioInput for a non-Microphone type!";
@@ -60,8 +60,8 @@ void EngineMicrophone::onInputUnconfigured(AudioInput input) {
m_pInputConfigured->forceSet(0.0);
}
-void EngineMicrophone::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
- unsigned int nFrames) {
+void EngineMicrophone::receiveBuffer(
+ const AudioInput& input, const CSAMPLE* pBuffer, unsigned int nFrames) {
Q_UNUSED(input);
Q_UNUSED(nFrames);
m_sampleBuffer = pBuffer;
diff --git a/src/engine/channels/enginemicrophone.h b/src/engine/channels/enginemicrophone.h
index e5190dc72f..b9611e7cb8 100644
--- a/src/engine/channels/enginemicrophone.h
+++ b/src/engine/channels/enginemicrophone.h
@@ -34,16 +34,17 @@ class EngineMicrophone : public EngineChannel, public AudioDestination {
// the soundcard this AudioDestination was registered for! Beware, in the
// case of multiple soundcards, this method is not re-entrant but it may be
// concurrent with EngineMaster processing.
- virtual void receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
- unsigned int iNumSamples);
+ virtual void receiveBuffer(const AudioInput& input,
+ const CSAMPLE* pBuffer,
+ unsigned int iNumSamples);
// Called by SoundManager whenever the microphone input is connected to a
// soundcard input.
- virtual void onInputConfigured(AudioInput input);
+ virtual void onInputConfigured(const AudioInput& input);
// Called by SoundManager whenever the microphone input is disconnected from
// a soundcard input.
- virtual void onInputUnconfigured(AudioInput input);
+ virtual void onInputUnconfigured(const AudioInput& input);
bool isSolo();
double getSoloDamping();