summaryrefslogtreecommitdiffstats
path: root/src/engine/enginebufferscalest.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2015-03-17 21:20:40 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2015-03-17 21:20:40 +0100
commit3398239ec6fa8900f74fb8cc49c714bd333ed853 (patch)
tree2332d991299055006a7e4e5f559cf39816f40939 /src/engine/enginebufferscalest.cpp
parentae3c673be95d86da7cc93266e138c987d9f286d1 (diff)
separate setSampleRate form setScaleParameters
Diffstat (limited to 'src/engine/enginebufferscalest.cpp')
-rw-r--r--src/engine/enginebufferscalest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/enginebufferscalest.cpp b/src/engine/enginebufferscalest.cpp
index bf904c95ba..84d04b8ff5 100644
--- a/src/engine/enginebufferscalest.cpp
+++ b/src/engine/enginebufferscalest.cpp
@@ -53,14 +53,9 @@ EngineBufferScaleST::~EngineBufferScaleST() {
delete [] buffer_back;
}
-void EngineBufferScaleST::setScaleParameters(int iSampleRate,
- double base_rate,
+void EngineBufferScaleST::setScaleParameters(double base_rate,
double* pTempoRatio,
double* pPitchRatio) {
- if (m_iSampleRate != iSampleRate) {
- m_pSoundTouch->setSampleRate(iSampleRate > 0 ? iSampleRate : 44100);
- m_iSampleRate = iSampleRate;
- }
// Negative speed means we are going backwards. pitch does not affect
// the playback direction.
@@ -109,6 +104,11 @@ void EngineBufferScaleST::setScaleParameters(int iSampleRate,
m_dPitch = *pPitchRatio;
}
+void EngineBufferScaleST::setSampleRate(int iSampleRate) {
+ m_pSoundTouch->setSampleRate(iSampleRate);
+ m_iSampleRate = iSampleRate;
+}
+
void EngineBufferScaleST::clear() {
m_pSoundTouch->clear();
}