Merge lp:~ted/unity-greeter-session-broadcast/sound-control into lp:unity-greeter-session-broadcast/14.04

[Ted Gould]

Sound menu action support

Adds support for signaling the menu items in the sound menu from the greeter.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-trusty-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-session-broadcast-ci/15/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'data/com.canonical.Unity.Greeter.Broadcast.xml'
--- data/com.canonical.Unity.Greeter.Broadcast.xml	2013-09-12 14:07:54 +0000
+++ data/com.canonical.Unity.Greeter.Broadcast.xml	2014-02-28 22:43:30 +0000
@@ -11,6 +11,18 @@
 			<arg type="s" name="username" direction="in" />
 		</method>
 
+		<method name="RequestSoundPlayPause">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<method name="RequestSoundNext">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
+		<method name="RequestSoundPrev">
+			<arg type="s" name="username" direction="in" />
+		</method>
+
 		<!-- To the Session -->
 		<signal name="StartApplication">
 			<arg type="s" name="username" direction="out" />
@@ -21,6 +33,18 @@
 			<arg type="s" name="username" direction="out" />
 		</signal>
 
+		<signal name="SoundPlayPause">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<signal name="SoundNext">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
+		<signal name="SoundPrev">
+			<arg type="s" name="username" direction="out" />
+		</signal>
+
 		<!-- Other -->
 	</interface>
 </node>

=== modified file 'service/service.c'
--- service/service.c	2013-09-12 14:07:54 +0000
+++ service/service.c	2014-02-28 22:43:30 +0000
@@ -47,6 +47,45 @@
     return TRUE;
 }
 
+static gboolean
+on_handle_request_sound_play_pause (ServiceIfaceComCanonicalUnityGreeterBroadcast *object,
+                                    GDBusMethodInvocation *invocation,
+                                    const gchar *arg_username)
+{
+    /* Simply pass the request on */
+    service_iface_com_canonical_unity_greeter_broadcast_emit_sound_play_pause (object,
+                                                                               arg_username);
+    service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_play_pause (object,
+                                                                                           invocation);
+    return TRUE;
+}
+
+static gboolean
+on_handle_request_sound_next (ServiceIfaceComCanonicalUnityGreeterBroadcast *object,
+                              GDBusMethodInvocation *invocation,
+                              const gchar *arg_username)
+{
+    /* Simply pass the request on */
+    service_iface_com_canonical_unity_greeter_broadcast_emit_sound_next (object,
+                                                                         arg_username);
+    service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_next (object,
+                                                                                     invocation);
+    return TRUE;
+}
+
+static gboolean
+on_handle_request_sound_prev (ServiceIfaceComCanonicalUnityGreeterBroadcast *object,
+                              GDBusMethodInvocation *invocation,
+                              const gchar *arg_username)
+{
+    /* Simply pass the request on */
+    service_iface_com_canonical_unity_greeter_broadcast_emit_sound_prev (object,
+                                                                         arg_username);
+    service_iface_com_canonical_unity_greeter_broadcast_complete_request_sound_prev (object,
+                                                                                     invocation);
+    return TRUE;
+}
+
 static void
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
@@ -83,6 +122,7 @@
 
     interface = service_iface_com_canonical_unity_greeter_broadcast_skeleton_new ();
 
+    /* Application Launching */
     g_signal_connect (interface,
                       "handle-request-application-start",
                       G_CALLBACK (on_handle_request_application_start),
@@ -92,6 +132,20 @@
                       G_CALLBACK (on_handle_request_home_shown),
                       NULL);
 
+    /* Sound stuff */
+    g_signal_connect (interface,
+                      "handle-request-sound-play-pause",
+                      G_CALLBACK (on_handle_request_sound_play_pause),
+                      NULL);
+    g_signal_connect (interface,
+                      "handle-request-sound-next",
+                      G_CALLBACK (on_handle_request_sound_next),
+                      NULL);
+    g_signal_connect (interface,
+                      "handle-request-sound-prev",
+                      G_CALLBACK (on_handle_request_sound_prev),
+                      NULL);
+
     owner_id = g_bus_own_name (G_BUS_TYPE_SYSTEM,
                                "com.canonical.Unity.Greeter.Broadcast",
                                G_BUS_NAME_OWNER_FLAGS_NONE,

=== modified file 'tests/manual'
--- tests/manual	2014-02-05 05:18:45 +0000
+++ tests/manual	2014-02-28 22:43:30 +0000
@@ -11,3 +11,28 @@
 	    <dd>If there is a PIN set the dialog should be shown, enter the PIN</dd>
 		<dd>The session should open with the selected app in focus</dd>
 </dl>
+
+Test-case unity-greeter-session-broadcast/sound-control-relay
+<dl>
+    <dt>NOTE: This test requires the separated greeter to land before it can be executed</dt>
+	<dt>Start Music playing using the music app (may require copying music to the device)</dt>
+	    <dd>Music should be playing out the speaker</dd>
+	<dt>Open the Sound Indicator</dt>
+	    <dd>The music player should be listed</dd>
+	    <dd>The currently playing song should be shown</dd>
+	<dt>Lock the screen of the device</dt>
+	    <dd>Music should still be playing out the speaker</dd>
+	<dt>Click the power button to cause the screen to turn on</dt>
+	    <dd>The screen should contain the lock screen</dd>
+	<dt>Open the Sound Indicator</dt>
+	    <dd>The music player should be listed</dd>
+	    <dd>The currently playing song should be shown</dd>
+	<dt>Press the Pause button</dt>
+	    <dd>The music should stop playing</dd>
+	<dt>Press the Play button</dt>
+	    <dd>The music should continue where it left off</dd>
+	<dt>Press the Next button</dt>
+	    <dd>The music should switch to the next track</dd>
+	<dt>Press the Previous button</dt>
+	    <dd>The music should switch to the previously playing track</dd>
+</dl>