renamed tick conversion functions in NotationPlayback and PlaybackCon…

…troller
musescore · Jul 20, 2024 · f3733e1 · f3733e1
1 parent 69dda21
commit f3733e1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/notation/inotationplayback.h b/src/notation/inotationplayback.h
@@ -74,7 +74,7 @@ class INotationPlayback
 
     virtual const Tempo& tempo(muse::midi::tick_t tick) const = 0;
     virtual MeasureBeat beat(muse::midi::tick_t tick) const = 0;
-    virtual muse::midi::tick_t beatToTick(int measureIndex, int beatIndex) const = 0;
+    virtual muse::midi::tick_t beatToRawTick(int measureIndex, int beatIndex) const = 0;
 
     virtual double tempoMultiplier() const = 0;
     virtual void setTempoMultiplier(double multiplier) = 0;

diff --git a/src/notation/internal/notationplayback.cpp b/src/notation/internal/notationplayback.cpp
@@ -360,7 +360,7 @@ MeasureBeat NotationPlayback::beat(tick_t tick) const
     return measureBeat;
 }
 
-tick_t NotationPlayback::beatToTick(int measureIndex, int beatIndex) const
+tick_t NotationPlayback::beatToRawTick(int measureIndex, int beatIndex) const
 {
     return score() ? score()->sigmap()->bar2tick(measureIndex, beatIndex) : 0;
 }

diff --git a/src/notation/internal/notationplayback.h b/src/notation/internal/notationplayback.h
@@ -76,7 +76,7 @@ class NotationPlayback : public INotationPlayback, public muse::async::Asyncable
 
     const Tempo& tempo(muse::midi::tick_t tick) const override;
     MeasureBeat beat(muse::midi::tick_t tick) const override;
-    muse::midi::tick_t beatToTick(int measureIndex, int beatIndex) const override;
+    muse::midi::tick_t beatToRawTick(int measureIndex, int beatIndex) const override;
 
     double tempoMultiplier() const override;
     void setTempoMultiplier(double multiplier) override;

diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -213,7 +213,7 @@ void PlaybackController::seek(const midi::tick_t tick)
         return;
     }
 
-    seek(tickToSecs(tick));
+    seek(playedTickToSecs(tick));
 }
 
 void PlaybackController::seek(const audio::secs_t secs)
@@ -635,7 +635,7 @@ msecs_t PlaybackController::playbackStartMsecs() const
         if (!startTick.ret) {
             return 0;
         }
-        return tickToMsecs(startTick.val);
+        return playedTickToMsecs(startTick.val);
     }
 
     return 0;
@@ -797,8 +797,8 @@ void PlaybackController::updateLoop()
         return;
     }
 
-    msecs_t fromMsecs = tickToMsecs(playbackTickFrom.val);
-    msecs_t toMsecs = tickToMsecs(playbackTickTo.val);
+    msecs_t fromMsecs = playedTickToMsecs(playbackTickFrom.val);
+    msecs_t toMsecs = playedTickToMsecs(playbackTickTo.val);
     currentPlayer()->setLoop(fromMsecs, toMsecs);
 
     enableLoop();
@@ -1434,7 +1434,7 @@ MeasureBeat PlaybackController::currentBeat() const
 
 msecs_t PlaybackController::beatToMilliseconds(int measureIndex, int beatIndex) const
 {
-    return notationPlayback() ? tickToMsecs(notationPlayback()->beatToTick(measureIndex, beatIndex)) : 0;
+    return notationPlayback() ? playedTickToMsecs(notationPlayback()->beatToRawTick(measureIndex, beatIndex)) : 0;
 }
 
 secs_t PlaybackController::beatToSecs(int measureIndex, int beatIndex) const
@@ -1443,10 +1443,10 @@ secs_t PlaybackController::beatToSecs(int measureIndex, int beatIndex) const
         return 0;
     }
 
-    muse::midi::tick_t rawTick = notationPlayback()->beatToTick(measureIndex, beatIndex);
+    muse::midi::tick_t rawTick = notationPlayback()->beatToRawTick(measureIndex, beatIndex);
     muse::midi::tick_t playedTick = notationPlayback()->playPositionTickByRawTick(rawTick).val;
 
-    return tickToSecs(playedTick);
+    return playedTickToSecs(playedTick);
 }
 
 double PlaybackController::tempoMultiplier() const
@@ -1588,13 +1588,13 @@ bool PlaybackController::canReceiveAction(const ActionCode&) const
     return m_masterNotation != nullptr && m_masterNotation->hasParts();
 }
 
-msecs_t PlaybackController::tickToMsecs(int tick) const
+msecs_t PlaybackController::playedTickToMsecs(int tick) const
 {
     float sec = notationPlayback()->playedTickToSec(tick);
     return secondsToMilliseconds(sec);
 }
 
-muse::audio::secs_t PlaybackController::tickToSecs(int tick) const
+muse::audio::secs_t PlaybackController::playedTickToSecs(int tick) const
 {
     return secs_t(notationPlayback()->playedTickToSec(tick));
 }
diff --git a/src/playback/internal/playbackcontroller.h b/src/playback/internal/playbackcontroller.h
@@ -208,8 +208,8 @@ class PlaybackController : public IPlaybackController, public muse::actions::Act
     void removeNonExistingTracks();
     void removeTrack(const engraving::InstrumentTrackId& instrumentTrackId);
 
-    muse::audio::msecs_t tickToMsecs(int tick) const;
-    muse::audio::secs_t tickToSecs(int tick) const;
+    muse::audio::msecs_t playedTickToMsecs(int tick) const;
+    muse::audio::secs_t playedTickToSecs(int tick) const;
 
     notation::INotationPtr m_notation;
     notation::IMasterNotationPtr m_masterNotation;