resources/window.blp

@@ -35,12 +35,12 @@ template $AudreyUiWindow: Adw.ApplicationWindow {
       vexpand: true;
 
       Adw.ViewStackPage {
-        icon-name: "folder-music-symbolic";
+        icon-name: "media-optical-cd";
-        title: _("Browse");
+        title: _("Albums");
 
         child: Adw.NavigationView {
           Adw.NavigationPage {
-            title: _("Browse");
+            title: _("Albums");
             vexpand: true;
 
             child: Adw.ToolbarView {

src/application.rs

@@ -17,19 +17,15 @@ mod imp {
     impl ObjectImpl for Application {}
 
     impl ApplicationImpl for Application {
-        // called once by the primary instance
-        fn startup(&self) {
-            self.parent_startup();
-            ui::Window::new(self.obj().as_ref());
-        }
-
-        // executed by the primary instance
         fn activate(&self) {
             self.parent_activate();
-            self.obj()
+            match self.obj().active_window() {
-                .active_window()
+                None => {
-                .expect("no window was active")
+                    let window = ui::Window::new(self.obj().as_ref());
-                .present();
+                    window.present();
+                }
+                Some(win) => win.present(),
+            }
         }
     }
 

src/main.rs

@@ -41,6 +41,9 @@ fn main() -> glib::ExitCode {
 
     init_tracing();
 
+    ui::Playbar::ensure_type();
+    ui::PlayQueue::ensure_type();
+
     gtk::disable_setlocale();
     bindtextdomain("audrey", meson_config::LOCALEDIR).expect("failed to bind text domain");
     bind_textdomain_codeset("audrey", "UTF-8").expect("failed to bind textdomaincodeset");

src/ui/window.rs

@@ -176,7 +176,7 @@ mod imp {
                         None => glib::ControlFlow::Break,
                         Some(window) => {
                             match window.imp().state.get() {
-                                State::Idle | State::FileLoading | State::Seeking => {}
+                                State::Idle | State::FileLoading | State::Seeking => {},
                                 State::Active => window.notify("time-pos"),
                                 other => unreachable!("{other:?}"),
                             }
@@ -361,10 +361,7 @@ mod imp {
             match self.state.get() {
                 State::Idle => 0.0,
 
-                State::FileLoading | State::FileEnded => self
+                State::FileLoading | State::FileEnded => self.song().unwrap().duration() as f64,
-                    .song()
-                    .map(|song| song.duration() as f64)
-                    .unwrap_or(0.0),
 
                 State::FileLoaded | State::Active | State::Seeking => {
                     self.mpv.get_property::<f64>("duration").unwrap()