aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-21 09:45:02 -0400
committerJack Humbert <jack.humb@gmail.com>2017-07-23 14:59:29 -0400
commitfd664fe85b4d6e8a849ae47be5e29857fa3a24a5 (patch)
tree83383d5a4b5ee738b029c4f6e80d45fb26f0c24b
parentfe113ebad56e758d635724dc35f2a4e26a6985ee (diff)
downloadfirmware-fd664fe85b4d6e8a849ae47be5e29857fa3a24a5.tar.gz
firmware-fd664fe85b4d6e8a849ae47be5e29857fa3a24a5.tar.bz2
firmware-fd664fe85b4d6e8a849ae47be5e29857fa3a24a5.zip
escape song playing in music
-rw-r--r--quantum/process_keycode/process_music.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index c01740a7f..ec2287df1 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -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) {