Merge pull request #30895 from RomanPudashkin/online_sounds_fixes

[4.6.4] Online sounds: various fixes

Author: RomanPudashkin

src/engraving/playback/playbackmodel.cpp

@@ -147,6 +147,14 @@ void PlaybackModel::reload()
 void PlaybackModel::setSendEventsOnScoreChange(const InstrumentTrackId& trackId, bool send)
 {
     m_sendEventsOnScoreChangeMap[trackId] = send;
+
+    if (send) {
+        auto it = m_changedTrackIdSet.find(trackId);
+        if (it != m_changedTrackIdSet.end()) {
+            sendEvents(trackId);
+            m_changedTrackIdSet.erase(it);
+        }
+    }
 }
 
 void PlaybackModel::sendEventsForChangedTracks()
@@ -158,8 +166,7 @@ void PlaybackModel::sendEventsForChangedTracks()
     TRACEFUNC;
 
     for (const InstrumentTrackId& trackId : m_changedTrackIdSet) {
-        PlaybackData& data = m_playbackDataMap[trackId];
-        data.mainStream.send(data.originEvents, data.dynamics);
+        sendEvents(trackId);
     }
 
     m_changedTrackIdSet.clear();
@@ -896,13 +903,8 @@ void PlaybackModel::collectChangesTracks(const InstrumentTrackId& trackId, Chang
 void PlaybackModel::notifyAboutChanges(const InstrumentTrackIdSet& oldTracks, const InstrumentTrackIdSet& changedTracks)
 {
     for (const InstrumentTrackId& trackId : changedTracks) {
-        auto search = m_playbackDataMap.find(trackId);
-        if (search == m_playbackDataMap.cend()) {
-            continue;
-        }
-
         if (muse::value(m_sendEventsOnScoreChangeMap, trackId, false)) {
-            search->second.mainStream.send(search->second.originEvents, search->second.dynamics);
+            sendEvents(trackId);
         } else {
             m_changedTrackIdSet.insert(trackId);
         }
@@ -919,6 +921,17 @@ void PlaybackModel::notifyAboutChanges(const InstrumentTrackIdSet& oldTracks, co
     }
 }
 
+void PlaybackModel::sendEvents(const InstrumentTrackId& trackId)
+{
+    auto it = m_playbackDataMap.find(trackId);
+    if (it == m_playbackDataMap.cend()) {
+        return;
+    }
+
+    PlaybackData& data = it->second;
+    data.mainStream.send(data.originEvents, data.dynamics);
+}
+
 void PlaybackModel::removeTrackEvents(const InstrumentTrackId& trackId, const muse::mpe::timestamp_t timestampFrom,
                                       const muse::mpe::timestamp_t timestampTo)
 {

src/engraving/playback/playbackmodel.h

@@ -140,6 +140,8 @@ class PlaybackModel : public muse::Injectable, public muse::async::Asyncable
     void collectChangesTracks(const InstrumentTrackId& trackId, ChangedTrackIdSet* result);
     void notifyAboutChanges(const InstrumentTrackIdSet& oldTracks, const InstrumentTrackIdSet& changedTracks);
 
+    void sendEvents(const InstrumentTrackId& trackId);
+
     void removeEventsFromRange(const track_idx_t trackFrom, const track_idx_t trackTo, const muse::mpe::timestamp_t timestampFrom = -1,
                                const muse::mpe::timestamp_t timestampTo = -1);
     void removeTrackEvents(const InstrumentTrackId& trackId, const muse::mpe::timestamp_t timestampFrom = -1,

src/engraving/tests/playback/playbackmodel_tests.cpp

@@ -960,6 +960,16 @@ TEST_F(Engraving_PlaybackModelTests, SimpleRepeat_Changes_Notification)
 
     // [THEN] Events received
     EXPECT_EQ(receivedEventCount, expectedEventCount);
+
+    // [WHEN] Send score changes
+    score->changesChannel().send(changes);
+
+    // [WHEN] Re-enable sending events on score change
+    receivedEventCount = 0;
+    model.setSendEventsOnScoreChange(trackId, true);
+
+    // [THEN] Events are sent and received immediately
+    EXPECT_EQ(receivedEventCount, expectedEventCount);
 }
 
 /**

src/playback/qml/MuseScore/Playback/NotationRegionsBeingProcessedView.qml

@@ -43,16 +43,11 @@ Loader {
         regionsModel.load()
     }
 
-    onLoaded: {
-        item.x = root.notationViewRect.x
-        item.y = root.notationViewRect.y
-        item.height = root.notationViewRect.height
-        item.width = root.notationViewRect.width
-        item.model = regionsModel
-    }
-
     sourceComponent: Item {
-        property alias model: repeater.model
+        x: root.notationViewRect.x
+        y: root.notationViewRect.y
+        width: root.notationViewRect.width
+        height: root.notationViewRect.height
 
         clip: true
 
@@ -61,6 +56,8 @@ Loader {
 
             anchors.fill: parent
 
+            model: regionsModel
+
             delegate: AudioProcessingProgressBar {
                 id: progressBar
 

src/playback/view/internal/notationregionsbeingprocessedmodel.cpp

@@ -25,6 +25,7 @@
 using namespace muse::audio;
 using namespace mu::playback;
 using namespace mu::engraving;
+using namespace mu::notation;
 
 static const Segment* findSegmentFrom(const Score* score, const System* system,
                                       const int tickFrom, const staff_idx_t staffIdx)
@@ -133,7 +134,10 @@ void NotationRegionsBeingProcessedModel::load()
         onOnlineSoundsChanged();
     });
 
+    listenViewModeChanges();
+
     globalContext()->currentNotationChanged().onNotify(this, [this]() {
+        listenViewModeChanges();
         updateRegionsBeingProcessed(m_tracksBeingProcessed);
     });
 
@@ -247,6 +251,18 @@ void NotationRegionsBeingProcessedModel::onIsPlayingChanged()
     }
 }
 
+void NotationRegionsBeingProcessedModel::listenViewModeChanges()
+{
+    INotationPtr notation = globalContext()->currentNotation();
+    if (!notation) {
+        return;
+    }
+
+    notation->viewModeChanged().onNotify(this, [this]() {
+        updateRegionsBeingProcessed(m_tracksBeingProcessed);
+    });
+}
+
 void NotationRegionsBeingProcessedModel::startListeningToProgress(const TrackId trackId)
 {
     const IPlaybackController::InstrumentTrackIdMap& instrumentTrackIdMap = playbackController()->instrumentTrackIdMap();

src/playback/view/internal/notationregionsbeingprocessedmodel.h

@@ -122,6 +122,8 @@ public slots:
     void onOnlineSoundsChanged();
     void onIsPlayingChanged();
 
+    void listenViewModeChanges();
+
     void startListeningToProgress(const muse::audio::TrackId trackId);
     void stopListeningToProgress(const muse::audio::TrackId trackId);