From 98eb9efebeadf69fc73613c6764a97f6f8163ec4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 4 Feb 2014 17:10:48 -0600
Subject: add the alarm bell to the canberra cache before it gets played in a
 loop.

---
 src/snap.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index ed8442a..a64f358 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -54,11 +54,23 @@ ca_context* get_ca_context()
     if (G_UNLIKELY(c_context == nullptr))
     {
         int rv;
+
         if ((rv = ca_context_create(&c_context)) != CA_SUCCESS)
         {
             g_warning("Failed to create canberra context: %s\n", ca_strerror(rv));
             c_context = nullptr;
         }
+        else
+        {
+            const char* filename = ALARM_SOUND_FILENAME;
+            rv = ca_context_cache(c_context,
+                                  CA_PROP_EVENT_ID, "alarm",
+                                  CA_PROP_MEDIA_FILENAME, filename,
+                                  CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
+                                  NULL);
+            if (rv != CA_SUCCESS)
+                g_warning("Couldn't add '%s' to canberra cache: %s", filename, ca_strerror(rv));
+        }
     }
 
     return c_context;
@@ -72,19 +84,22 @@ gboolean play_alarm_sound_idle (gpointer)
     return G_SOURCE_REMOVE;
 }
 
-void on_alarm_play_done (ca_context* /*context*/, uint32_t /*id*/, int /*rv*/, void* /*user_data*/)
+void on_alarm_play_done (ca_context* /*context*/, uint32_t /*id*/, int rv, void* /*user_data*/)
 {
     // wait one second, then play it again
-    g_timeout_add_seconds (1, play_alarm_sound_idle, nullptr);
+    if (rv == CA_SUCCESS)
+        g_timeout_add_seconds (1, play_alarm_sound_idle, nullptr);
 }
 
-void play_soundfile(const char* filename)
+void play_alarm_sound()
 {
+    const gchar* filename = ALARM_SOUND_FILENAME;
     auto context = get_ca_context();
     g_return_if_fail(context != nullptr);
 
     ca_proplist* props = nullptr;
     ca_proplist_create(&props);
+    ca_proplist_sets(props, CA_PROP_EVENT_ID, "alarm");
     ca_proplist_sets(props, CA_PROP_MEDIA_FILENAME, filename);
 
     const auto rv = ca_context_play_full(context, alarm_ca_id, props, on_alarm_play_done, nullptr);
@@ -94,11 +109,6 @@ void play_soundfile(const char* filename)
     g_clear_pointer(&props, ca_proplist_destroy);
 }
 
-void play_alarm_sound()
-{
-    play_soundfile(ALARM_SOUND_FILENAME);
-}
-
 void stop_alarm_sound()
 {
     auto context = get_ca_context();
-- 
cgit v1.2.3