Keep track of audio notifications too, to avoid repetitive sounds for…

… the same alarm.
horde · Apr 14, 2014 · b2bf29b · b2bf29b
1 parent a4ffe44
commit b2bf29b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/framework/Core/js/hordecore.js b/framework/Core/js/hordecore.js
@@ -24,6 +24,7 @@ var HordeCore = {
     //   submit_frame, text
 
     alarms: [],
+    audios: [],
     base: null,
     handlers: {},
     jsfiles: [],
@@ -331,6 +332,12 @@ var HordeCore = {
 
             switch (m.type) {
             case 'audio':
+                // Only play one instance of an alarm sound.
+                if (this.audios.include(m.flags.id)) {
+                    break;
+                }
+                this.audios.push(m.flags.id);
+
                 if (!this.audio) {
                     this.audio = new Element('AUDIO');
                     $(document.body).insert(this.audio);

diff --git a/framework/Core/lib/Horde/Core/Alarm/Handler/Notify.php b/framework/Core/lib/Horde/Core/Alarm/Handler/Notify.php
@@ -33,13 +33,19 @@ public function notify(array $alarm)
     {
         global $notification;
 
-        $notification->push($alarm['title'], 'horde.alarm', array(
-            'alarm' => $alarm
-        ));
+        $notification->push(
+            $alarm['title'],
+            'horde.alarm',
+            array('alarm' => $alarm)
+        );
         if (!empty($alarm['params']['notify']['sound']) &&
             !isset($this->_soundPlayed[$alarm['params']['notify']['sound']])) {
             $notification->attach('audio');
-            $notification->push($alarm['params']['notify']['sound'], 'audio');
+            $notification->push(
+                $alarm['params']['notify']['sound'],
+                'audio',
+                array('id' => $alarm['id'])
+            );
             $this->_soundPlayed[$alarm['params']['notify']['sound']] = true;
         }
     }