From df78aa17ad815ef82dd3a04b4c112ed72316bfe2 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Wed, 3 Feb 2021 23:24:41 +0100
Subject: [PATCH] Move player to backend module

---
 src/backend/library.rs       | 3 +--
 src/backend/mod.rs           | 4 +++-
 src/{ => backend}/player.rs  | 0
 src/main.rs                  | 1 -
 src/meson.build              | 2 +-
 src/screens/player_screen.rs | 2 +-
 src/screens/recording.rs     | 3 +--
 src/widgets/player_bar.rs    | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename src/{ => backend}/player.rs (100%)

diff --git a/src/backend/library.rs b/src/backend/library.rs
index 5a07043..51a4e7c 100644
--- a/src/backend/library.rs
+++ b/src/backend/library.rs
@@ -1,5 +1,4 @@
-use super::{Backend, BackendState, DbThread};
-use crate::player::Player;
+use super::{Backend, BackendState, DbThread, Player};
 use anyhow::Result;
 use gio::prelude::*;
 use std::path::PathBuf;
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index 9a8e837..4269e8d 100644
--- a/src/backend/mod.rs
+++ b/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.
diff --git a/src/player.rs b/src/backend/player.rs
similarity index 100%
rename from src/player.rs
rename to src/backend/player.rs
diff --git a/src/main.rs b/src/main.rs
index 3ba67cc..0c945ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,6 @@ mod config;
 mod editors;
 mod import;
 mod navigator;
-mod player;
 mod preferences;
 mod screens;
 mod selectors;
diff --git a/src/meson.build b/src/meson.build
index 89559a4..9da7a7f 100644
--- a/src/meson.build
+++ b/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',
diff --git a/src/screens/player_screen.rs b/src/screens/player_screen.rs
index cfe415d..3bab8c9 100644
--- a/src/screens/player_screen.rs
+++ b/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;
diff --git a/src/screens/recording.rs b/src/screens/recording.rs
index 68d69ca..8c6d4a2 100644
--- a/src/screens/recording.rs
+++ b/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;
diff --git a/src/widgets/player_bar.rs b/src/widgets/player_bar.rs
index 50a084a..387ea87 100644
--- a/src/widgets/player_bar.rs
+++ b/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;