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

Enforce std::atomic_load for users of std::shared_ptr<const SampleBuffer>

Browse Source
This commit is contained in:
sakertooth
2023-08-31 11:42:34 -04:00
parent 48b545bcdf
commit 2b6166fc4e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/TripleOscillator/TripleOscillator.cpp
View File

@@ -262,8 +262,8 @@ void TripleOscillator::saveSettings( QDomDocument & _doc, QDomElement & _this )
"modalgo" + QString::number( i+1 ) );
m_osc[i]->m_useWaveTableModel.saveSettings( _doc, _this,
"useWaveTable" + QString::number (i+1 ) );
_this.setAttribute( "userwavefile" + is,
m_osc[i]->m_sampleBuffer->audioFile() );
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
_this.setAttribute("userwavefile" + is, std::atomic_load(&m_osc[i]->m_sampleBuffer)->audioFile());
}
}
@@ -364,8 +364,9 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
oscs_r[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
}
oscs_l[i]->setUserWave( m_osc[i]->m_sampleBuffer );
oscs_r[i]->setUserWave( m_osc[i]->m_sampleBuffer );
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
oscs_l[i]->setUserWave(std::atomic_load(&m_osc[i]->m_sampleBuffer));
oscs_r[i]->setUserWave(std::atomic_load(&m_osc[i]->m_sampleBuffer));
}

3
src/core/LfoController.cpp
View File

@@ -197,7 +197,8 @@ void LfoController::saveSettings( QDomDocument & _doc, QDomElement & _this )
m_phaseModel.saveSettings( _doc, _this, "phase" );
m_waveModel.saveSettings( _doc, _this, "wave" );
m_multiplierModel.saveSettings( _doc, _this, "multiplier" );
_this.setAttribute( "userwavefile" , m_userDefSampleBuffer->audioFile() );
// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
_this.setAttribute("userwavefile", std::atomic_load(&m_userDefSampleBuffer)->audioFile());
}