Play from selection: show online sound errors

Author: RomanPudashkin

src/playback/internal/playbackcontroller.cpp

@@ -99,7 +99,7 @@ PlaybackController::PlaybackController()
 void PlaybackController::init()
 {
     dispatcher()->reg(this, PLAY_CODE, [this]() { PlaybackController::togglePlay(); });
-    dispatcher()->reg(this, PLAY_FROM_SELECTION, this, &PlaybackController::playFromSelection);
+    dispatcher()->reg(this, PLAY_FROM_SELECTION, [this]() { &PlaybackController::playFromSelection() });
     dispatcher()->reg(this, STOP_CODE, [this]() { PlaybackController::pause(/*select*/ false); });
     dispatcher()->reg(this, PAUSE_AND_SELECT_CODE, [this]() { PlaybackController::pause(/*select*/ true); });
     dispatcher()->reg(this, REWIND_CODE, this, &PlaybackController::rewind);
@@ -656,28 +656,14 @@ void PlaybackController::togglePlay(bool showErrors)
     }
 }
 
-void PlaybackController::play()
+void PlaybackController::playFromSelection(bool showErrors)
 {
-    IF_ASSERT_FAILED(currentPlayer()) {
+    if (selection()->isNone()) {
         return;
     }
 
-    if (isLoopEnabled()) {
-        secs_t startSecs = playbackStartSecs();
-        seek(startSecs);
-    }
-
-    secs_t delay = 0.;
-    if (notationConfiguration()->isCountInEnabled()) {
-        notationPlayback()->triggerCountIn(m_currentTick, delay);
-    }
-
-    currentPlayer()->play(delay);
-}
-
-void PlaybackController::playFromSelection()
-{
-    if (selection()->isNone()) {
+    if (showErrors && m_onlineSoundsController->shouldShowOnlineSoundsProcessingError(isPlaying())) {
+        m_onlineSoundsController->showOnlineSoundsProcessingError([this]() { playFromSelection(false /*showErrors*/); });
         return;
     }
 
@@ -707,6 +693,25 @@ void PlaybackController::playFromSelection()
     }
 }
 
+void PlaybackController::play()
+{
+    IF_ASSERT_FAILED(currentPlayer()) {
+        return;
+    }
+
+    if (isLoopEnabled()) {
+        secs_t startSecs = playbackStartSecs();
+        seek(startSecs);
+    }
+
+    secs_t delay = 0.;
+    if (notationConfiguration()->isCountInEnabled()) {
+        notationPlayback()->triggerCountIn(m_currentTick, delay);
+    }
+
+    currentPlayer()->play(delay);
+}
+
 void PlaybackController::rewind(const ActionData& args)
 {
     secs_t startSecs = playbackStartSecs();

src/playback/internal/playbackcontroller.h

@@ -168,9 +168,9 @@ class PlaybackController : public IPlaybackController, public muse::actions::Act
     void addSoundFlagsIfNeed(const std::vector<engraving::EngravingItem*>& selection);
 
     void togglePlay(bool showErrors = true);
+    void playFromSelection(bool showErrors = true);
     void rewind(const muse::actions::ActionData& args);
     void play();
-    void playFromSelection();
     void pause(bool select = false);
     void stop();
     void resume();