Make SampleBuffer adjust its members when resampling. Fixes LMMS#5218.

softrabbit · Oct 6, 2019 · cd642b1 · cd642b1
1 parent 419321d
commit cd642b1
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -387,6 +387,8 @@ void SampleBuffer::normalizeSampleRate( const sample_rate_t _src_sr,
 	{
 		SampleBuffer * resampled = resample( _src_sr,
 					mixerSampleRate() );
+
+		m_sampleRate = mixerSampleRate();
 		MM_FREE( m_data );
 		m_frames = resampled->frames();
 		m_data = MM_ALLOC( sampleFrame, m_frames );
@@ -401,6 +403,13 @@ void SampleBuffer::normalizeSampleRate( const sample_rate_t _src_sr,
 		m_loopStartFrame = m_startFrame = 0;
 		m_loopEndFrame = m_endFrame = m_frames;
 	}
+	else if( _src_sr != mixerSampleRate() )
+	{
+		m_startFrame *= ((float)mixerSampleRate() / _src_sr);
+		m_endFrame *= ((float)mixerSampleRate() / _src_sr);
+		m_loopStartFrame *= ((float)mixerSampleRate() / _src_sr);
+		m_loopEndFrame *= ((float)mixerSampleRate() / _src_sr);
+	}
 }