Merge lp:~ted/indicator-sound/greeter-control into lp:indicator-sound/14.04

[Ted Gould]

Allow the phone greeter player to control the running player in the session.

Puts both the sender and the listener of the greeter broadcast into both sides of the indicator-sound world. One emits the event through the reflector and the other receives it. Needs this branch to work:

https://code.launchpad.net/~ted/unity-greeter-session-broadcast/sound-control/+merge/208894

[lp:~ted/indicator-sound/greeter-control]

459. By Ted Gould on 2014-03-05

Try to get session broadcast if we can

460. By Ted Gould on 2014-03-05

Grab accounts service too

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/103/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/42/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/103/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:460
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/44/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/105/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

 * Is Recommends sufficient for accountsservice? Surely it's a Depends now...?

 * In GreeterBroadcast, RequestApplicationStart(), RequestHomeShown(), StartApplication(),
   ShowHome() appear to be unused. Is there another branch waiting to be stacked on top
   of this one? Otherwise, these unused methods/signals should be removed

 * In accounts-service-user, probably ought to Warn() if username != g_get_user_name()
   instead of returning silently... if that argument's wrong, something's gone wrong
   in MediaPlayerListGreeter

[lp:~ted/indicator-sound/greeter-control]

461. By Ted Gould on 2014-03-13

Don't build proxy for unused functions

[Ted Gould (ted)]

 * Is Recommends sufficient for accountsservice? Surely it's a Depends now...?

I left it as a recommends just because we wouldn't *die* without it. I'd go either way, I figured the only thing we *needed* was the lib which gets pulled in by linking.

* In GreeterBroadcast, RequestApplicationStart(), RequestHomeShown(), StartApplication(),
   ShowHome() appear to be unused. Is there another branch waiting to be stacked on top
   of this one? Otherwise, these unused methods/signals should be removed

Fixed. r461. I commented them in case someone wanted to steal this Vala code in the future.

 * In accounts-service-user, probably ought to Warn() if username != g_get_user_name()
   instead of returning silently... if that argument's wrong, something's gone wrong
   in MediaPlayerListGreeter

Those are the signals that come off the system bus, so those events can be targeted at another user session that is also running at the same time. So it can be normal that we'd get ones that aren't for us.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/108/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/indicator-sound/greeter-control]

462. By Ted Gould on 2014-03-13

Sync to latest account-service-player

[Ted Gould (ted)]

Failing because it needs a newer dbus-test-runner, updated the dep.

[lp:~ted/indicator-sound/greeter-control]

463. By Ted Gould on 2014-03-13

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:463
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[Ted Gould (ted)]

Jenkins failing because it needs to get the dbus-test-runner branch to land at the same time.

[Charles Kerr (charlesk)]

review: Approve

[lp:~ted/indicator-sound/greeter-control]

464. By Ted Gould on 2014-03-20

Update to trunk and export updates

465. By Ted Gould on 2014-03-21

Updating to latest export

=== modified file 'debian/control'
--- debian/control	2014-03-21 21:36:35 +0000
+++ debian/control	2014-03-21 21:36:35 +0000
@@ -39,6 +39,8 @@
          pulseaudio,
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
 Recommends: unity-control-center | gnome-control-center | ubuntu-system-settings | pavucontrol,
+            unity-greeter-session-broadcast,
+            accountsservice,
 Description: System sound indicator.
  System sound indicator which provides easy control of the PulseAudio sound 
  daemon.
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-21 21:36:35 +0000
+++ src/CMakeLists.txt	2014-03-21 21:36:35 +0000
@@ -64,6 +64,7 @@
   DEPENDS
     media-player
 	accounts-service-sound-settings
+    greeter-broadcast
 )
 vala_add(indicator-sound-service
   media-player-list.vala
@@ -102,10 +103,14 @@
     media-player
     mpris2-interfaces
     accounts-service-sound-settings
+    greeter-broadcast
 )
 vala_add(indicator-sound-service
   accounts-service-sound-settings.vala
 )
+vala_add(indicator-sound-service
+  greeter-broadcast.vala
+)
 
 vala_finish(indicator-sound-service
   SOURCES
 
=== modified file 'src/accounts-service-user.vala'
--- src/accounts-service-user.vala	2014-03-21 21:36:35 +0000
+++ src/accounts-service-user.vala	2014-03-21 21:36:35 +0000
@@ -23,6 +23,7 @@
 	AccountsServiceSoundSettings? proxy = null;
 	uint timer = 0;
 	MediaPlayer? _player = null;
+	GreeterBroadcast? greeter = null;
 
 	public MediaPlayer? player {
 		set {
@@ -95,6 +96,14 @@
 		user = accounts_manager.get_user(GLib.Environment.get_user_name());
 		user.notify["is-loaded"].connect(() => user_loaded_changed());
 		user_loaded_changed();
+
+		Bus.get_proxy.begin<GreeterBroadcast> (
+			BusType.SYSTEM,
+			"com.canonical.Unity.Greeter.Broadcast",
+			"/com/canonical/Unity/Greeter/Broadcast",
+			DBusProxyFlags.NONE,
+			null,
+			greeter_proxy_new);
 	}
 
 	void user_loaded_changed () {
@@ -132,4 +141,37 @@
 			warning("Unable to get proxy to user sound settings: %s", e.message);
 		}
 	}
+
+	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
+		try {
+			this.greeter = Bus.get_proxy.end (res);
+
+			this.greeter.SoundPlayPause.connect((username) => {
+				if (username != GLib.Environment.get_user_name())
+					return;
+				if (this._player == null)
+					return;
+				this._player.play_pause();
+			});
+
+			this.greeter.SoundNext.connect((username) => {
+				if (username != GLib.Environment.get_user_name())
+					return;
+				if (this._player == null)
+					return;
+				this._player.next();
+			});
+
+			this.greeter.SoundPrev.connect((username) => {
+				if (username != GLib.Environment.get_user_name())
+					return;
+				if (this._player == null)
+					return;
+				this._player.previous();
+			});
+		} catch (Error e) {
+			this.greeter = null;
+			warning("Unable to get greeter proxy: %s", e.message);
+		}
+	}
 }
 
