Account for the start time

darbyjohnston · Sep 18, 2024 · 108cc69 · 108cc69
1 parent 3be9a3d
commit 108cc69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/tlTimeline/Player.cpp b/lib/tlTimeline/Player.cpp
@@ -708,8 +708,8 @@ namespace tl
                     t -= frame * p.speed->get() / timelineSpeed;
                 }
                 const otime::RationalTime currentTime = p.loopPlayback(
-                    otime::RationalTime(t, rate).rescaled_to(p.speed->get()).
-                    floor());
+                    p.timeline->getTimeRange().start_time() +
+                    otime::RationalTime(t, rate).rescaled_to(p.speed->get()).floor());
                 //const double currentTimeDiff = abs(currentTime.value() - p.currentTime->get().value());
                 if (p.currentTime->setIfChanged(currentTime))
                 {

diff --git a/lib/tlTimeline/PlayerAudio.cpp b/lib/tlTimeline/PlayerAudio.cpp
@@ -234,7 +234,7 @@ namespace tl
         void Player::Private::audioReset(const otime::RationalTime& time)
         {
             audioMutex.reset = true;
-            audioMutex.start = time.rescaled_to(ioInfo.audio.sampleRate).value();
+            audioMutex.start = (time - timeline->getTimeRange().start_time()).rescaled_to(ioInfo.audio.sampleRate).value();
             audioMutex.frame = 0;
         }
 

diff --git a/lib/tlTimeline/PlayerPrivate.cpp b/lib/tlTimeline/PlayerPrivate.cpp
@@ -533,7 +533,7 @@ namespace tl
         void Player::Private::playbackReset(const otime::RationalTime& time)
         {
             noAudio.playbackTimer = std::chrono::steady_clock::now();
-            noAudio.start = time.rescaled_to(ioInfo.videoTime.duration().rate()).value();
+            noAudio.start = (time - timeline->getTimeRange().start_time()).rescaled_to(ioInfo.videoTime.duration().rate()).value();
         }
 
         void Player::Private::log(const std::shared_ptr<system::Context>& context)