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

Revert "Remove use of shared ownership for Sample"

Browse Source 
This reverts commit 1d452331d1.
In some cases, you can infact do away with shared ownership
on Sample if there are no writes being made to either of them,
but to make sure changes are reflected to the object in cases
where writes do happen, they should work with the same one.
This commit is contained in:
sakertooth
2023-09-01 14:25:46 -04:00
parent b1516ea40e
commit 5ac915971b
10 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
plugins/AudioFileProcessor/AudioFileProcessor.cpp
View File

@@ -77,6 +77,7 @@ Plugin::Descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
AudioFileProcessor::AudioFileProcessor( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &audiofileprocessor_plugin_descriptor ),
m_sample(std::make_shared<Sample>()),
m_ampModel( 100, 0, 500, 1, this, tr( "Amplify" ) ),
m_startPointModel( 0, 0, 1, 0.0000001f, this, tr( "Start of sample" ) ),
m_endPointModel( 1, 0, 1, 0.0000001f, this, tr( "End of sample" ) ),
@@ -124,18 +125,18 @@ void AudioFileProcessor::playNote( NotePlayHandle * _n,
// played.
if( m_stutterModel.value() == true && _n->frequency() < 20.0 )
{
m_nextPlayStartPoint = m_sample.startFrame();
m_nextPlayStartPoint = m_sample->startFrame();
m_nextPlayBackwards = false;
return;
}
if( !_n->m_pluginData )
{
if (m_stutterModel.value() == true && m_nextPlayStartPoint >= m_sample.endFrame())
if (m_stutterModel.value() == true && m_nextPlayStartPoint >= m_sample->endFrame())
{
// Restart playing the note if in stutter mode, not in loop mode,
// and we're at the end of the sample.
m_nextPlayStartPoint = m_sample.startFrame();
m_nextPlayStartPoint = m_sample->startFrame();
m_nextPlayBackwards = false;
}
// set interpolation mode for libsamplerate
@@ -164,7 +165,8 @@ void AudioFileProcessor::playNote( NotePlayHandle * _n,
if( ! _n->isFinished() )
{
if (m_sample.play(_working_buffer + offset,
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
if (std::atomic_load(&m_sample)->play(_working_buffer + offset,
static_cast<Sample::PlaybackState*>(_n->m_pluginData),
frames, _n->frequency(),
static_cast<Sample::Loop>(m_loopModel.value())))
@@ -205,10 +207,10 @@ void AudioFileProcessor::deleteNotePluginData( NotePlayHandle * _n )
void AudioFileProcessor::saveSettings(QDomDocument& doc, QDomElement& elem)
{
elem.setAttribute("src", m_sample.sampleFile());
if (m_sample.sampleFile().isEmpty())
elem.setAttribute("src", m_sample->sampleFile());
if (m_sample->sampleFile().isEmpty())
{
elem.setAttribute("sampledata", m_sample.toBase64());
elem.setAttribute("sampledata", m_sample->toBase64());
}
m_reverseModel.saveSettings(doc, elem, "reversed");
m_loopModel.saveSettings(doc, elem, "looped");
@@ -229,17 +231,18 @@ void AudioFileProcessor::loadSettings(const QDomElement& elem)
{
setAudioFile(elem.attribute("src"), false);
QString absolutePath = PathUtil::toAbsolute(m_sample.sampleFile());
QString absolutePath = PathUtil::toAbsolute(m_sample->sampleFile());
if (!QFileInfo(absolutePath).exists())
{
QString message = tr("Sample not found: %1").arg(m_sample.sampleFile());
QString message = tr("Sample not found: %1").arg(m_sample->sampleFile());
Engine::getSong()->collectError(message);
}
}
else if (!elem.attribute("sampledata").isEmpty())
{
auto buffer = gui::SampleLoader::createBufferFromBase64(elem.attribute("srcdata"));
m_sample = Sample(std::move(buffer));
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_sample, std::make_shared<Sample>(std::move(buffer)));
}
m_loopModel.loadSettings(elem, "looped");
@@ -298,7 +301,7 @@ int AudioFileProcessor::getBeatLen( NotePlayHandle * _n ) const
const float freq_factor = baseFreq / _n->frequency() *
Engine::audioEngine()->processingSampleRate() / Engine::audioEngine()->baseSampleRate();
return static_cast<int>(floorf((m_sample.endFrame() - m_sample.startFrame()) * freq_factor));
return static_cast<int>(floorf((m_sample->endFrame() - m_sample->startFrame()) * freq_factor));
}
@@ -319,8 +322,8 @@ void AudioFileProcessor::setAudioFile( const QString & _audio_file,
// is current channel-name equal to previous-filename??
if( _rename &&
( instrumentTrack()->name() ==
QFileInfo(m_sample.sampleFile()).fileName() ||
m_sample.sampleFile().isEmpty()))
QFileInfo(m_sample->sampleFile()).fileName() ||
m_sample->sampleFile().isEmpty()))
{
// then set it to new one
instrumentTrack()->setName( PathUtil::cleanName( _audio_file ) );
@@ -328,7 +331,8 @@ void AudioFileProcessor::setAudioFile( const QString & _audio_file,
// else we don't touch the track-name, because the user named it self
auto buffer = gui::SampleLoader::createBufferFromFile(_audio_file);
m_sample = Sample(std::move(buffer));
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
std::atomic_store(&m_sample, std::make_shared<Sample>(std::move(buffer)));
loopPointChanged();
emit sampleUpdated();
@@ -339,8 +343,8 @@ void AudioFileProcessor::setAudioFile( const QString & _audio_file,
void AudioFileProcessor::reverseModelChanged()
{
m_sample.setReversed(m_reverseModel.value());
m_nextPlayStartPoint = m_sample.startFrame();
m_sample->setReversed(m_reverseModel.value());
m_nextPlayStartPoint = m_sample->startFrame();
m_nextPlayBackwards = false;
emit sampleUpdated();
}
@@ -350,14 +354,14 @@ void AudioFileProcessor::reverseModelChanged()
void AudioFileProcessor::ampModelChanged()
{
m_sample.setAmplification(m_ampModel.value() / 100.0f);
m_sample->setAmplification(m_ampModel.value() / 100.0f);
emit sampleUpdated();
}
void AudioFileProcessor::stutterModelChanged()
{
m_nextPlayStartPoint = m_sample.startFrame();
m_nextPlayStartPoint = m_sample->startFrame();
m_nextPlayBackwards = false;
}
@@ -426,14 +430,14 @@ void AudioFileProcessor::loopPointChanged()
void AudioFileProcessor::pointChanged()
{
const auto f_start = static_cast<f_cnt_t>(m_startPointModel.value() * m_sample.sampleSize());
const auto f_end = static_cast<f_cnt_t>(m_endPointModel.value() * m_sample.sampleSize());
const auto f_loop = static_cast<f_cnt_t>(m_loopPointModel.value() * m_sample.sampleSize());
const auto f_start = static_cast<f_cnt_t>(m_startPointModel.value() * m_sample->sampleSize());
const auto f_end = static_cast<f_cnt_t>(m_endPointModel.value() * m_sample->sampleSize());
const auto f_loop = static_cast<f_cnt_t>(m_loopPointModel.value() * m_sample->sampleSize());
m_nextPlayStartPoint = f_start;
m_nextPlayBackwards = false;
m_sample.setAllPointFrames(f_start, f_end, f_loop, f_end);
m_sample->setAllPointFrames(f_start, f_end, f_loop, f_end);
emit dataChanged();
}
@@ -601,7 +605,7 @@ void AudioFileProcessorView::newWaveView()
delete m_waveView;
m_waveView = 0;
}
m_waveView = new AudioFileProcessorWaveView(this, 245, 75, &castModel<AudioFileProcessor>()->m_sample);
m_waveView = new AudioFileProcessorWaveView(this, 245, 75, castModel<AudioFileProcessor>()->m_sample.get());
m_waveView->move( 2, 172 );
m_waveView->setKnobs(
dynamic_cast<AudioFileProcessorWaveView::knob *>( m_startKnob ),
@@ -648,7 +652,7 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
QString file_name = "";
int idx = a->m_sample.sampleFile().length();
int idx = a->m_sample->sampleFile().length();
p.setFont( pointSize<8>( font() ) );
@@ -659,7 +663,7 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
while( idx > 0 &&
fm.size( Qt::TextSingleLine, file_name + "..." ).width() < 210 )
{
file_name = a->m_sample.sampleFile()[--idx] + file_name;
file_name = a->m_sample->sampleFile()[--idx] + file_name;
}
if( idx > 0 )
@@ -676,6 +680,7 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
void AudioFileProcessorView::sampleUpdated()
{
m_waveView->m_sample = castModel<AudioFileProcessor>()->m_sample.get();
m_waveView->updateSampleRange();
m_waveView->update();
update();

2
plugins/AudioFileProcessor/AudioFileProcessor.h
View File

@@ -97,7 +97,7 @@ signals:
void sampleUpdated();
private:
Sample m_sample;
std::shared_ptr<Sample> m_sample;
FloatModel m_ampModel;
FloatModel m_startPointModel;

20
plugins/Patman/Patman.cpp
View File

@@ -151,9 +151,9 @@ void PatmanInstrument::playNote( NotePlayHandle * _n,
auto hdata = (handle_data*)_n->m_pluginData;
float play_freq = hdata->tuned ? _n->frequency() :
hdata->sample.frequency();
hdata->sample->frequency();
if (hdata->sample.play(_working_buffer + offset, hdata->state, frames,
if (hdata->sample->play(_working_buffer + offset, hdata->state, frames,
play_freq, m_loopedModel.value() ? Sample::Loop::On : Sample::Loop::Off))
{
applyRelease( _working_buffer, _n );
@@ -357,13 +357,13 @@ PatmanInstrument::LoadError PatmanInstrument::loadPatch(
}
}
auto psample = Sample(data, frames, sample_rate);
psample.setFrequency(root_freq / 1000.0f);
auto psample = std::make_shared<Sample>(data, frames, sample_rate);
psample->setFrequency(root_freq / 1000.0f);
if( modes & MODES_LOOPING )
{
psample.setLoopStartFrame(loop_start);
psample.setLoopEndFrame(loop_end);
psample->setLoopStartFrame( loop_start );
psample->setLoopEndFrame( loop_end );
}
m_patchSamples.push_back(psample);
@@ -394,24 +394,24 @@ void PatmanInstrument::selectSample( NotePlayHandle * _n )
const float freq = _n->frequency();
float min_dist = HUGE_VALF;
const Sample* sample = nullptr;
std::shared_ptr<Sample> sample = nullptr;
for (const auto& patchSample : m_patchSamples)
{
float patch_freq = patchSample.frequency();
float patch_freq = patchSample->frequency();
float dist = freq >= patch_freq ? freq / patch_freq :
patch_freq / freq;
if( dist < min_dist )
{
min_dist = dist;
sample = &patchSample;
sample = patchSample;
}
}
auto hdata = new handle_data;
hdata->tuned = m_tunedModel.value();
if (sample) { hdata->sample = *sample; }
hdata->sample = sample ? sample : std::make_shared<Sample>();
hdata->state = new Sample::PlaybackState(_n->hasDetuningInfo());
_n->m_pluginData = hdata;

4
plugins/Patman/Patman.h
View File

@@ -90,11 +90,11 @@ private:
MM_OPERATORS
Sample::PlaybackState* state;
bool tuned;
Sample sample;
std::shared_ptr<Sample> sample;
};
QString m_patchFile;
QVector<Sample> m_patchSamples;
QVector<std::shared_ptr<Sample>> m_patchSamples;
BoolModel m_loopedModel;
BoolModel m_tunedModel;