=== added file 'src/greeter-broadcast.vala'
--- src/greeter-broadcast.vala	1970-01-01 00:00:00 +0000
+++ src/greeter-broadcast.vala	2014-03-21 21:36:35 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 © Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+[DBus (name = "com.canonical.Unity.Greeter.Broadcast")]
+public interface GreeterBroadcast : Object {
+  // methods
+  // unused public abstract async void RequestApplicationStart(string name, string appid) throws IOError;
+  // unused public abstract async void RequestHomeShown(string name) throws IOError;
+  public abstract async void RequestSoundPlayPause(string name) throws IOError;
+  public abstract async void RequestSoundNext(string name) throws IOError;
+  public abstract async void RequestSoundPrev(string name) throws IOError;
+  // signals
+  // unused public signal void StartApplication(string username, string appid);
+  // unused public signal void ShowHome(string username);
+  public signal void SoundPlayPause(string username);
+  public signal void SoundNext(string username);
+  public signal void SoundPrev(string username);
+}
 
=== modified file 'src/media-player-user.vala'
--- src/media-player-user.vala	2014-03-21 21:36:35 +0000
+++ src/media-player-user.vala	2014-03-21 21:36:35 +0000
@@ -22,6 +22,7 @@
 	string username;
 	Act.User? actuser = null;
 	AccountsServiceSoundSettings? proxy = null;
+	GreeterBroadcast? greeter = null;
 
 	HashTable<string, bool> properties_queued = new HashTable<string, bool>(str_hash, str_equal);
 	uint properties_timeout = 0;
@@ -45,6 +46,14 @@
 				null,
 				new_proxy);
 		});
+
+		Bus.get_proxy.begin<GreeterBroadcast> (
+			BusType.SYSTEM,
+			"com.canonical.Unity.Greeter.Broadcast",
+			"/com/canonical/Unity/Greeter/Broadcast",
+			DBusProxyFlags.NONE,
+			null,
+			greeter_proxy_new);
 	}
 
 	~MediaPlayerUser () {
@@ -152,6 +161,7 @@
 		get {
 			if (proxy_is_valid()) {
 				name_cache = this.proxy.player_name;
+				debug("Player Name: %s", name_cache);
 				return name_cache;
 			} else {
 				return "";
@@ -163,6 +173,7 @@
 		get {
 			if (proxy_is_valid()) {
 				state_cache = this.proxy.state;
+				debug("State: %s", state_cache);
 				return state_cache;
 			} else {
 				return "";
@@ -209,18 +220,63 @@
 		set { }
 	}
 
+	void greeter_proxy_new (GLib.Object? obj, AsyncResult res) {
+		try {
+			this.greeter = Bus.get_proxy.end (res);
+		} catch (Error e) {
+			this.greeter = null;
+			warning("Unable to get greeter proxy: %s", e.message);
+		}
+	}
+
 	/* Control functions through unity-greeter-session-broadcast */
 	public override void activate () {
 		/* TODO: */
 	}
 	public override void play_pause () {
-		/* TODO: */
+		debug("Play Pause for user: %s", this.username);
+
+		if (this.greeter != null) {
+			this.greeter.RequestSoundPlayPause.begin(this.username, (obj, res) => {
+				try {
+					(obj as GreeterBroadcast).RequestSoundPlayPause.end(res);
+				} catch (Error e) {
+					warning("Unable to send play pause: %s", e.message);
+				}
+			});
+		} else {
+			warning("No unity-greeter-session-broadcast to send play-pause");
+		}
 	}
 	public override void next () {
-		/* TODO: */
+		debug("Next for user: %s", this.username);
+
+		if (this.greeter != null) {
+			this.greeter.RequestSoundNext.begin(this.username, (obj, res) => {
+				try {
+					(obj as GreeterBroadcast).RequestSoundNext.end(res);
+				} catch (Error e) {
+					warning("Unable to send next: %s", e.message);
+				}
+			});
+		} else {
+			warning("No unity-greeter-session-broadcast to send next");
+		}
 	}
 	public override void previous () {
-		/* TODO: */
+		debug("Previous for user: %s", this.username);
+
+		if (this.greeter != null) {
+			this.greeter.RequestSoundPrev.begin(this.username, (obj, res) => {
+				try {
+					(obj as GreeterBroadcast).RequestSoundPrev.end(res);
+				} catch (Error e) {
+					warning("Unable to send previous: %s", e.message);
+				}
+			});
+		} else {
+			warning("No unity-greeter-session-broadcast to send previous");
+		}
 	}
 
 	/* Play list functions are all null as we don't support the