audio: Clean up imports
Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
8efb752614
commit
d6a442277f
|
@ -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))
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue