Merge pull request #15 from fewieden/develop

Develop
fewieden · May 27, 2018 · c5a4cda · c5a4cda
2 parents b5158cb + bdca3a4
commit c5a4cda
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/MMM-AlarmClock.js b/MMM-AlarmClock.js
@@ -284,12 +284,16 @@ Module.register('MMM-AlarmClock', {
             wrapper.appendChild(text);
         } else if (this.alarmFired) {
             const sound = document.createElement('audio');
-            sound.setAttribute('id', 'MMM-AlarmClock-Player');
-            if (this.config.sound.match(/^https?:\/\//)) {
-                sound.src = this.config.sound;
-            } else {
-                sound.src = this.file(`sounds/${this.config.sound}`);
+            let srcSound = this.config.sound;
+            if (this.next.sound) {
+                srcSound = this.next.sound;
             }
+            if (!srcSound.match(/^https?:\/\//)) {
+                srcSound = this.file(`sounds/${srcSound}`);
+            }
+            sound.src = srcSound;
+            sound.volume = this.config.volume;
+            sound.setAttribute('id', 'MMM-AlarmClock-Player');
             sound.volume = this.config.fade ? 0 : this.config.volume;
             sound.setAttribute('autoplay', true);
             sound.setAttribute('loop', true);

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Alarm Clock Module for MagicMirror<sup>2</sup>
         position: 'top_right',
         config: {
             alarms: [
-                {time: "18:30", days: [2,4], title: "Soccer", message: "Get ready for soccer training!"},
+                {time: "18:30", days: [2,4], title: "Soccer", message: "Get ready for soccer training!", sound: "alarm.mp3"},
                 ...
             ],
             ...
@@ -33,7 +33,7 @@ Alarm Clock Module for MagicMirror<sup>2</sup>
 
 | **Option** | **Default** | **Description** |
 | --- | --- | --- |
-| `alarm` | `REQUIRED` | An Array with all your alarms as objects. Those objects need to have the properties -> time: 24h format, days: Array of all days the alarm should be fired (0 = Sunday, 6 = Saturday), title and message. |
+| `alarms` | `REQUIRED` | An Array with all your alarms as objects. Those objects need to have the properties -> time: 24h format, days: Array of all days the alarm should be fired (0 = Sunday, 6 = Saturday), title, message, and sound. If sound is not defined, alarm will be fired with module defined/default alarm sound. |
 | `sound` | `'alarm.mp3'` | Name and extension of your alarm sound. File needs to be placed in `~/MagicMirror/modules/MMM-AlarmClock/sounds`. Standard files are `alarm.mp3` and `blackforest.mp3`.  Alternatively specify a web stream `http` or `https`. |
 | `volume` | `1.0` | The volume of the alarm sound in a range from `0.0` to `1.0` |
 | `touch` | `false` | If you are using a touch screen device you need to press a button to disable an alarm.. |