summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-09-24 22:41:39 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-09-24 23:04:46 +0200
commit35000748ee2922782ffeef205ac2b3247d89a9e6 (patch)
treeed152b33c3e604b5ed12f167792709f811111170 /src/engine
parentd9e1b7261384fe79f9d18ac81c3f74bf9e9b2dd5 (diff)
engine/channels: Add missing cast to unsigned int
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/channels/engineaux.cpp7
-rw-r--r--src/engine/channels/enginedeck.cpp9
-rw-r--r--src/engine/channels/enginemicrophone.cpp7
3 files changed, 14 insertions, 9 deletions
diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp
index d67b8912e5..eaaef154ae 100644
--- a/src/engine/channels/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -75,14 +75,15 @@ void EngineAux::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
void EngineAux::process(CSAMPLE* pOut, const int iBufferSize) {
const CSAMPLE* sampleBuffer = m_sampleBuffer; // save pointer on stack
- double pregain = m_pPregain->get();
+ CSAMPLE_GAIN pregain = static_cast<CSAMPLE_GAIN>(m_pPregain->get());
if (sampleBuffer) {
SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
if (pEngineEffectsManager != nullptr) {
pEngineEffectsManager->processPreFaderInPlace(
- m_group.handle(), m_pEffectsManager->getMasterHandle(),
- pOut, iBufferSize, m_pSampleRate->get());
+ m_group.handle(), m_pEffectsManager->getMasterHandle(), pOut, iBufferSize,
+ // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+ static_cast<unsigned int>(m_pSampleRate->get()));
}
m_sampleBuffer = NULL;
} else {
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index e0047eab61..27431078c6 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -90,9 +90,12 @@ void EngineDeck::process(CSAMPLE* pOut, const int iBufferSize) {
EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
if (pEngineEffectsManager != nullptr) {
- pEngineEffectsManager->processPreFaderInPlace(
- m_group.handle(), m_pEffectsManager->getMasterHandle(),
- pOut, iBufferSize, m_pSampleRate->get());
+ pEngineEffectsManager->processPreFaderInPlace(m_group.handle(),
+ m_pEffectsManager->getMasterHandle(),
+ pOut,
+ iBufferSize,
+ // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+ static_cast<unsigned int>(m_pSampleRate->get()));
}
// Update VU meter
diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index ddc78fa882..be6e8c4174 100644
--- a/src/engine/channels/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -74,14 +74,15 @@ void EngineMicrophone::process(CSAMPLE* pOut, const int iBufferSize) {
// If configured read into the output buffer.
// Otherwise, skip the appropriate number of samples to throw them away.
const CSAMPLE* sampleBuffer = m_sampleBuffer; // save pointer on stack
- double pregain = m_pPregain->get();
+ CSAMPLE_GAIN pregain = static_cast<CSAMPLE_GAIN>(m_pPregain->get());
if (sampleBuffer) {
SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
if (pEngineEffectsManager != nullptr) {
pEngineEffectsManager->processPreFaderInPlace(
- m_group.handle(), m_pEffectsManager->getMasterHandle(),
- pOut, iBufferSize, m_pSampleRate->get());
+ m_group.handle(), m_pEffectsManager->getMasterHandle(), pOut, iBufferSize,
+ // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+ static_cast<unsigned int>(m_pSampleRate->get()));
}
} else {
SampleUtil::clear(pOut, iBufferSize);