Player now sets frame number to Demuxer

diff --git a/player.cc b/player.cc
index 3b76c3bfa791cbcb0adb5563327428cbb76aaa98..82c28f31a41bb1d072489bba33742c48a0f0fde6 100644 (file)
--- a/player.cc
+++ b/player.cc
@@ -146,7 +146,7 @@ void Player::setLengthFrames(ULONG length)
   logger->log("Player", Log::DEBUG, "Player has received length frames of %lu", lengthFrames);
 }
 
-ULLONG Player::getEndTS() // used internally (jump to percent)
+ULLONG Player::getEndTS() // FIXME delme - used only by bar clocks until current frame code is done
 {
   long long rendTS = endTS - startTS;
   if (rendTS < 0) rendTS += 8589934592ULL;
@@ -270,6 +270,7 @@ int Player::playInt(bool* doUnlock)
   audio->reset();
   video->reset();
   demuxer->reset();
+  demuxer->setFrameNum(0);
   if (!isRadio) demuxer->seek();
 
   videoStartup = true;
@@ -493,6 +494,7 @@ void Player::restartAt(ULLONG timecode)
   demuxer->flush();
   if (!isRadio) demuxer->seek();
   feedPosition = newPosition;
+  demuxer->setFrameNum(wantedFrameNumber);
   videoStartup = true;
   afeed.start();
   vfeed.start();
@@ -523,6 +525,7 @@ void Player::restartAtFrame(ULONG newFrame)
   demuxer->flush();
   if (!isRadio) demuxer->seek();
   feedPosition = newPosition;
+  demuxer->setFrameNum(newFrame);
   videoStartup = true;
   afeed.start();
   vfeed.start();