Merge lp:~seb128/unity-settings-daemon/sound_delay_init into lp:unity-settings-daemon

[Sebastien Bacher]

media-keys: Postpone initialisation of libcanberra

media-keys: Postpone initialisation of libcanberra

[lp:~seb128/unity-settings-daemon/sound_delay_init]

4102. By Bastien Nocera on 2015-10-08

media-keys: Fix compilation failure

[Marco Trevisan (Treviño) (3v1n0)]

ok

review: Approve

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2015-09-30 14:04:11 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2015-10-08 14:28:35 +0000
@@ -1358,6 +1358,41 @@
 }
 
 static void
+sound_theme_changed (GtkSettings         *settings,
+                     GParamSpec          *pspec,
+                     GsdMediaKeysManager *manager)
+{
+        char *theme_name;
+
+        g_object_get (G_OBJECT (manager->priv->gtksettings), "gtk-sound-theme-name", &theme_name, NULL);
+        if (theme_name)
+                ca_context_change_props (manager->priv->ca, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL);
+        g_free (theme_name);
+}
+
+static void
+ensure_canberra (GsdMediaKeysManager *manager)
+{
+	char *theme_name;
+
+	if (manager->priv->ca != NULL)
+		return;
+
+        ca_context_create (&manager->priv->ca);
+        ca_context_set_driver (manager->priv->ca, "pulse");
+        ca_context_change_props (manager->priv->ca, 0,
+                                 CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl",
+                                 NULL);
+        manager->priv->gtksettings = gtk_settings_get_for_screen (gdk_screen_get_default ());
+        g_object_get (G_OBJECT (manager->priv->gtksettings), "gtk-sound-theme-name", &theme_name, NULL);
+        if (theme_name)
+                ca_context_change_props (manager->priv->ca, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL);
+        g_free (theme_name);
+        g_signal_connect (manager->priv->gtksettings, "notify::gtk-sound-theme-name",
+                          G_CALLBACK (sound_theme_changed), manager);
+}
+
+static void
 update_dialog (GsdMediaKeysManager *manager,
                GvcMixerStream      *stream,
                guint                vol,
@@ -1389,6 +1424,7 @@
 
 done:
         if (quiet == FALSE && sound_changed != FALSE && muted == FALSE) {
+                ensure_canberra (manager);
                 ca_context_change_device (manager->priv->ca,
                                           gvc_mixer_stream_get_name (stream));
                 ca_context_play (manager->priv->ca, 1,
@@ -1594,19 +1630,6 @@
 }
 
 static void
-sound_theme_changed (GtkSettings         *settings,
-                     GParamSpec          *pspec,
-                     GsdMediaKeysManager *manager)
-{
-        char *theme_name;
-
-        g_object_get (G_OBJECT (manager->priv->gtksettings), "gtk-sound-theme-name", &theme_name, NULL);
-        if (theme_name)
-                ca_context_change_props (manager->priv->ca, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL);
-        g_free (theme_name);
-}
-
-static void
 update_default_sink (GsdMediaKeysManager *manager)
 {
         GvcMixerStream *stream;
@@ -3011,7 +3034,6 @@
 start_media_keys_idle_cb (GsdMediaKeysManager *manager)
 {
         const gchar *module;
-        char *theme_name;
 
         g_debug ("Starting media_keys manager");
         gnome_settings_profile_start (NULL);
@@ -3061,20 +3083,6 @@
 
         manager->priv->sound_settings = g_settings_new ("com.ubuntu.sound");
 
-        /* Sound events */
-        ca_context_create (&manager->priv->ca);
-        ca_context_set_driver (manager->priv->ca, "pulse");
-        ca_context_change_props (manager->priv->ca, 0,
-                                 CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl",
-                                 NULL);
-        manager->priv->gtksettings = gtk_settings_get_for_screen (gdk_screen_get_default ());
-        g_object_get (G_OBJECT (manager->priv->gtksettings), "gtk-sound-theme-name", &theme_name, NULL);
-        if (theme_name)
-                ca_context_change_props (manager->priv->ca, CA_PROP_CANBERRA_XDG_THEME_NAME, theme_name, NULL);
-        g_free (theme_name);
-        g_signal_connect (manager->priv->gtksettings, "notify::gtk-sound-theme-name",
-                          G_CALLBACK (sound_theme_changed), manager);
-
         /* for the power plugin interface code */
         manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);