src/ui/playbar.rs

@@ -128,9 +128,8 @@ mod imp {
             if new_position > self.window().duration() {
                 // just seek to the next track
                 self.on_skip_forward_clicked();
-            } else {
-                self.window().seek(new_position);
             }
+            self.window().seek(new_position);
         }
 
         #[template_callback]

src/ui/window.rs

@@ -12,12 +12,12 @@ mod imp {
     use zbus::object_server::InterfaceRef;
 
     #[derive(Debug, Copy, Clone)]
-    pub(super) enum State {
+    enum State {
         Idle,
         FileLoading,
-        FileLoaded, // internal?
+        FileLoaded,
         Active,
-        FileEnded, // internal?
+        FileEnded,
         Seeking,
     }
 
@@ -25,7 +25,7 @@ mod imp {
     #[template(resource = "/eu/callcc/audrey/window.ui")]
     #[properties(wrapper_type = super::Window)]
     pub struct Window {
-        pub(super) state: Cell<State>,
+        state: Cell<State>,
 
         #[template_child]
         pub(super) playbar: TemplateChild<crate::ui::Playbar>,
@@ -175,10 +175,8 @@ mod imp {
                     move || match window.upgrade() {
                         None => glib::ControlFlow::Break,
                         Some(window) => {
-                            match window.imp().state.get() {
-                                State::Idle | State::FileLoading | State::Seeking => {},
-                                State::Active => window.notify("time-pos"),
-                                other => unreachable!("{other:?}"),
+                            if !window.idle_active() && !window.pause() {
+                                window.notify("time-pos");
                             }
                             glib::ControlFlow::Continue
                         }
@@ -508,9 +506,6 @@ mod imp {
             }
             self.state.set(State::FileLoading);
 
-            // make sure this is reported as 0
-            self.obj().notify("time-pos");
-
             event!(Level::INFO, "StartFile");
             self.obj().notify("song");
             self.buffering_start();
@@ -543,6 +538,9 @@ mod imp {
             {
                 handle.abort();
             }
+
+            // make sure this is reported as 0
+            self.obj().notify("time-pos");
         }
 
         fn on_file_loaded(&self) {
@@ -598,6 +596,7 @@ mod imp {
 
             event!(Level::INFO, "PlaybackRestart");
             self.buffering_end();
+            self.obj().notify("time-pos");
 
             if let Some(queued_seek) = self.queued_seek.take() {
                 // a seek was tried before and failed, try again now
@@ -618,9 +617,6 @@ mod imp {
             }
             self.state.set(State::FileEnded);
 
-            // make sure the seekbar looks full
-            self.obj().notify("time-pos");
-
             self.obj().notify("song");
             self.buffering_end();
 
@@ -632,6 +628,9 @@ mod imp {
             self.queued_seek.set(None);
 
             self.obj().set_playing_cover_art(None::<gdk::Texture>);
+
+            // make sure the seekbar looks full
+            self.obj().notify("time-pos");
         }
 
         #[template_callback]
@@ -761,23 +760,17 @@ impl Window {
     }
 
     pub fn seek(&self, new_position: f64) {
-        use imp::State;
-
-        match self.imp().state.get() {
-            State::Active | State::Seeking => {
-                self.imp()
+        match self
+            .imp()
             .mpv
-                    .command(["seek", &new_position.to_string(), "absolute+exact"])
-                    .unwrap();
-            }
-
-            State::FileLoading => {
-                event!(Level::INFO, "queuing seek to {new_position}");
+            .command(["seek", &new_position.to_string(), "absolute", "exact"])
+        {
+            Ok(()) => {}
+            Err(err) => {
+                event!(Level::INFO, "queuing seek to {new_position}: {err}");
                 self.imp().queued_seek.set(Some(new_position));
                 self.notify("time-pos");
             }
-
-            other => panic!("can not seek when in state {other:?}"),
         }
     }