Merge lp:~cjcurran/unity-greeter/play-synchronised-start-up-sound into lp:unity-greeter

[Conor Curran]

This branch applies the patch to allow for the soon to be chosen startup sound for precise.

[Sebastien Bacher (seb128)]

random comment from somebody not maintaining that code:

- shouldn't that be an option?
- can't you use the libcanberra api rather than spawning commands?
- did I mention how annoying sounds on boot are before? ;-)

[Michael Terry (mterry)]

I am sure users will ask about a way to turn it off. Maybe add a gsettings option for it?

The libcanberra API question is a good one, especially since we're spawning two apps here in a racy way.

review: Needs Fixing

[lp:~cjcurran/unity-greeter/play-synchronised-start-up-sound]

287. By Conor Curran on 2012-02-15

use libcanberra vala bindings so as we can be explicit as to what theme to use

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2012-02-15 09:24:44 +0000
+++ configure.ac	2012-02-15 11:32:21 +0000
@@ -25,6 +25,7 @@
     liblightdm-gobject-1 >= 1.1.3
     freetype2
     cairo-ft
+ 	libcanberra    
 ])
 
 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-31 14:43:25 +0000
+++ src/Makefile.am	2012-02-15 11:32:21 +0000
@@ -35,7 +35,8 @@
 	--pkg gtk+-3.0 \
 	--pkg gdk-x11-3.0 \
 	--pkg x11 \
-	--pkg liblightdm-gobject-1
+	--pkg liblightdm-gobject-1 \
+	--pkg libcanberra
 
 unity_greeter_LDADD = \
 	$(UNITY_GREETER_LIBS)

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-02-15 09:22:24 +0000
+++ src/unity-greeter.vala	2012-02-15 11:32:21 +0000
@@ -17,6 +17,7 @@
  * Authored by: Robert Ancell <[e-mail]>
  */
 
+
 public const int grid_size = 40;
 
 public class UnityGreeter
@@ -55,6 +56,8 @@
 
     private string? test_username = null;
     private bool test_is_authenticated = false;
+    private uint ready_id;
+    private Canberra.Context canberra_context;
 
     public UnityGreeter ()
     {
@@ -161,6 +164,7 @@
         user_selected_cb (user_list.selected);
 
         start_fake_wm ();
+        ready_id = Gdk.threads_add_idle (ready_cb); 
     }
 
     public static void add_style_class (Gtk.Widget widget)
@@ -195,6 +199,28 @@
         return null;
     }
 
+    private bool ready_cb ()
+    {
+        debug ("starting system-ready sound");
+
+        try
+        {
+            /* Launch canberra */
+            Canberra.Context.create (out canberra_context);
+            debug ("PLAYING WITH CANBERRA");
+            canberra_context.play (0,
+                                   Canberra.PROP_CANBERRA_XDG_THEME_NAME,
+                                   "ubuntu",
+                                   Canberra.PROP_EVENT_ID,
+                                   "system-ready");
+        }
+        catch (Error e)
+        {
+            warning ("Failed to play system-ready sound through canberra: %s", e.message);
+        }
+        return false;
+    }
+
     private void user_added_cb (LightDM.User user)
     {
         debug ("Adding/updating user %s (%s)", user.name, user.real_name);
@@ -223,6 +249,7 @@
     public void show ()
     {
         debug ("Showing main window");
+
         main_window.show ();
         main_window.get_window ().focus (Gdk.CURRENT_TIME);
     }