[gnome-music/wip/mschraal/window-template: 160/163] player: Move InhibitSuspend to Window
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/window-template: 160/163] player: Move InhibitSuspend to Window
- Date: Tue, 5 Mar 2019 15:07:10 +0000 (UTC)
commit f09178310acc5b5c1b32f548789966734b8aaf52
Author: Marinus Schraal <mschraal gnome org>
Date: Sat Sep 8 12:18:11 2018 +0200
player: Move InhibitSuspend to Window
gnomemusic/player.py | 7 +------
gnomemusic/window.py | 6 +++++-
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 67214a83..57066c78 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -38,7 +38,6 @@ from gi.repository import Gio, GLib, GObject, Grl, Gst, GstPbutils
from gnomemusic import log
from gnomemusic.gstplayer import GstPlayer, Playback
from gnomemusic.grilo import grilo
-from gnomemusic.inhibitsuspend import InhibitSuspend
from gnomemusic.pauseonsuspend import PauseOnSuspend
from gnomemusic.playlists import Playlists
from gnomemusic.scrobbler import LastFmScrobbler
@@ -567,11 +566,9 @@ class Player(GObject.GObject):
return '<Player>'
@log
- def __init__(self, parent_window):
+ def __init__(self):
super().__init__()
- self._parent_window = parent_window
-
self._playlist = PlayerPlaylist()
self._playlist.connect('song-validated', self._on_song_validated)
self._playlist.bind_property(
@@ -592,8 +589,6 @@ class Player(GObject.GObject):
self._gst_player.bind_property(
'state', self, 'state', GObject.BindingFlags.SYNC_CREATE)
- root_window = parent_window.get_toplevel()
- self._inhibit_suspend = InhibitSuspend(root_window, self)
self._pause_on_suspend = PauseOnSuspend(self)
self._lastfm = LastFmScrobbler()
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index a99341af..3b0d6848 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -33,6 +33,7 @@ from gi.repository import Gtk, Gdk, Gio, GLib, GObject
from gettext import gettext as _
from gnomemusic import log
+from gnomemusic.inhibitsuspend import InhibitSuspend
from gnomemusic.mediakeys import MediaKeys
from gnomemusic.player import Player, RepeatMode
from gnomemusic.query import Query
@@ -94,8 +95,11 @@ class Window(Gtk.ApplicationWindow):
self.prev_view = None
self.curr_view = None
+ self._player = Player()
+
self._setup_view()
+ InhibitSuspend(self, self._player)
MediaKeys(self._player, self)
grilo.connect('changes-pending', self._on_changes_pending)
@@ -125,7 +129,7 @@ class Window(Gtk.ApplicationWindow):
@log
def _setup_view(self):
self._headerbar = HeaderBar()
- self._player = Player(self)
+
self._player_toolbar = PlayerToolbar(self._player, self)
self.views = [None] * len(View)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]