1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

SamplerPluginDemo: Fix unqualified uses of std::move

This commit is contained in:
reuk 2023-03-02 13:18:38 +00:00
parent 7da615a7a3
commit 5db288e834
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C

View file

@ -208,7 +208,7 @@ class MPESamplerSound final
public: public:
void setSample (std::unique_ptr<Sample> value) void setSample (std::unique_ptr<Sample> value)
{ {
sample = move (value); sample = std::move (value);
setLoopPointsInSeconds (loopPoints); setLoopPointsInSeconds (loopPoints);
} }
@ -995,7 +995,7 @@ public:
void setSampleReader (std::unique_ptr<AudioFormatReaderFactory> readerFactory, void setSampleReader (std::unique_ptr<AudioFormatReaderFactory> readerFactory,
UndoManager* undoManager) UndoManager* undoManager)
{ {
sampleReader.setValue (move (readerFactory), undoManager); sampleReader.setValue (std::move (readerFactory), undoManager);
setLoopPointsSeconds (Range<double> (0, getSampleLengthSeconds()).constrainRange (loopPointsSeconds), setLoopPointsSeconds (Range<double> (0, getSampleLengthSeconds()).constrainRange (loopPointsSeconds),
undoManager); undoManager);
} }
@ -1862,7 +1862,7 @@ public:
UndoManager& undoManager) UndoManager& undoManager)
: dataModel (model), : dataModel (model),
waveformView (model, visibleRange), waveformView (model, visibleRange),
playbackOverlay (visibleRange, move (provider)), playbackOverlay (visibleRange, std::move (provider)),
loopPoints (dataModel, visibleRange, undoManager), loopPoints (dataModel, visibleRange, undoManager),
ruler (visibleRange) ruler (visibleRange)
{ {
@ -1918,7 +1918,7 @@ public:
PlaybackPositionOverlay::Provider provider, PlaybackPositionOverlay::Provider provider,
UndoManager& um) UndoManager& um)
: dataModel (model), : dataModel (model),
waveformEditor (dataModel, move (provider), um), waveformEditor (dataModel, std::move (provider), um),
undoManager (um) undoManager (um)
{ {
dataModel.addListener (*this); dataModel.addListener (*this);
@ -2125,7 +2125,7 @@ public:
auto sample = std::unique_ptr<Sample> (new Sample (*reader, 10.0)); auto sample = std::unique_ptr<Sample> (new Sample (*reader, 10.0));
auto lengthInSeconds = sample->getLength() / sample->getSampleRate(); auto lengthInSeconds = sample->getLength() / sample->getSampleRate();
sound->setLoopPointsInSeconds ({lengthInSeconds * 0.1, lengthInSeconds * 0.9 }); sound->setLoopPointsInSeconds ({lengthInSeconds * 0.1, lengthInSeconds * 0.9 });
sound->setSample (move (sample)); sound->setSample (std::move (sample));
// Start with the max number of voices // Start with the max number of voices
for (auto i = 0; i != maxVoices; ++i) for (auto i = 0; i != maxVoices; ++i)
@ -2218,7 +2218,7 @@ public:
void operator() (SamplerAudioProcessor& proc) void operator() (SamplerAudioProcessor& proc)
{ {
proc.readerFactory = move (readerFactory); proc.readerFactory = std::move (readerFactory);
auto sound = proc.samplerSound; auto sound = proc.samplerSound;
sound->setSample (std::move (sample)); sound->setSample (std::move (sample));
auto numberOfVoices = proc.synthesiser.getNumVoices(); auto numberOfVoices = proc.synthesiser.getNumVoices();
@ -2247,15 +2247,15 @@ public:
if (fact == nullptr) if (fact == nullptr)
{ {
commands.push (SetSampleCommand (move (fact), commands.push (SetSampleCommand (std::move (fact),
nullptr, nullptr,
move (newSamplerVoices))); std::move (newSamplerVoices)));
} }
else if (auto reader = fact->make (formatManager)) else if (auto reader = fact->make (formatManager))
{ {
commands.push (SetSampleCommand (move (fact), commands.push (SetSampleCommand (std::move (fact),
std::unique_ptr<Sample> (new Sample (*reader, 10.0)), std::unique_ptr<Sample> (new Sample (*reader, 10.0)),
move (newSamplerVoices))); std::move (newSamplerVoices)));
} }
} }
@ -2352,7 +2352,7 @@ public:
for (auto i = 0; i != numberOfVoices; ++i) for (auto i = 0; i != numberOfVoices; ++i)
newSamplerVoices.emplace_back (new MPESamplerVoice (loadedSamplerSound)); newSamplerVoices.emplace_back (new MPESamplerVoice (loadedSamplerSound));
commands.push (SetNumVoicesCommand (move (newSamplerVoices))); commands.push (SetNumVoicesCommand (std::move (newSamplerVoices)));
} }
// These accessors are just for an 'overview' and won't give the exact // These accessors are just for an 'overview' and won't give the exact
@ -2411,7 +2411,8 @@ private:
mpeSettings.setVoiceStealingEnabled (state.voiceStealingEnabled, nullptr); mpeSettings.setVoiceStealingEnabled (state.voiceStealingEnabled, nullptr);
mpeSettings.setMPEZoneLayout (state.mpeZoneLayout, nullptr); mpeSettings.setMPEZoneLayout (state.mpeZoneLayout, nullptr);
dataModel.setSampleReader (move (state.readerFactory), nullptr); dataModel.setSampleReader (std::move (state.readerFactory), nullptr);
dataModel.setLoopPointsSeconds (state.loopPointsSeconds, nullptr); dataModel.setLoopPointsSeconds (state.loopPointsSeconds, nullptr);
dataModel.setCentreFrequencyHz (state.centreFrequencyHz, nullptr); dataModel.setCentreFrequencyHz (state.centreFrequencyHz, nullptr);
dataModel.setLoopMode (state.loopMode, nullptr); dataModel.setLoopMode (state.loopMode, nullptr);