diff --git a/muse b/muse index 8d6707fb9cbc9..27625cfbee23e 160000 --- a/muse +++ b/muse @@ -1 +1 @@ -Subproject commit 8d6707fb9cbc9b5b52f7b7649d0dd4976dd4e0ac +Subproject commit 27625cfbee23e57fc322fbaeaf25ec1243a5ba1d diff --git a/src/playback/qml/MuseScore/Playback/mixerchannelitem.cpp b/src/playback/qml/MuseScore/Playback/mixerchannelitem.cpp index 37f595426e632..41a856472ffa6 100644 --- a/src/playback/qml/MuseScore/Playback/mixerchannelitem.cpp +++ b/src/playback/qml/MuseScore/Playback/mixerchannelitem.cpp @@ -5,7 +5,7 @@ * MuseScore Studio * Music Composition & Notation * - * Copyright (C) 2021 MuseScore Limited and others + * Copyright (C) 2026 MuseScore Limited and others * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -181,7 +181,7 @@ void MixerChannelItem::addBlankSlots(size_t count) for (size_t i = 0; i < count; ++i) { AudioFxParams params; params.chainOrder = resolveNewBlankOutputResourceItemOrder(); - m_outputResourceItems.insert(params.chainOrder, buildOutputResourceItem(std::move(params))); + m_outputResourceItems.insert(params.chainOrder, buildOutputResourceItem(params)); } emit outputResourceItemListChanged(); @@ -365,7 +365,7 @@ void MixerChannelItem::loadSoloMuteState(const notation::INotationSoloMuteState: } } -void MixerChannelItem::subscribeOnAudioSignalChanges(AudioSignalChanges&& audioSignalChanges) +void MixerChannelItem::subscribeOnAudioSignalChanges(AudioSignalChanges& audioSignalChanges) { m_audioSignalChanges = audioSignalChanges; diff --git a/src/playback/qml/MuseScore/Playback/mixerchannelitem.h b/src/playback/qml/MuseScore/Playback/mixerchannelitem.h index 888e9da7e631d..43ab824c8f6af 100644 --- a/src/playback/qml/MuseScore/Playback/mixerchannelitem.h +++ b/src/playback/qml/MuseScore/Playback/mixerchannelitem.h @@ -120,7 +120,7 @@ class MixerChannelItem : public QObject, public muse::async::Asyncable, public m void loadOutputParams(const project::AudioOutputParams& newParams); void loadSoloMuteState(const notation::INotationSoloMuteState::SoloMuteState& newState); - void subscribeOnAudioSignalChanges(muse::audio::AudioSignalChanges&& audioSignalChanges); + void subscribeOnAudioSignalChanges(muse::audio::AudioSignalChanges& audioSignalChanges); bool outputOnly() const; diff --git a/src/playback/qml/MuseScore/Playback/mixerpanelmodel.cpp b/src/playback/qml/MuseScore/Playback/mixerpanelmodel.cpp index 721954da8ed6d..d8d054367e8e7 100644 --- a/src/playback/qml/MuseScore/Playback/mixerpanelmodel.cpp +++ b/src/playback/qml/MuseScore/Playback/mixerpanelmodel.cpp @@ -270,13 +270,13 @@ void MixerPanelModel::setupConnections() TrackId trackId = muse::value(auxTrackIdMap, index); if (MixerChannelItem* item = findChannelItem(trackId)) { - item->loadSoloMuteState(std::move(newSoloMuteState)); + item->loadSoloMuteState(newSoloMuteState); } }); playback()->sourceParamsChanged().onReceive(this, [this](const TrackId trackId, const AudioSourceParams& params) { if (MixerChannelItem* item = findChannelItem(trackId)) { - item->loadInputParams(std::move(params)); + item->loadInputParams(params); } }); @@ -284,7 +284,7 @@ void MixerPanelModel::setupConnections() if (MixerChannelItem* item = findChannelItem(trackId)) { AudioOutputParams outParams = audioSettings()->trackOutputParams(item->instrumentTrackId()); outParams.fxChain = params; - loadOutputParams(item, std::move(outParams)); + loadOutputParams(item, outParams); } }); @@ -292,7 +292,7 @@ void MixerPanelModel::setupConnections() if (m_masterChannelItem) { AudioOutputParams outParams = audioSettings()->masterAudioOutputParams(); outParams.fxChain = params; - loadOutputParams(m_masterChannelItem, std::move(outParams)); + loadOutputParams(m_masterChannelItem, outParams); } }, Asyncable::Mode::SetReplace); @@ -418,13 +418,13 @@ MixerChannelItem* MixerPanelModel::buildInstrumentChannelItem(const TrackId trac playback()->params(trackId) .onResolve(this, [this, trackId, instrumentTrackId](const TrackParams& params) { if (MixerChannelItem* item = findChannelItem(trackId)) { - item->loadInputParams(std::move(params.source)); + item->loadInputParams(params.source); AudioOutputParams outParams = audioSettings()->trackOutputParams(instrumentTrackId); outParams.fxChain = params.fxChain; outParams.auxSends = params.auxSends; outParams.setControl(params.control); - loadOutputParams(item, std::move(outParams)); + loadOutputParams(item, outParams); } }) .onReject(this, [](int errCode, std::string text) { @@ -446,7 +446,7 @@ MixerChannelItem* MixerPanelModel::buildInstrumentChannelItem(const TrackId trac playback()->signalChanges(trackId) .onResolve(this, [this, trackId](AudioSignalChanges signalChanges) { if (MixerChannelItem* item = findChannelItem(trackId)) { - item->subscribeOnAudioSignalChanges(std::move(signalChanges)); + item->subscribeOnAudioSignalChanges(signalChanges); } }) .onReject(this, [](int errCode, std::string text) { @@ -503,16 +503,12 @@ MixerChannelItem* MixerPanelModel::buildAuxChannelItem(aux_channel_idx_t index, }); AudioOutputParams outParams = audioSettings()->auxOutputParams(index); - if (MixerChannelItem* existingItem = findChannelItem(trackId)) { - loadOutputParams(existingItem, std::move(outParams)); - } else { - loadOutputParams(item, std::move(outParams)); - } + loadOutputParams(item, outParams); playback()->signalChanges(trackId) .onResolve(this, [this, trackId](AudioSignalChanges signalChanges) { if (MixerChannelItem* item = findChannelItem(trackId)) { - item->subscribeOnAudioSignalChanges(std::move(signalChanges)); + item->subscribeOnAudioSignalChanges(signalChanges); } }) .onReject(this, [](int errCode, std::string text) { @@ -545,14 +541,12 @@ MixerChannelItem* MixerPanelModel::buildMasterChannelItem() item->setTitle(muse::qtrc("playback", "Master")); AudioOutputParams outParams = audioSettings()->masterAudioOutputParams(); - if (m_masterChannelItem && item == m_masterChannelItem) { - loadOutputParams(item, std::move(outParams)); - } + loadOutputParams(item, outParams); playback()->masterSignalChanges() .onResolve(this, [this, item](AudioSignalChanges signalChanges) { if (m_masterChannelItem && item == m_masterChannelItem) { - item->subscribeOnAudioSignalChanges(std::move(signalChanges)); + item->subscribeOnAudioSignalChanges(signalChanges); } }) .onReject(this, [](int errCode, std::string text) { @@ -591,13 +585,13 @@ MixerChannelItem* MixerPanelModel::findChannelItem(const TrackId& trackId) const return nullptr; } -void MixerPanelModel::loadOutputParams(MixerChannelItem* item, AudioOutputParams&& params) +void MixerPanelModel::loadOutputParams(MixerChannelItem* item, const AudioOutputParams& params) { IF_ASSERT_FAILED(item) { return; } - item->loadOutputParams(std::move(params)); + item->loadOutputParams(params); updateOutputResourceItemCount(); } diff --git a/src/playback/qml/MuseScore/Playback/mixerpanelmodel.h b/src/playback/qml/MuseScore/Playback/mixerpanelmodel.h index 3fc7bb592bbc6..f78076c95fe7a 100644 --- a/src/playback/qml/MuseScore/Playback/mixerpanelmodel.h +++ b/src/playback/qml/MuseScore/Playback/mixerpanelmodel.h @@ -107,7 +107,7 @@ class MixerPanelModel : public QAbstractListModel, public QQmlParserStatus, publ MixerChannelItem* findChannelItem(const muse::audio::TrackId& trackId) const; - void loadOutputParams(MixerChannelItem* item, project::AudioOutputParams&& params); + void loadOutputParams(MixerChannelItem* item, const project::AudioOutputParams& params); void updateOutputResourceItemCount(); project::INotationProjectPtr currentProject() const;