From 2e14b67ca57829d097b9e850e95b96934ec7d97d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 26 Mar 2018 16:26:09 +0200 Subject: honor gsettings for calendar events --- src/snap.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/snap.cpp') diff --git a/src/snap.cpp b/src/snap.cpp index 326e676..f0300af 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -98,8 +98,7 @@ public: if (appointment.is_ubuntu_alarm() || !silent_mode()) { // create the sound. const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert"; - const auto default_sound = appointment.is_ubuntu_alarm() ? ALARM_DEFAULT_SOUND : CALENDAR_DEFAULT_SOUND; - const auto uri = get_alarm_uri(alarm, m_settings, default_sound); + const auto uri = get_alarm_uri(appointment, alarm, m_settings); const auto volume = m_settings->alarm_volume.get(); const bool loop = interactive; sound = std::make_shared(role, uri, volume, loop); @@ -191,13 +190,16 @@ private: && (accounts_service_sound_get_other_vibrate(m_accounts_service_sound_proxy)); } - std::string get_alarm_uri(const Alarm& alarm, - const std::shared_ptr& settings, - const std::string& default_sound ) const + std::string get_alarm_uri(const Appointment& appointment, + const Alarm& alarm, + const std::shared_ptr& settings) const { - const std::string candidates[] = { alarm.audio_url, - settings->alarm_sound.get(), - default_sound }; + const auto is_alarm = appointment.is_ubuntu_alarm(); + const std::string candidates[] = { + alarm.audio_url, + is_alarm ? settings->alarm_sound.get() : settings->calendar_sound.get(), + is_alarm ? ALARM_DEFAULT_SOUND : CALENDAR_DEFAULT_SOUND + }; std::string uri; -- cgit v1.2.3