[gnome-music/wip/jfelder/mpris-cleanup: 10/17] mpris: Move dbus connection logic to DBusInterface
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/jfelder/mpris-cleanup: 10/17] mpris: Move dbus connection logic to DBusInterface
- Date: Fri, 14 Jun 2019 16:18:55 +0000 (UTC)
commit 7da0020c48f47571ba3a15ce849d5c6fe1a5023c
Author: Jean Felder <jfelder src gnome org>
Date: Tue Oct 16 23:23:50 2018 +0200
mpris: Move dbus connection logic to DBusInterface
gnomemusic/mpris.py | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index acad5f72..e96eb7fd 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -46,7 +46,12 @@ def _camelcase_to_snake_case(name):
class DBusInterface:
- def __init__(self, con, path):
+ def __init__(self, name, path):
+ self._con = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+ Gio.bus_own_name_on_connection(
+ self._con, name, Gio.BusNameOwnerFlags.NONE, None, None)
+ self._path = path
+
method_outargs = {}
method_inargs = {}
for interface in Gio.DBusNodeInfo.new_for_xml(self.__doc__).interfaces:
@@ -57,8 +62,8 @@ class DBusInterface:
method_inargs[method.name] = tuple(
arg.signature for arg in method.in_args)
- con.register_object(
- object_path=path, interface_info=interface,
+ self._con.register_object(
+ object_path=self._path, interface_info=interface,
method_call_closure=self._on_method_call)
self._method_inargs = method_inargs
@@ -237,13 +242,9 @@ class MPRIS(DBusInterface):
return "<MPRIS>"
def __init__(self, app):
- self.con = Gio.bus_get_sync(Gio.BusType.SESSION, None)
- Gio.bus_own_name_on_connection(self.con,
- 'org.mpris.MediaPlayer2.GnomeMusic',
- Gio.BusNameOwnerFlags.NONE,
- None,
- None)
- super().__init__(self.con, '/org/mpris/MediaPlayer2')
+ name = 'org.mpris.MediaPlayer2.GnomeMusic'
+ path = '/org/mpris/MediaPlayer2'
+ super().__init__(name, path)
self.app = app
self.player = app.props.player
@@ -557,7 +558,7 @@ class MPRIS(DBusInterface):
def _on_playlist_renamed(self, playlists, renamed_playlist):
mpris_playlist = self._get_mpris_playlist_from_playlist(
renamed_playlist)
- self.con.emit_signal(
+ self._con.emit_signal(
None, '/org/mpris/MediaPlayer2',
MPRIS.MEDIA_PLAYER2_PLAYLISTS_IFACE, 'PlaylistChanged',
GLib.Variant.new_tuple(GLib.Variant('(oss)', mpris_playlist)))
@@ -632,7 +633,7 @@ class MPRIS(DBusInterface):
:param int position_msecond: new position in microseconds.
"""
variant = GLib.Variant.new_tuple(GLib.Variant('x', position_msecond))
- self.con.emit_signal(
+ self._con.emit_signal(
None, '/org/mpris/MediaPlayer2',
MPRIS.MEDIA_PLAYER2_PLAYER_IFACE, 'Seeked', variant)
@@ -657,12 +658,11 @@ class MPRIS(DBusInterface):
self.player.play(song_offset=song_offset)
def _track_list_replaced(self, tracks, current_song):
- self.con.emit_signal(None,
- '/org/mpris/MediaPlayer2',
- MPRIS.MEDIA_PLAYER2_TRACKLIST_IFACE,
- 'TrackListReplaced',
- GLib.Variant.new_tuple(GLib.Variant('ao', tracks),
- GLib.Variant('o', current_song)))
+ self._con.emit_signal(
+ None, '/org/mpris/MediaPlayer2',
+ MPRIS.MEDIA_PLAYER2_TRACKLIST_IFACE, 'TrackListReplaced',
+ GLib.Variant.new_tuple(
+ GLib.Variant('ao', tracks), GLib.Variant('o', current_song)))
def _activate_playlist(self, playlist_path):
playlist_id = self._get_playlist_from_dbus_path(playlist_path).get_id()
@@ -779,13 +779,13 @@ class MPRIS(DBusInterface):
def _properties_changed(self, interface_name, changed_properties,
invalidated_properties):
- self.con.emit_signal(None,
- '/org/mpris/MediaPlayer2',
- 'org.freedesktop.DBus.Properties',
- 'PropertiesChanged',
- GLib.Variant.new_tuple(GLib.Variant('s', interface_name),
- GLib.Variant('a{sv}', changed_properties),
- GLib.Variant('as', invalidated_properties)))
+ self._con.emit_signal(
+ None, '/org/mpris/MediaPlayer2', 'org.freedesktop.DBus.Properties',
+ 'PropertiesChanged',
+ GLib.Variant.new_tuple(
+ GLib.Variant('s', interface_name),
+ GLib.Variant('a{sv}', changed_properties),
+ GLib.Variant('as', invalidated_properties)))
def _introspect(self):
return self.__doc__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]