]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
escape song playing in music
authorJack Humbert <jack.humb@gmail.com>
Fri, 21 Jul 2017 13:45:02 +0000 (09:45 -0400)
committerJack Humbert <jack.humb@gmail.com>
Sun, 23 Jul 2017 18:59:29 +0000 (14:59 -0400)
quantum/process_keycode/process_music.c

index c01740a7f4e73262f29d425d69c8a4e27e41865b..ec2287df1b1d4ecdc5a3844ebbca28d23d19e6ff 100644 (file)
@@ -39,14 +39,16 @@ static uint8_t music_sequence_position = 0;
 static uint16_t music_sequence_timer = 0;
 static uint16_t music_sequence_interval = 100;
 
-#ifndef MUSIC_ON_SONG
-  #define MUSIC_ON_SONG SONG(MUSIC_ON_SOUND)
-#endif
-#ifndef MUSIC_OFF_SONG
-  #define MUSIC_OFF_SONG SONG(MUSIC_OFF_SOUND)
+#ifdef AUDIO_ENABLE
+  #ifndef MUSIC_ON_SONG
+    #define MUSIC_ON_SONG SONG(MUSIC_ON_SOUND)
+  #endif
+  #ifndef MUSIC_OFF_SONG
+    #define MUSIC_OFF_SONG SONG(MUSIC_OFF_SOUND)
+  #endif
+  float music_on_song[][2] = MUSIC_ON_SONG;
+  float music_off_song[][2] = MUSIC_OFF_SONG;
 #endif
-float music_on_song[][2] = MUSIC_ON_SONG;
-float music_off_song[][2] = MUSIC_OFF_SONG;
 
 static void music_noteon(uint8_t note) {
     #ifdef AUDIO_ENABLE
@@ -181,14 +183,18 @@ void music_toggle(void) {
 
 void music_on(void) {
     music_activated = 1;
-    PLAY_SONG(music_on_song);
+    #ifdef AUDIO_ENABLE
+      PLAY_SONG(music_on_song);
+    #endif
     music_on_user();
 }
 
 void music_off(void) {
     music_all_notes_off();
     music_activated = 0;
-    PLAY_SONG(music_off_song);
+    #ifdef AUDIO_ENABLE
+      PLAY_SONG(music_off_song);
+    #endif
 }
 
 void matrix_scan_music(void) {