Merge upstream master

1 files changed, 7 insertions, 7 deletions

diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index eeec0c28a4..ee697a0cc6 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -101,17 +101,17 @@ void music_all_notes_off(void) {
 }
 
 bool process_music(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == MU_ON && record->event.pressed) {
+    if (keycode == QK_MUSIC_ON && record->event.pressed) {
         music_on();
         return false;
     }
 
-    if (keycode == MU_OFF && record->event.pressed) {
+    if (keycode == QK_MUSIC_OFF && record->event.pressed) {
         music_off();
         return false;
     }
 
-    if (keycode == MU_TOG && record->event.pressed) {
+    if (keycode == QK_MUSIC_TOGGLE && record->event.pressed) {
         if (music_activated) {
             music_off();
         } else {
@@ -120,17 +120,17 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MI_ON && record->event.pressed) {
+    if (keycode == QK_MIDI_ON && record->event.pressed) {
         midi_on();
         return false;
     }
 
-    if (keycode == MI_OFF && record->event.pressed) {
+    if (keycode == QK_MIDI_OFF && record->event.pressed) {
         midi_off();
         return false;
     }
 
-    if (keycode == MI_TOG && record->event.pressed) {
+    if (keycode == QK_MIDI_TOGGLE && record->event.pressed) {
         if (midi_activated) {
             midi_off();
         } else {
@@ -139,7 +139,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
         return false;
     }
 
-    if (keycode == MU_MOD && record->event.pressed) {
+    if (keycode == QK_MUSIC_MODE_NEXT && record->event.pressed) {
         music_mode_cycle();
         return false;
     }