escape song playing in music
This commit is contained in:
parent
fe113ebad5
commit
fd664fe85b
|
@ -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)
|
||||
#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
|
||||
#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;
|
||||
|
||||
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) {
|
||||
|
|
Loading…
Reference in New Issue