From d6a442277f0c5e56f19ef8bef61a281d50dfdd0c Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Tue, 7 Sep 2021 15:51:59 -0400
Subject: [PATCH] audio: Clean up imports

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 audio/__init__.py    | 11 +++++------
 audio/bass.py        |  5 +++++
 audio/controls.py    |  3 ++-
 audio/player.py      | 14 +++++---------
 audio/test_player.py | 22 ++++++++--------------
 emmental.py          |  1 -
 6 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/audio/__init__.py b/audio/__init__.py
index 60a6860..c0d54bf 100644
--- a/audio/__init__.py
+++ b/audio/__init__.py
@@ -1,25 +1,24 @@
 # Copyright 2021 (c) Anna Schumaker.
 import sys
 import tagdb
-from gi.repository import Gst
-from . import controls
-from . import nowplaying
-from . import player
-from . import scale
 
-Gst.init(sys.argv)
+from . import player
 Player = player.Player()
 
 
+from . import controls
 def AudioControls():
     return controls.AudioControls(Player, Player.Autopause)
 
+from . import artwork
 def Artwork():
     return artwork.Artwork(Player)
 
+from . import nowplaying
 def NowPlaying():
     return nowplaying.NowPlaying(Player)
 
+from . import scale
 def SeekControl():
     return scale.ScaleButtonBox(scale.SeekScale(Player))
 
diff --git a/audio/bass.py b/audio/bass.py
index 8487346..15f1496 100644
--- a/audio/bass.py
+++ b/audio/bass.py
@@ -1,8 +1,13 @@
 # Copyright 2021 (c) Anna Schumaker.
+import gi
+gi.require_version("Gst", "1.0")
+
 import lib
+import sys
 from gi.repository import GObject
 from gi.repository import GLib
 from gi.repository import Gst
+Gst.init(sys.argv)
 
 class BassPlayer(GObject.GObject):
     def __init__(self):
diff --git a/audio/controls.py b/audio/controls.py
index a1f9c40..954e7d0 100644
--- a/audio/controls.py
+++ b/audio/controls.py
@@ -1,5 +1,5 @@
 # Copyright 2021 (c) Anna Schumaker.
-from gi.repository import Gtk, Gst
+from gi.repository import Gtk
 from . import scale
 
 class ControlButton(Gtk.Button):
@@ -57,6 +57,7 @@ class ControlScaleBox(scale.ScaleButtonBox):
 
 class AutoPauseControlBox(ControlScaleBox):
     def __init__(self, apscale):
+        apscale.unparent()
         ControlScaleBox.__init__(self, apscale)
 
     def on_value_changed(self, scale, icon):
diff --git a/audio/player.py b/audio/player.py
index ad594d8..ad4a2a5 100644
--- a/audio/player.py
+++ b/audio/player.py
@@ -1,13 +1,9 @@
 # Copyright 2021 (c) Anna Schumaker.
-from . import artwork
+import lib
+import tagdb
+from gi.repository import GObject
 from . import bass
 from . import scale
-from . import controls
-from lib import publisher
-from lib import settings
-from gi.repository import GObject
-from gi.repository import Gst, GLib
-import tagdb
 
 
 class Player(bass.BassPlayer):
@@ -16,7 +12,7 @@ class Player(bass.BassPlayer):
         self.Autopause = scale.AutoPauseScale()
 
         self.emit("track-changed", None,
-                  tagdb.Tracks[settings.get_int("audio.trackid")])
+                  tagdb.Tracks[lib.settings.get_int("audio.trackid")])
         self.playing = False
         if self.track:
             self.track.add_to_playlist("Previous")
@@ -53,5 +49,5 @@ class Player(bass.BassPlayer):
 
         self.track = new
         if self.track:
-            settings.set("audio.trackid", new.trackid)
+            lib.settings.set("audio.trackid", new.trackid)
             self.uri = new.filepath().absolute().as_uri()
diff --git a/audio/test_player.py b/audio/test_player.py
index f8c7a95..3b91bd2 100644
--- a/audio/test_player.py
+++ b/audio/test_player.py
@@ -1,19 +1,13 @@
 # Copyright 2021 (c) Anna Schumaker.
-from . import artwork
-from . import bass
-from . import controls
-from . import nowplaying
-from . import player
-from . import scale
-from lib import publisher
-from lib import settings
-from gi.repository import GObject
-from gi.repository import GLib
-from gi.repository import Gst
+import lib
 import pathlib
 import tagdb
-import time
 import unittest
+from gi.repository import GLib
+from gi.repository import Gst
+from . import bass
+from . import player
+from . import scale
 
 main_context = GLib.main_context_default()
 test_album = pathlib.Path("./data/Test Album/")
@@ -29,7 +23,7 @@ class TestPlayer(unittest.TestCase):
 
     def setUp(self):
         self.changed = None
-        settings.reset()
+        lib.settings.reset()
         self.library = tagdb.Library.store[test_album]
         self.track = [ t for t in self.library.tracks if t.tracknumber == 1 ][0]
 
@@ -54,7 +48,7 @@ class TestPlayer(unittest.TestCase):
 
         play.load_track(self.track)
         self.assertEqual(play.track, self.track)
-        self.assertEqual(settings.get_int("audio.trackid"), self.track.trackid)
+        self.assertEqual(lib.settings.get_int("audio.trackid"), self.track.trackid)
         self.assertEqual(self.changed, (None, self.track) )
         self.assertTrue(play.playing)
 
diff --git a/emmental.py b/emmental.py
index 46a0ec1..a0f4745 100755
--- a/emmental.py
+++ b/emmental.py
@@ -2,7 +2,6 @@
 # Copyright 2021 (c) Anna Schumaker.
 import gi
 gi.require_version('Gtk', '4.0')
-gi.require_version('Gst', '1.0')
 
 import lib
 import tagdb