Change playback action state to "string"

To accomodate for a third state "Launching" (in addition to "Playing" and
"Paused").

2 files changed, 10 insertions, 16 deletions

diff --git a/src/media-player.vala b/src/media-player.vala
index b767268..5b59efb 100644
--- a/src/media-player.vala
+++ b/src/media-player.vala
@@ -66,18 +66,7 @@ public class MediaPlayer: Object {
 	}
 
 	public string state {
-		get {
-			if (this.proxy != null && this.proxy.PlaybackStatus == "Playing")
-				return "Playing";
-			else
-				return "Paused";
-		}
-	}
-
-	public bool is_playing {
-		get {
-			return this.proxy != null && this.proxy.PlaybackStatus == "Playing";
-		}
+		get; private set; default = "Paused";
 	}
 
 	public class Track : Object {
@@ -120,6 +109,7 @@ public class MediaPlayer: Object {
 		this.proxy = null;
 		this._dbus_name = null;
 		this.notify_property ("is-running");
+		this.state = "Paused";
 		this.current_track = null;
 	}
 
@@ -136,6 +126,7 @@ public class MediaPlayer: Object {
 		catch (Error e) {
 			warning ("unable to launch %s: %s", appinfo.get_name (), e.message);
 		}
+		this.state = "Launching";
 	}
 
 	/**
@@ -176,7 +167,7 @@ public class MediaPlayer: Object {
 			gproxy.g_properties_changed.connect (this.proxy_properties_changed);
 
 			this.notify_property ("is-running");
-			this.notify_property ("state");
+			this.state = this.proxy.PlaybackStatus;
 			this.update_current_track (gproxy.get_cached_property ("Metadata"));
 		}
 		catch (Error e) {
@@ -201,8 +192,7 @@ public class MediaPlayer: Object {
 
 	void proxy_properties_changed (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) {
 		if (changed_properties.lookup ("PlaybackStatus", "s", null)) {
-			this.notify_property ("state");
-			this.notify_property ("is-running");
+			this.state = this.proxy.PlaybackStatus;
 		}
 
 		var metadata = changed_properties.lookup_value ("Metadata", new VariantType ("a{sv}"));
diff --git a/src/service.vala b/src/service.vala
index ad9698e..269ddd7 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -216,9 +216,13 @@ public class IndicatorSound.Service {
 		action.activate.connect ( () => { player.launch (); });
 		this.actions.insert (action);
 
-		var play_action = new SimpleAction.stateful ("play." + player.id, null, player.is_playing);
+		var play_action = new SimpleAction.stateful ("play." + player.id, null, player.state);
 		play_action.activate.connect ( () => player.play_pause () );
 		this.actions.insert (play_action);
+		player.notify.connect ( (object, pspec) => {
+			if (pspec.name == "state")
+				play_action.set_state (player.state);
+		});
 
 		var next_action = new SimpleAction ("next." + player.id, null);
 		next_action.activate.connect ( () => player.next () );