From 170d4e9ca354000aab81db6d7d6cce7058bb5d51 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 28 May 2014 09:35:09 +0200 Subject: don't ca_context_cache() the default alarm sound, since we don't use it on desktop and caching fails on phone --- src/snap.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/snap.cpp') diff --git a/src/snap.cpp b/src/snap.cpp index 0856069..a087a75 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -50,7 +50,6 @@ namespace // arbitrary number, but we need a consistent id for play/cancel const int32_t alarm_ca_id = 1; -gboolean media_cached = FALSE; ca_context *c_context = nullptr; guint timeout_tag = 0; @@ -65,18 +64,6 @@ ca_context* get_ca_context() 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); - media_cached = rv == CA_SUCCESS; - if (rv != CA_SUCCESS) - g_warning("Couldn't add '%s' to canberra cache: %s", filename, ca_strerror(rv)); - } } return c_context; @@ -106,8 +93,6 @@ void play_alarm_sound() ca_proplist* props = nullptr; ca_proplist_create(&props); - if (media_cached) - 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); @@ -307,7 +292,6 @@ Snap::Snap() Snap::~Snap() { - media_cached = false; g_clear_pointer(&c_context, ca_context_destroy); } -- cgit v1.2.3