Move player to backend module

src/backend/library.rs

@@ -1,5 +1,4 @@
-use super::{Backend, BackendState, DbThread};
+use super::{Backend, BackendState, DbThread, Player};
-use crate::player::Player;
 use anyhow::Result;
 use gio::prelude::*;
 use std::path::PathBuf;

src/backend/mod.rs

@@ -1,4 +1,3 @@
-use crate::player::Player;
 use anyhow::Result;
 use futures_channel::mpsc;
 use std::cell::RefCell;
@@ -14,6 +13,9 @@ pub use database::*;
 pub mod library;
 pub use library::*;
 
+pub mod player;
+pub use player::*;
+
 mod secure;
 
 /// General states the application can be in.

src/main.rs

@@ -19,7 +19,6 @@ mod config;
 mod editors;
 mod import;
 mod navigator;
-mod player;
 mod preferences;
 mod screens;
 mod selectors;

src/meson.build

@@ -52,6 +52,7 @@ sources = files(
   'backend/database/works.rs',
   'backend/library.rs',
   'backend/mod.rs',
+  'backend/player.rs',
   'backend/secure.rs',
   'editors/ensemble.rs',
   'editors/instrument.rs',
@@ -105,7 +106,6 @@ sources = files(
   'config.rs.in',
   'macros.rs',
   'main.rs',
-  'player.rs',
   'resources.rs',
   'resources.rs.in',
   'window.rs',

src/screens/player_screen.rs

@@ -1,4 +1,4 @@
-use crate::player::*;
+use crate::backend::{Player, PlaylistItem};
 use crate::widgets::*;
 use gettextrs::gettext;
 use glib::clone;

src/screens/recording.rs

@@ -1,7 +1,6 @@
-use crate::backend::{Backend, Recording, TrackSet};
+use crate::backend::{Backend, PlaylistItem, Recording, TrackSet};
 use crate::editors::RecordingEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
-use crate::player::PlaylistItem;
 use crate::widgets;
 use crate::widgets::{List, Section, Widget};
 use gettextrs::gettext;

src/widgets/player_bar.rs

@@ -1,4 +1,4 @@
-use crate::player::*;
+use crate::backend::{Player, PlaylistItem};
 use glib::clone;
 use gtk::prelude::*;
 use gtk_macros::get_widget;