aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorpurpleP <warrior2031@mail.ru>2016-05-19 15:36:28 +0300
committerJack Humbert <jack.humb@gmail.com>2016-05-19 08:36:28 -0400
commit0275d444d77c9d85d2189b09d8813fb76dc4d566 (patch)
tree605b21c66cc265bbd44f9efb47d82352dbe8c479 /quantum/quantum.c
parentb732b79b49b098dba8e14493c745075f336747d8 (diff)
downloadqmk_firmware-0275d444d77c9d85d2189b09d8813fb76dc4d566.tar.gz
qmk_firmware-0275d444d77c9d85d2189b09d8813fb76dc4d566.zip
fixed small bug with AUDIO_ENABLED (#339)
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c43
1 files changed, 22 insertions, 21 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 1e91ac04a..34c575af4 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -20,7 +20,7 @@ void leader_end(void) {}
20 20
21uint8_t starting_note = 0x0C; 21uint8_t starting_note = 0x0C;
22int offset = 7; 22int offset = 7;
23 23
24#ifdef AUDIO_ENABLE 24#ifdef AUDIO_ENABLE
25 bool music_activated = false; 25 bool music_activated = false;
26 float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); 26 float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
@@ -435,28 +435,29 @@ void matrix_scan_quantum() {
435 435
436 matrix_scan_kb(); 436 matrix_scan_kb();
437} 437}
438#ifdef AUDIO_ENABLE
439 bool is_music_on(void) {
440 return (music_activated != 0);
441 }
438 442
439bool is_music_on(void) { 443 void music_toggle(void) {
440 return (music_activated != 0); 444 if (!music_activated) {
441} 445 music_on();
442 446 } else {
443void music_toggle(void) { 447 music_off();
444 if (!music_activated) { 448 }
445 music_on(); 449 }
446 } else {
447 music_off();
448 }
449}
450 450
451void music_on(void) { 451 void music_on(void) {
452 music_activated = 1; 452 music_activated = 1;
453 music_on_user(); 453 music_on_user();
454} 454 }
455 455
456void music_off(void) { 456 void music_off(void) {
457 music_activated = 0; 457 music_activated = 0;
458 stop_all_notes(); 458 stop_all_notes();
459} 459 }
460 460
461#endif
461__attribute__ ((weak)) 462__attribute__ ((weak))
462void music_on_user() {} \ No newline at end of file 463void music_on_user() {}