Refactor: add StatusChanged action

Author: RomanPudashkin

src/framework/audio/engine/iclock.h

@@ -49,7 +49,6 @@ class IClock
     virtual bool isRunning() const = 0;
 
     virtual PlaybackStatus status() const = 0;
-    virtual async::Channel<PlaybackStatus> statusChanged() const = 0;
 
     virtual msecs_t timeDuration() const = 0;
     virtual void setTimeDuration(const msecs_t duration) = 0;
@@ -61,6 +60,7 @@ class IClock
     virtual async::Channel<secs_t> timeChanged() const = 0;
 
     enum ActionType {
+        StatusChanged,
         Seek,
         LoopEndReached,
         CountDownEnded,

src/framework/audio/engine/internal/clock.cpp

@@ -32,7 +32,6 @@ Clock::Clock()
                           .name("audio::clock::timeChangedInSecs")
                           .disableWaitPendingsOnSend())
 {
-    m_status.set(PlaybackStatus::Stopped);
 }
 
 msecs_t Clock::currentTime() const
@@ -82,7 +81,8 @@ void Clock::setCurrentTime(msecs_t time)
 
 void Clock::start()
 {
-    m_status.set(PlaybackStatus::Running);
+    m_status = PlaybackStatus::Running;
+    onAction(ActionType::StatusChanged, m_currentTime);
 }
 
 void Clock::reset()
@@ -94,19 +94,22 @@ void Clock::reset()
 
 void Clock::stop()
 {
-    m_status.set(PlaybackStatus::Stopped);
+    m_status = PlaybackStatus::Stopped;
+    onAction(ActionType::StatusChanged, m_currentTime);
     seek(0);
     m_countDown = 0;
 }
 
 void Clock::pause()
 {
-    m_status.set(PlaybackStatus::Paused);
+    m_status = PlaybackStatus::Paused;
+    onAction(ActionType::StatusChanged, m_currentTime);
 }
 
 void Clock::resume()
 {
-    m_status.set(PlaybackStatus::Running);
+    m_status = PlaybackStatus::Running;
+    onAction(ActionType::StatusChanged, m_currentTime);
     seek(m_currentTime);
 }
 
@@ -155,7 +158,7 @@ void Clock::setCountDown(const msecs_t duration)
 
 bool Clock::isRunning() const
 {
-    return m_status.val == PlaybackStatus::Running;
+    return m_status == PlaybackStatus::Running;
 }
 
 async::Channel<secs_t> Clock::timeChanged() const
@@ -165,12 +168,7 @@ async::Channel<secs_t> Clock::timeChanged() const
 
 PlaybackStatus Clock::status() const
 {
-    return m_status.val;
-}
-
-async::Channel<PlaybackStatus> Clock::statusChanged() const
-{
-    return m_status.ch;
+    return m_status;
 }
 
 void Clock::setOnAction(OnActionFunc func)

src/framework/audio/engine/internal/clock.h

@@ -44,7 +44,6 @@ class Clock : public IClock, public async::Asyncable
     bool isRunning() const override;
 
     PlaybackStatus status() const override;
-    async::Channel<PlaybackStatus> statusChanged() const override;
 
     msecs_t timeDuration() const override;
     void setTimeDuration(const msecs_t duration) override;
@@ -62,7 +61,7 @@ class Clock : public IClock, public async::Asyncable
     void setCurrentTime(msecs_t time);
     void onAction(ActionType type, msecs_t time);
 
-    ValCh<PlaybackStatus> m_status;
+    PlaybackStatus m_status = PlaybackStatus::Stopped;
     msecs_t m_currentTime = 0;
     msecs_t m_timeDuration = 0;
     msecs_t m_timeLoopStart = 0;

src/framework/audio/engine/internal/sequenceplayer.cpp

@@ -37,9 +37,21 @@ SequencePlayer::SequencePlayer(IGetTracks* getTracks, const modularity::ContextP
     : Contextable(iocCtx), m_getTracks(getTracks), m_clock(std::make_shared<Clock>())
 {
     m_clock->setOnAction([this](const IClock::ActionType type, const msecs_t time) {
-        ONLY_AUDIO_PROC_THREAD;
+        ONLY_AUDIO_RPC_OR_PROC_THREAD;
 
         switch (type) {
+            case IClock::ActionType::StatusChanged: {
+                const bool active = m_clock->status() == PlaybackStatus::Running;
+
+                if (!m_countDownIsSet) {
+                    audioEngine()->mixer()->setIsActive(active);
+                } else if (!active) {
+                    flushAllTracks();
+                }
+
+                m_playbackStatusChanged.send(m_clock->status());
+                break;
+            }
             case IClock::ActionType::Seek: {
                 if (m_tracksFollowClockSeek) {
                     seekAllTracks(time);
@@ -56,16 +68,6 @@ SequencePlayer::SequencePlayer(IGetTracks* getTracks, const modularity::ContextP
         }
     });
 
-    m_clock->statusChanged().onReceive(this, [this](const PlaybackStatus status) {
-        const bool active = status == PlaybackStatus::Running;
-
-        if (!m_countDownIsSet) {
-            audioEngine()->mixer()->setIsActive(active);
-        } else if (!active) {
-            flushAllTracks();
-        }
-    });
-
     audioEngine()->mixer()->addClock(m_clock);
 }
 
@@ -197,7 +199,7 @@ Channel<PlaybackStatus> SequencePlayer::playbackStatusChanged() const
 {
     ONLY_AUDIO_ENGINE_THREAD;
 
-    return m_clock->statusChanged();
+    return m_playbackStatusChanged;
 }
 
 void SequencePlayer::seekAllTracks(const msecs_t newPositionMsecs, bool flushSound)

src/framework/audio/engine/internal/sequenceplayer.h

@@ -70,6 +70,8 @@ class SequencePlayer : public ISequencePlayer, public Contextable, public async:
     IGetTracks* m_getTracks = nullptr;
     IClockPtr m_clock = nullptr;
 
+    async::Channel<PlaybackStatus> m_playbackStatusChanged;
+
     bool m_countDownIsSet = false;
     std::set<TrackId> m_notYetReadyToPlayTrackIdSet;