fixup

Author: rebroad

src/player/play.cpp

@@ -68,8 +68,7 @@ enum class PlaybackRequest {
   NextFile,
   PrevFile,
   RestartFile,
-  SeekForward,
-  SeekBackward,
+  Seek,
 };
 
 struct marshal {
@@ -84,6 +83,7 @@ struct marshal {
   double current_drop_pct;
   PlaybackRequest request;
   double seek_delta;
+  int64_t time_adjust_ns;
 };
 
 static constexpr double kNcplayerSeekSeconds = 5.0;
@@ -128,6 +128,10 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
   struct timespec now;
   clock_gettime(CLOCK_MONOTONIC, &now);
   int64_t ns = timespec_to_ns(&now) - timespec_to_ns(start);
+  ns += marsh->time_adjust_ns;
+  if(ns < 0){
+    ns = 0;
+  }
   marsh->blitter = vopts->blitter;
   if(marsh->blitter == NCBLIT_DEFAULT){
     marsh->blitter = ncvisual_media_defblitter(nc, vopts->scaling);
@@ -247,23 +251,23 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts,
       marsh->show_fps = !marsh->show_fps;
       continue;
     }else if(keyp == NCKey::Up){
-      marsh->request = PlaybackRequest::SeekBackward;
-      marsh->seek_delta = kNcplayerSeekMinutes;
+      marsh->request = PlaybackRequest::Seek;
+      marsh->seek_delta = -kNcplayerSeekMinutes;
       ncplane_destroy(subp);
       return 2;
     }else if(keyp == NCKey::Down){
-      marsh->request = PlaybackRequest::SeekForward;
+      marsh->request = PlaybackRequest::Seek;
       marsh->seek_delta = kNcplayerSeekMinutes;
       ncplane_destroy(subp);
       return 2;
     }else if(keyp == NCKey::Right){
-      marsh->request = PlaybackRequest::SeekForward;
+      marsh->request = PlaybackRequest::Seek;
       marsh->seek_delta = kNcplayerSeekSeconds;
       ncplane_destroy(subp);
       return 2;
     }else if(keyp == NCKey::Left){
-      marsh->request = PlaybackRequest::SeekBackward;
-      marsh->seek_delta = kNcplayerSeekSeconds;
+      marsh->request = PlaybackRequest::Seek;
+      marsh->seek_delta = -kNcplayerSeekSeconds;
       ncplane_destroy(subp);
       return 2;
     }else if(keyp != 'q'){
@@ -595,6 +599,7 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv,
     ncplane_erase(n);
 
     PlaybackRequest pending_request = PlaybackRequest::None;
+    int64_t seek_time_offset_ns = 0;
     while(true){
       bool restart_stream = false;
       if(ffmpeg_has_audio(*ncv)){
@@ -623,7 +628,8 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv,
         .current_fps = 0.0,
         .current_drop_pct = 0.0,
         .request = PlaybackRequest::None,
-    .seek_delta = kNcplayerSeekSeconds,
+        .seek_delta = 0.0,
+        .time_adjust_ns = seek_time_offset_ns,
       };
       r = ncv->stream(&vopts, timescale, perframe, &marsh);
       pending_request = marsh.request;
@@ -646,16 +652,11 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv,
       free(stdn->get_userptr());
       stdn->set_userptr(nullptr);
       restart_stream = false;
-      if(pending_request == PlaybackRequest::SeekForward ||
-         pending_request == PlaybackRequest::SeekBackward){
+      if(pending_request == PlaybackRequest::Seek){
         double delta = marsh.seek_delta;
-        if(delta <= 0){
-          delta = kNcplayerSeekSeconds;
-        }
-        if(pending_request == PlaybackRequest::SeekBackward){
-          delta = -delta;
-        }
         if(ncvisual_seek(*ncv, delta) == 0){
+          int64_t delta_ns = (int64_t)(delta * (double)NANOSECS_IN_SEC);
+          seek_time_offset_ns += delta_ns;
           pending_request = PlaybackRequest::None;
           restart_stream = true;
         }else{
@@ -709,6 +710,7 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv,
 
         if(loop && pending_request == PlaybackRequest::None){
           restart_stream = true;
+          seek_time_offset_ns = 0;
         }
       }