hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

basics: Change sampleFrame to use std::array (#5536)

Browse Source 
... in order to make standard containers be able to store it. Required for
#5532 (#4899) and the recording PR.

This includes:

* removing the `LocklessRingBuffer<sampleFrame>` specialization
* passing samplerame in `StereoDelay::tick` as a reference

Additional cleanups:

* removing already unused typedef `sampleFrameA`
* add some `const_cast` to make code more readable
This commit is contained in:
Johannes Lorenz
2020-09-21 09:04:44 +02:00
committed by GitHub
parent 2f37281d02
commit 6d160fd773
7 changed files with 24 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Effect.cpp
View File

@@ -203,8 +203,8 @@ void Effect::resample( int _i, const sampleFrame * _src_buf,
}
m_srcData[_i].input_frames = _frames;
m_srcData[_i].output_frames = Engine::mixer()->framesPerPeriod();
m_srcData[_i].data_in = (float *) _src_buf[0];
m_srcData[_i].data_out = _dst_buf[0];
m_srcData[_i].data_in = const_cast<float*>(_src_buf[0].data());
m_srcData[_i].data_out = _dst_buf[0].data ();
m_srcData[_i].src_ratio = (double) _dst_sr / _src_sr;
m_srcData[_i].end_of_input = 0;
int error;

8
src/core/SampleBuffer.cpp
View File

@@ -693,8 +693,8 @@ bool SampleBuffer::play( sampleFrame * _ab, handleState * _state,
// Generate output
src_data.data_in =
getSampleFragment( play_frame, fragment_size, _loopmode, &tmp, &is_backwards,
loopStartFrame, loopEndFrame, endFrame )[0];
src_data.data_out = _ab[0];
loopStartFrame, loopEndFrame, endFrame )->data ();
src_data.data_out = _ab->data ();
src_data.input_frames = fragment_size;
src_data.output_frames = _frames;
src_data.src_ratio = 1.0 / freq_factor;
@@ -1196,8 +1196,8 @@ SampleBuffer * SampleBuffer::resample( const sample_rate_t _src_sr,
{
SRC_DATA src_data;
src_data.end_of_input = 1;
src_data.data_in = data[0];
src_data.data_out = dst_buf[0];
src_data.data_in = data->data ();
src_data.data_out = dst_buf->data ();
src_data.input_frames = frames;
src_data.output_frames = dst_frames;
src_data.src_ratio = (double) _dst_sr / _src_sr;

4
src/core/audio/AudioDevice.cpp
View File

@@ -194,8 +194,8 @@ fpp_t AudioDevice::resample( const surroundSampleFrame * _src,
}
m_srcData.input_frames = _frames;
m_srcData.output_frames = _frames;
m_srcData.data_in = (float *) _src[0];
m_srcData.data_out = _dst[0];
m_srcData.data_in = const_cast<float*>(_src[0].data());
m_srcData.data_out = _dst[0].data ();
m_srcData.src_ratio = (double) _dst_sr / _src_sr;
m_srcData.end_of_input = 0;
int error;