1

src/main.rs

@@ -16,8 +16,8 @@ pub use playbin_song::Song as PlaybinSong;
 
 pub mod subsonic;
 
-pub mod playbin2;
-pub type Playbin = playbin2::Playbin<PlaybinSong>;
+pub mod playbin;
+pub type Playbin = playbin::Playbin<PlaybinSong>;
 
 mod signal;
 pub use signal::{Signal, SignalEmitter, SignalHandler};

src/playbin_song.rs

@@ -98,3 +98,9 @@ impl Song {
             .build()
     }
 }
+
+impl crate::playbin::PlaybinEntry for Song {
+    fn url(&self) -> url::Url {
+        self.stream_url()
+    }
+}

src/ui/window.rs

@@ -7,12 +7,6 @@ mod imp {
     use std::cell::{Cell, RefCell};
     use std::rc::Rc;
 
-    impl crate::playbin2::PlaybinEntry for PlaybinSong {
-        fn url(&self) -> url::Url {
-            self.stream_url()
-        }
-    }
-
     #[derive(gtk::CompositeTemplate, glib::Properties, Default)]
     #[template(resource = "/eu/callcc/audrey/window.ui")]
     #[properties(wrapper_type = super::Window)]