aboutsummaryrefslogtreecommitdiff
path: root/src/media-player-list-mpris.vala
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-03-08 22:37:23 +0100
committerRobert Tari <robert@tari.in>2021-08-04 21:42:10 +0200
commit89f303d468543d61b9a9404115b20fd9b0fbb0df (patch)
treeda95bf11592425989ffa6543c6d365faf18413bb /src/media-player-list-mpris.vala
parent0dcd8d3b089d63bedfb36d36935d73e80507a8b0 (diff)
downloadayatana-indicator-sound-89f303d468543d61b9a9404115b20fd9b0fbb0df.tar.gz
ayatana-indicator-sound-89f303d468543d61b9a9404115b20fd9b0fbb0df.tar.bz2
ayatana-indicator-sound-89f303d468543d61b9a9404115b20fd9b0fbb0df.zip
Whitespace fix
Diffstat (limited to 'src/media-player-list-mpris.vala')
-rw-r--r--src/media-player-list-mpris.vala218
1 files changed, 109 insertions, 109 deletions
diff --git a/src/media-player-list-mpris.vala b/src/media-player-list-mpris.vala
index 65fb886..cff4011 100644
--- a/src/media-player-list-mpris.vala
+++ b/src/media-player-list-mpris.vala
@@ -23,113 +23,113 @@
*/
public class MediaPlayerListMpris : MediaPlayerList {
- public MediaPlayerListMpris () {
- this._players = new HashTable<string, MediaPlayerMpris> (str_hash, str_equal);
-
- BusWatcher.watch_namespace (BusType.SESSION, "org.mpris.MediaPlayer2", this.player_appeared, this.player_disappeared);
- }
-
- /* only valid while the list is not changed */
- public class Iterator : MediaPlayerList.Iterator {
- HashTableIter<string, MediaPlayerMpris> iter;
-
- public Iterator (MediaPlayerListMpris list) {
- this.iter = HashTableIter<string, MediaPlayerMpris> (list._players);
- }
-
- public override MediaPlayer? next_value () {
- MediaPlayerMpris? player;
-
- if (this.iter.next (null, out player))
- return player as MediaPlayer;
- else
- return null;
- }
- }
-
- public override MediaPlayerList.Iterator iterator () {
- return new Iterator (this) as MediaPlayerList.Iterator;
- }
-
- /**
- * Adds the player associated with @desktop_id. Does nothing if such a player already exists.
- */
- MediaPlayerMpris? insert (string desktop_id) {
- debug("Inserting player: %s", desktop_id);
-
- var id = desktop_id.has_suffix (".desktop") ? desktop_id : desktop_id + ".desktop";
- MediaPlayerMpris? player = this._players.lookup (id);
-
- if (player == null) {
- var appinfo = new DesktopAppInfo (id);
- if (appinfo == null) {
- warning ("unable to find application '%s'", id);
- return null;
- }
-
- player = new MediaPlayerMpris (appinfo);
- this._players.insert (player.id, player);
- this.player_added (player);
- }
-
- return player;
- }
-
- /**
- * Removes the player associated with @desktop_id, unless it is currently running.
- */
- void remove (string desktop_id) {
- MediaPlayer? player = this._players.lookup (desktop_id);
-
- if (player != null && !player.is_running) {
- this._players.remove (desktop_id);
- this.player_removed (player);
- }
- }
-
- /**
- * Synchronizes the player list with @desktop_ids. After this call, this list will only contain the players
- * in @desktop_ids. Players that were running but are not in @desktop_ids will remain in the list.
- */
- public override void sync (string[] desktop_ids) {
-
- /* hash desktop_ids for faster lookup */
- var hash = new HashTable<string, unowned string> (str_hash, str_equal);
- foreach (var id in desktop_ids)
- hash.add (id);
-
- /* remove players that are not desktop_ids */
- foreach (var id in this._players.get_keys ()) {
- if (!hash.contains (id))
- this.remove (id);
- }
-
- /* insert all players (insert() takes care of not adding a player twice */
- foreach (var id in desktop_ids)
- this.insert (id);
- }
-
- HashTable<string, MediaPlayerMpris> _players;
-
- void player_appeared (DBusConnection connection, string name, string owner) {
- try {
- MprisRoot mpris2_root = Bus.get_proxy_sync (BusType.SESSION, name, MPRIS_MEDIA_PLAYER_PATH);
-
- var player = this.insert (mpris2_root.DesktopEntry);
- if (player != null)
- player.attach (mpris2_root, name);
- }
- catch (Error e) {
- warning ("unable to create mpris proxy for '%s': %s", name, e.message);
- }
- }
-
- void player_disappeared (DBusConnection connection, string dbus_name) {
- MediaPlayerMpris? player = this._players.find ( (name, player) => {
- return player.dbus_name == dbus_name;
- });
-
- if (player != null)
- player.detach ();
- }
+ public MediaPlayerListMpris () {
+ this._players = new HashTable<string, MediaPlayerMpris> (str_hash, str_equal);
+
+ BusWatcher.watch_namespace (BusType.SESSION, "org.mpris.MediaPlayer2", this.player_appeared, this.player_disappeared);
+ }
+
+ /* only valid while the list is not changed */
+ public class Iterator : MediaPlayerList.Iterator {
+ HashTableIter<string, MediaPlayerMpris> iter;
+
+ public Iterator (MediaPlayerListMpris list) {
+ this.iter = HashTableIter<string, MediaPlayerMpris> (list._players);
+ }
+
+ public override MediaPlayer? next_value () {
+ MediaPlayerMpris? player;
+
+ if (this.iter.next (null, out player))
+ return player as MediaPlayer;
+ else
+ return null;
+ }
+ }
+
+ public override MediaPlayerList.Iterator iterator () {
+ return new Iterator (this) as MediaPlayerList.Iterator;
+ }
+
+ /**
+ * Adds the player associated with @desktop_id. Does nothing if such a player already exists.
+ */
+ MediaPlayerMpris? insert (string desktop_id) {
+ debug("Inserting player: %s", desktop_id);
+
+ var id = desktop_id.has_suffix (".desktop") ? desktop_id : desktop_id + ".desktop";
+ MediaPlayerMpris? player = this._players.lookup (id);
+
+ if (player == null) {
+ var appinfo = new DesktopAppInfo (id);
+ if (appinfo == null) {
+ warning ("unable to find application '%s'", id);
+ return null;
+ }
+
+ player = new MediaPlayerMpris (appinfo);
+ this._players.insert (player.id, player);
+ this.player_added (player);
+ }
+
+ return player;
+ }
+
+ /**
+ * Removes the player associated with @desktop_id, unless it is currently running.
+ */
+ void remove (string desktop_id) {
+ MediaPlayer? player = this._players.lookup (desktop_id);
+
+ if (player != null && !player.is_running) {
+ this._players.remove (desktop_id);
+ this.player_removed (player);
+ }
+ }
+
+ /**
+ * Synchronizes the player list with @desktop_ids. After this call, this list will only contain the players
+ * in @desktop_ids. Players that were running but are not in @desktop_ids will remain in the list.
+ */
+ public override void sync (string[] desktop_ids) {
+
+ /* hash desktop_ids for faster lookup */
+ var hash = new HashTable<string, unowned string> (str_hash, str_equal);
+ foreach (var id in desktop_ids)
+ hash.add (id);
+
+ /* remove players that are not desktop_ids */
+ foreach (var id in this._players.get_keys ()) {
+ if (!hash.contains (id))
+ this.remove (id);
+ }
+
+ /* insert all players (insert() takes care of not adding a player twice */
+ foreach (var id in desktop_ids)
+ this.insert (id);
+ }
+
+ HashTable<string, MediaPlayerMpris> _players;
+
+ void player_appeared (DBusConnection connection, string name, string owner) {
+ try {
+ MprisRoot mpris2_root = Bus.get_proxy_sync (BusType.SESSION, name, MPRIS_MEDIA_PLAYER_PATH);
+
+ var player = this.insert (mpris2_root.DesktopEntry);
+ if (player != null)
+ player.attach (mpris2_root, name);
+ }
+ catch (Error e) {
+ warning ("unable to create mpris proxy for '%s': %s", name, e.message);
+ }
+ }
+
+ void player_disappeared (DBusConnection connection, string dbus_name) {
+ MediaPlayerMpris? player = this._players.find ( (name, player) => {
+ return player.dbus_name == dbus_name;
+ });
+
+ if (player != null)
+ player.detach ();
+ }
}