1 files changed, 199 insertions, 199 deletions
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index b3e6d161f3..93710162cc 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -28,282 +28,282 @@
 /* variable button definitions */
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define BTN_QUIT         BUTTON_OFF
+#define MIDI_QUIT       BUTTON_OFF
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_RC_QUIT      BUTTON_RC_STOP
+#define MIDI_RC_QUIT    BUTTON_RC_STOP
-#define BTN_PLAY         BUTTON_ON
+#define MIDI_PLAYPAUSE  BUTTON_ON
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
      (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#define BTN_QUIT         (BUTTON_SELECT | BUTTON_MENU)
+#define MIDI_QUIT       (BUTTON_SELECT | BUTTON_MENU)
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_SCROLL_FWD
+#define MIDI_VOL_UP     BUTTON_SCROLL_FWD
-#define BTN_DOWN         BUTTON_SCROLL_BACK
+#define MIDI_VOL_DOWN   BUTTON_SCROLL_BACK
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_A
+#define MIDI_PLAYPAUSE  BUTTON_A
 #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_SCROLL_FWD
+#define MIDI_VOL_UP     BUTTON_SCROLL_FWD
-#define BTN_DOWN         BUTTON_SCROLL_BACK
+#define MIDI_VOL_DOWN   BUTTON_SCROLL_BACK
-#define BTN_PLAY         BUTTON_UP
+#define MIDI_PLAYPAUSE  BUTTON_UP
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define BTN_QUIT         (BUTTON_HOME|BUTTON_REPEAT)
+#define MIDI_QUIT       (BUTTON_HOME|BUTTON_REPEAT)
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_SCROLL_FWD
+#define MIDI_VOL_UP     BUTTON_SCROLL_FWD
-#define BTN_DOWN         BUTTON_SCROLL_BACK
+#define MIDI_VOL_DOWN   BUTTON_SCROLL_BACK
-#define BTN_PLAY         BUTTON_UP
+#define MIDI_PLAYPAUSE  BUTTON_UP
 #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \
 (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
 (CONFIG_KEYPAD == SANSA_M200_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_VOL_UP
+#define MIDI_VOL_UP     BUTTON_VOL_UP
-#define BTN_DOWN         BUTTON_VOL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_VOL_DOWN
-#define BTN_PLAY         BUTTON_UP
+#define MIDI_PLAYPAUSE  BUTTON_UP
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_SCROLL_UP
+#define MIDI_VOL_UP     BUTTON_SCROLL_UP
-#define BTN_DOWN         BUTTON_SCROLL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_SCROLL_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == MROBE500_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_RC_PLAY
+#define MIDI_VOL_UP     BUTTON_RC_PLAY
-#define BTN_DOWN         BUTTON_RC_DOWN
+#define MIDI_VOL_DOWN   BUTTON_RC_DOWN
-#define BTN_PLAY         BUTTON_RC_HEART
+#define MIDI_PLAYPAUSE  BUTTON_RC_HEART
 #elif (CONFIG_KEYPAD == MROBE100_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_DISPLAY
+#define MIDI_PLAYPAUSE  BUTTON_DISPLAY
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define BTN_QUIT         BUTTON_RC_REC
+#define MIDI_QUIT       BUTTON_RC_REC
-#define BTN_RIGHT        BUTTON_RC_FF
+#define MIDI_FFWD       BUTTON_RC_FF
-#define BTN_LEFT         BUTTON_RC_REW
+#define MIDI_REWIND     BUTTON_RC_REW
-#define BTN_UP           BUTTON_RC_VOL_UP
+#define MIDI_VOL_UP     BUTTON_RC_VOL_UP
-#define BTN_DOWN         BUTTON_RC_VOL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_RC_VOL_DOWN
-#define BTN_PLAY         BUTTON_RC_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_RC_PLAY
 #elif CONFIG_KEYPAD == COWON_D2_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
 #elif CONFIG_KEYPAD == IAUDIO67_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_STOP
+#define MIDI_VOL_UP     BUTTON_STOP
-#define BTN_DOWN         BUTTON_PLAY
+#define MIDI_VOL_DOWN   BUTTON_PLAY
-#define BTN_PLAY         BUTTON_MENU
+#define MIDI_PLAYPAUSE  BUTTON_MENU
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define BTN_QUIT         BUTTON_BACK
+#define MIDI_QUIT       BUTTON_BACK
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
-#define BTN_QUIT        (BUTTON_PLAY|BUTTON_REPEAT)
+#define MIDI_QUIT       BUTTON_PLAY|BUTTON_REPEAT)
-#define BTN_RIGHT        BUTTON_MENU
+#define MIDI_FFWD       BUTTON_MENU
-#define BTN_LEFT         BUTTON_BACK
+#define MIDI_REWIND     BUTTON_BACK
-#define BTN_UP           BUTTON_VOL_UP
+#define MIDI_VOL_UP     BUTTON_VOL_UP
-#define BTN_DOWN         BUTTON_VOL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_VOL_DOWN
-#define BTN_PLAY        (BUTTON_PLAY|BUTTON_REL)
+#define MIDI_PLAYPAUSE  (BUTTON_PLAY|BUTTON_REL)
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_MENU
+#define MIDI_PLAYPAUSE  BUTTON_MENU
 #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_MENU
+#define MIDI_PLAYPAUSE  BUTTON_MENU
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_NEXT
+#define MIDI_FFWD       BUTTON_NEXT
-#define BTN_LEFT         BUTTON_PREV
+#define MIDI_REWIND     BUTTON_PREV
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_MENU
+#define MIDI_PLAYPAUSE  BUTTON_MENU
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
-#define BTN_QUIT         (BUTTON_PLAY|BUTTON_REPEAT)
+#define MIDI_QUIT       (BUTTON_PLAY|BUTTON_REPEAT)
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
-#define BTN_QUIT         BUTTON_REC
+#define MIDI_QUIT       BUTTON_REC
-#define BTN_RIGHT        BUTTON_NEXT
+#define MIDI_FFWD       BUTTON_NEXT
-#define BTN_LEFT         BUTTON_PREV
+#define MIDI_REWIND     BUTTON_PREV
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define BTN_QUIT         (BUTTON_REC | BUTTON_PLAY)
+#define MIDI_QUIT       (BUTTON_REC | BUTTON_PLAY)
-#define BTN_RIGHT        BUTTON_FF
+#define MIDI_FFWD       BUTTON_FF
-#define BTN_LEFT         BUTTON_REW
+#define MIDI_REWIND     BUTTON_REW
-#define BTN_UP           BUTTON_VOL_UP
+#define MIDI_VOL_UP     BUTTON_VOL_UP
-#define BTN_DOWN         BUTTON_VOL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_VOL_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == MPIO_HD300_PAD
-#define BTN_QUIT         (BUTTON_MENU | BUTTON_REPEAT)
+#define MIDI_QUIT       (BUTTON_MENU | BUTTON_REPEAT)
-#define BTN_RIGHT        BUTTON_FF
+#define MIDI_FFWD       BUTTON_FF
-#define BTN_LEFT         BUTTON_REW
+#define MIDI_REWIND     BUTTON_REW
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAYPAUSE
+#define MIDI_PLAYPAUSE  BUTTON_PLAYPAUSE
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_SELECT
+#define MIDI_PLAYPAUSE  BUTTON_SELECT
 #elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD
-#define BTN_QUIT         BUTTON_BACK
+#define MIDI_QUIT       BUTTON_BACK
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_USER
+#define MIDI_PLAYPAUSE  BUTTON_USER
 #elif (CONFIG_KEYPAD == HM60X_PAD) || \
    (CONFIG_KEYPAD == HM801_PAD)
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_SELECT
+#define MIDI_PLAYPAUSE  BUTTON_SELECT
 #elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
-#define BTN_QUIT         BUTTON_BACK
+#define MIDI_QUIT       BUTTON_BACK
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAY
+#define MIDI_PLAYPAUSE  BUTTON_PLAY
 #elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)
-#define BTN_QUIT         BUTTON_BACK
+#define MIDI_QUIT       BUTTON_BACK
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_UP
+#define MIDI_VOL_UP     BUTTON_UP
-#define BTN_DOWN         BUTTON_DOWN
+#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define BTN_PLAY         BUTTON_PLAYPAUSE
+#define MIDI_PLAYPAUSE  BUTTON_PLAYPAUSE
 #elif CONFIG_KEYPAD == DX50_PAD
-#define BTN_QUIT         BUTTON_POWER
+#define MIDI_QUIT       BUTTON_POWER
-#define BTN_RIGHT        BUTTON_RIGHT
+#define MIDI_FFWD       BUTTON_RIGHT
-#define BTN_LEFT         BUTTON_LEFT
+#define MIDI_REWIND     BUTTON_LEFT
-#define BTN_UP           BUTTON_VOL_UP
+#define MIDI_VOL_UP     BUTTON_VOL_UP
-#define BTN_DOWN         BUTTON_VOL_DOWN
+#define MIDI_VOL_DOWN   BUTTON_VOL_DOWN
 #else
 #error No keymap defined!
 #endif
 #ifdef HAVE_TOUCHSCREEN
-#ifndef BTN_QUIT
+#ifndef MIDI_QUIT
-#define BTN_QUIT         BUTTON_TOPLEFT
+#define MIDI_QUIT       BUTTON_TOPLEFT
 #endif
-#ifndef BTN_RIGHT
+#ifndef MIDI_FFWD
-#define BTN_RIGHT        BUTTON_MIDRIGHT
+#define MIDI_FFWD       BUTTON_MIDRIGHT
 #endif
-#ifndef BTN_LEFT
+#ifndef MIDI_REWIND
-#define BTN_LEFT         BUTTON_MIDLEFT
+#define MIDI_REWIND     BUTTON_MIDLEFT
 #endif
-#ifndef BTN_UP
+#ifndef MIDI_VOL_UP
-#define BTN_UP           BUTTON_TOPMIDDLE
+#define MIDI_VOL_UP     BUTTON_TOPMIDDLE
 #endif
-#ifndef BTN_DOWN
+#ifndef MIDI_VOL_DOWN
-#define BTN_DOWN         BUTTON_BOTTOMMIDDLE
+#define MIDI_VOL_DOWN   BUTTON_BOTTOMMIDDLE
 #endif
-#ifndef BTN_PLAY
+#ifndef MIDI_PLAYPAUSE
-#define BTN_PLAY         BUTTON_CENTER
+#define MIDI_PLAYPAUSE  BUTTON_CENTER
 #endif
 #endif
@@ -452,8 +452,8 @@ static int midimain(const void * filename)
        /* Code taken from Oscilloscope plugin */
        switch (rb->button_get(false))
        {
-            case BTN_UP:
+            case MIDI_VOL_UP:
-            case BTN_UP | BUTTON_REPEAT:
+            case MIDI_VOL_UP | BUTTON_REPEAT:
            {
                vol = rb->global_settings->volume;
                if (vol < rb->sound_max(SOUND_VOLUME))
@@ -465,8 +465,8 @@ static int midimain(const void * filename)
                break;
            }
-            case BTN_DOWN:
+            case MIDI_VOL_DOWN:
-            case BTN_DOWN | BUTTON_REPEAT:
+            case MIDI_VOL_DOWN | BUTTON_REPEAT:
            {
                vol = rb->global_settings->volume;
                if (vol > rb->sound_min(SOUND_VOLUME))
@@ -478,7 +478,7 @@ static int midimain(const void * filename)
                break;
            }
-            case BTN_LEFT:
+            case MIDI_REWIND:
            {
                /* Rewinding is tricky. Basically start the file over */
                /* but run through the tracks without the synth running */
@@ -490,7 +490,7 @@ static int midimain(const void * filename)
                break;
            }
-            case BTN_RIGHT:
+            case MIDI_FFWD:
            {
                rb->pcm_play_stop();
                seekForward(5);
@@ -500,7 +500,7 @@ static int midimain(const void * filename)
                break;
            }
-            case BTN_PLAY:
+            case MIDI_PLAYPAUSE:
            {
                if (is_playing)
                {
@@ -516,10 +516,10 @@ static int midimain(const void * filename)
                break;
            }
-#ifdef BTN_RC_QUIT
+#ifdef MIDI_RC_QUIT
-            case BTN_RC_QUIT:
+            case MIDI_RC_QUIT:
 #endif
-            case BTN_QUIT:
+            case MIDI_QUIT:
                quit = true;
        }
    }

diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index b3e6d161f3..93710162cc 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c
@@ -28,282 +28,282 @@
28		28
29	/* variable button definitions */	29	/* variable button definitions */
30	#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \|\| (CONFIG_KEYPAD == IRIVER_H300_PAD)	30	#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \|\| (CONFIG_KEYPAD == IRIVER_H300_PAD)
31	#define BTN_QUIT BUTTON_OFF	31	#define MIDI_QUIT BUTTON_OFF
32	#define BTN_RIGHT BUTTON_RIGHT	32	#define MIDI_FFWD BUTTON_RIGHT
33	#define BTN_UP BUTTON_UP	33	#define MIDI_VOL_UP BUTTON_UP
34	#define BTN_DOWN BUTTON_DOWN	34	#define MIDI_VOL_DOWN BUTTON_DOWN
35	#define BTN_LEFT BUTTON_LEFT	35	#define MIDI_REWIND BUTTON_LEFT
36	#define BTN_RC_QUIT BUTTON_RC_STOP	36	#define MIDI_RC_QUIT BUTTON_RC_STOP
37	#define BTN_PLAY BUTTON_ON	37	#define MIDI_PLAYPAUSE BUTTON_ON
38		38
39	#elif (CONFIG_KEYPAD == IPOD_4G_PAD) \|\| (CONFIG_KEYPAD == IPOD_3G_PAD) \|\| \	39	#elif (CONFIG_KEYPAD == IPOD_4G_PAD) \|\| (CONFIG_KEYPAD == IPOD_3G_PAD) \|\| \
40	(CONFIG_KEYPAD == IPOD_1G2G_PAD)	40	(CONFIG_KEYPAD == IPOD_1G2G_PAD)
41	#define BTN_QUIT (BUTTON_SELECT \| BUTTON_MENU)	41	#define MIDI_QUIT (BUTTON_SELECT \| BUTTON_MENU)
42	#define BTN_RIGHT BUTTON_RIGHT	42	#define MIDI_FFWD BUTTON_RIGHT
43	#define BTN_LEFT BUTTON_LEFT	43	#define MIDI_REWIND BUTTON_LEFT
44	#define BTN_UP BUTTON_SCROLL_FWD	44	#define MIDI_VOL_UP BUTTON_SCROLL_FWD
45	#define BTN_DOWN BUTTON_SCROLL_BACK	45	#define MIDI_VOL_DOWN BUTTON_SCROLL_BACK
46	#define BTN_PLAY BUTTON_PLAY	46	#define MIDI_PLAYPAUSE BUTTON_PLAY
47		47
48		48
49	#elif (CONFIG_KEYPAD == GIGABEAT_PAD)	49	#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
50	#define BTN_QUIT BUTTON_POWER	50	#define MIDI_QUIT BUTTON_POWER
51	#define BTN_RIGHT BUTTON_RIGHT	51	#define MIDI_FFWD BUTTON_RIGHT
52	#define BTN_LEFT BUTTON_LEFT	52	#define MIDI_REWIND BUTTON_LEFT
53	#define BTN_UP BUTTON_UP	53	#define MIDI_VOL_UP BUTTON_UP
54	#define BTN_DOWN BUTTON_DOWN	54	#define MIDI_VOL_DOWN BUTTON_DOWN
55	#define BTN_PLAY BUTTON_A	55	#define MIDI_PLAYPAUSE BUTTON_A
56		56
57		57
58	#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)	58	#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
59	#define BTN_QUIT BUTTON_POWER	59	#define MIDI_QUIT BUTTON_POWER
60	#define BTN_RIGHT BUTTON_RIGHT	60	#define MIDI_FFWD BUTTON_RIGHT
61	#define BTN_LEFT BUTTON_LEFT	61	#define MIDI_REWIND BUTTON_LEFT
62	#define BTN_UP BUTTON_UP	62	#define MIDI_VOL_UP BUTTON_UP
63	#define BTN_DOWN BUTTON_DOWN	63	#define MIDI_VOL_DOWN BUTTON_DOWN
64	#define BTN_PLAY BUTTON_PLAY	64	#define MIDI_PLAYPAUSE BUTTON_PLAY
65		65
66		66
67	#elif (CONFIG_KEYPAD == SANSA_E200_PAD)	67	#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
68	#define BTN_QUIT BUTTON_POWER	68	#define MIDI_QUIT BUTTON_POWER
69	#define BTN_RIGHT BUTTON_RIGHT	69	#define MIDI_FFWD BUTTON_RIGHT
70	#define BTN_LEFT BUTTON_LEFT	70	#define MIDI_REWIND BUTTON_LEFT
71	#define BTN_UP BUTTON_SCROLL_FWD	71	#define MIDI_VOL_UP BUTTON_SCROLL_FWD
72	#define BTN_DOWN BUTTON_SCROLL_BACK	72	#define MIDI_VOL_DOWN BUTTON_SCROLL_BACK
73	#define BTN_PLAY BUTTON_UP	73	#define MIDI_PLAYPAUSE BUTTON_UP
74		74
75	#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)	75	#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
76	#define BTN_QUIT (BUTTON_HOME\|BUTTON_REPEAT)	76	#define MIDI_QUIT (BUTTON_HOME\|BUTTON_REPEAT)
77	#define BTN_RIGHT BUTTON_RIGHT	77	#define MIDI_FFWD BUTTON_RIGHT
78	#define BTN_LEFT BUTTON_LEFT	78	#define MIDI_REWIND BUTTON_LEFT
79	#define BTN_UP BUTTON_SCROLL_FWD	79	#define MIDI_VOL_UP BUTTON_SCROLL_FWD
80	#define BTN_DOWN BUTTON_SCROLL_BACK	80	#define MIDI_VOL_DOWN BUTTON_SCROLL_BACK
81	#define BTN_PLAY BUTTON_UP	81	#define MIDI_PLAYPAUSE BUTTON_UP
82		82
83		83
84	#elif (CONFIG_KEYPAD == SANSA_C200_PAD) \|\| \	84	#elif (CONFIG_KEYPAD == SANSA_C200_PAD) \|\| \
85	(CONFIG_KEYPAD == SANSA_CLIP_PAD) \|\| \	85	(CONFIG_KEYPAD == SANSA_CLIP_PAD) \|\| \
86	(CONFIG_KEYPAD == SANSA_M200_PAD)	86	(CONFIG_KEYPAD == SANSA_M200_PAD)
87	#define BTN_QUIT BUTTON_POWER	87	#define MIDI_QUIT BUTTON_POWER
88	#define BTN_RIGHT BUTTON_RIGHT	88	#define MIDI_FFWD BUTTON_RIGHT
89	#define BTN_LEFT BUTTON_LEFT	89	#define MIDI_REWIND BUTTON_LEFT
90	#define BTN_UP BUTTON_VOL_UP	90	#define MIDI_VOL_UP BUTTON_VOL_UP
91	#define BTN_DOWN BUTTON_VOL_DOWN	91	#define MIDI_VOL_DOWN BUTTON_VOL_DOWN
92	#define BTN_PLAY BUTTON_UP	92	#define MIDI_PLAYPAUSE BUTTON_UP
93		93
94		94
95	#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD	95	#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
96	#define BTN_QUIT BUTTON_POWER	96	#define MIDI_QUIT BUTTON_POWER
97	#define BTN_RIGHT BUTTON_RIGHT	97	#define MIDI_FFWD BUTTON_RIGHT
98	#define BTN_LEFT BUTTON_LEFT	98	#define MIDI_REWIND BUTTON_LEFT
99	#define BTN_UP BUTTON_UP	99	#define MIDI_VOL_UP BUTTON_UP
100	#define BTN_DOWN BUTTON_DOWN	100	#define MIDI_VOL_DOWN BUTTON_DOWN
101	#define BTN_PLAY BUTTON_PLAY	101	#define MIDI_PLAYPAUSE BUTTON_PLAY
102		102
103		103
104	#elif CONFIG_KEYPAD == IRIVER_H10_PAD	104	#elif CONFIG_KEYPAD == IRIVER_H10_PAD
105	#define BTN_QUIT BUTTON_POWER	105	#define MIDI_QUIT BUTTON_POWER
106	#define BTN_RIGHT BUTTON_RIGHT	106	#define MIDI_FFWD BUTTON_RIGHT
107	#define BTN_LEFT BUTTON_LEFT	107	#define MIDI_REWIND BUTTON_LEFT
108	#define BTN_UP BUTTON_SCROLL_UP	108	#define MIDI_VOL_UP BUTTON_SCROLL_UP
109	#define BTN_DOWN BUTTON_SCROLL_DOWN	109	#define MIDI_VOL_DOWN BUTTON_SCROLL_DOWN
110	#define BTN_PLAY BUTTON_PLAY	110	#define MIDI_PLAYPAUSE BUTTON_PLAY
111		111
112		112
113	#elif CONFIG_KEYPAD == MROBE500_PAD	113	#elif CONFIG_KEYPAD == MROBE500_PAD
114	#define BTN_QUIT BUTTON_POWER	114	#define MIDI_QUIT BUTTON_POWER
115	#define BTN_RIGHT BUTTON_RIGHT	115	#define MIDI_FFWD BUTTON_RIGHT
116	#define BTN_LEFT BUTTON_LEFT	116	#define MIDI_REWIND BUTTON_LEFT
117	#define BTN_UP BUTTON_RC_PLAY	117	#define MIDI_VOL_UP BUTTON_RC_PLAY
118	#define BTN_DOWN BUTTON_RC_DOWN	118	#define MIDI_VOL_DOWN BUTTON_RC_DOWN
119	#define BTN_PLAY BUTTON_RC_HEART	119	#define MIDI_PLAYPAUSE BUTTON_RC_HEART
120		120
121		121
122	#elif (CONFIG_KEYPAD == MROBE100_PAD)	122	#elif (CONFIG_KEYPAD == MROBE100_PAD)
123	#define BTN_QUIT BUTTON_POWER	123	#define MIDI_QUIT BUTTON_POWER
124	#define BTN_RIGHT BUTTON_RIGHT	124	#define MIDI_FFWD BUTTON_RIGHT
125	#define BTN_LEFT BUTTON_LEFT	125	#define MIDI_REWIND BUTTON_LEFT
126	#define BTN_UP BUTTON_UP	126	#define MIDI_VOL_UP BUTTON_UP
127	#define BTN_DOWN BUTTON_DOWN	127	#define MIDI_VOL_DOWN BUTTON_DOWN
128	#define BTN_PLAY BUTTON_DISPLAY	128	#define MIDI_PLAYPAUSE BUTTON_DISPLAY
129		129
130		130
131	#elif CONFIG_KEYPAD == IAUDIO_M3_PAD	131	#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
132	#define BTN_QUIT BUTTON_RC_REC	132	#define MIDI_QUIT BUTTON_RC_REC
133	#define BTN_RIGHT BUTTON_RC_FF	133	#define MIDI_FFWD BUTTON_RC_FF
134	#define BTN_LEFT BUTTON_RC_REW	134	#define MIDI_REWIND BUTTON_RC_REW
135	#define BTN_UP BUTTON_RC_VOL_UP	135	#define MIDI_VOL_UP BUTTON_RC_VOL_UP
136	#define BTN_DOWN BUTTON_RC_VOL_DOWN	136	#define MIDI_VOL_DOWN BUTTON_RC_VOL_DOWN
137	#define BTN_PLAY BUTTON_RC_PLAY	137	#define MIDI_PLAYPAUSE BUTTON_RC_PLAY
138		138
139		139
140	#elif CONFIG_KEYPAD == COWON_D2_PAD	140	#elif CONFIG_KEYPAD == COWON_D2_PAD
141	#define BTN_QUIT BUTTON_POWER	141	#define MIDI_QUIT BUTTON_POWER
142		142
143	#elif CONFIG_KEYPAD == IAUDIO67_PAD	143	#elif CONFIG_KEYPAD == IAUDIO67_PAD
144	#define BTN_QUIT BUTTON_POWER	144	#define MIDI_QUIT BUTTON_POWER
145	#define BTN_RIGHT BUTTON_RIGHT	145	#define MIDI_FFWD BUTTON_RIGHT
146	#define BTN_LEFT BUTTON_LEFT	146	#define MIDI_REWIND BUTTON_LEFT
147	#define BTN_UP BUTTON_STOP	147	#define MIDI_VOL_UP BUTTON_STOP
148	#define BTN_DOWN BUTTON_PLAY	148	#define MIDI_VOL_DOWN BUTTON_PLAY
149	#define BTN_PLAY BUTTON_MENU	149	#define MIDI_PLAYPAUSE BUTTON_MENU
150		150
151	#elif CONFIG_KEYPAD == CREATIVEZVM_PAD	151	#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
152	#define BTN_QUIT BUTTON_BACK	152	#define MIDI_QUIT BUTTON_BACK
153	#define BTN_RIGHT BUTTON_RIGHT	153	#define MIDI_FFWD BUTTON_RIGHT
154	#define BTN_LEFT BUTTON_LEFT	154	#define MIDI_REWIND BUTTON_LEFT
155	#define BTN_UP BUTTON_UP	155	#define MIDI_VOL_UP BUTTON_UP
156	#define BTN_DOWN BUTTON_DOWN	156	#define MIDI_VOL_DOWN BUTTON_DOWN
157	#define BTN_PLAY BUTTON_PLAY	157	#define MIDI_PLAYPAUSE BUTTON_PLAY
158		158
159	#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD	159	#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
160	#define BTN_QUIT (BUTTON_PLAY\|BUTTON_REPEAT)	160	#define MIDI_QUIT BUTTON_PLAY\|BUTTON_REPEAT)
161	#define BTN_RIGHT BUTTON_MENU	161	#define MIDI_FFWD BUTTON_MENU
162	#define BTN_LEFT BUTTON_BACK	162	#define MIDI_REWIND BUTTON_BACK
163	#define BTN_UP BUTTON_VOL_UP	163	#define MIDI_VOL_UP BUTTON_VOL_UP
164	#define BTN_DOWN BUTTON_VOL_DOWN	164	#define MIDI_VOL_DOWN BUTTON_VOL_DOWN
165	#define BTN_PLAY (BUTTON_PLAY\|BUTTON_REL)	165	#define MIDI_PLAYPAUSE (BUTTON_PLAY\|BUTTON_REL)
166		166
167	#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD	167	#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
168	#define BTN_QUIT BUTTON_POWER	168	#define MIDI_QUIT BUTTON_POWER
169	#define BTN_RIGHT BUTTON_RIGHT	169	#define MIDI_FFWD BUTTON_RIGHT
170	#define BTN_LEFT BUTTON_LEFT	170	#define MIDI_REWIND BUTTON_LEFT
171	#define BTN_UP BUTTON_UP	171	#define MIDI_VOL_UP BUTTON_UP
172	#define BTN_DOWN BUTTON_DOWN	172	#define MIDI_VOL_DOWN BUTTON_DOWN
173	#define BTN_PLAY BUTTON_MENU	173	#define MIDI_PLAYPAUSE BUTTON_MENU
174		174
175	#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD	175	#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
176	#define BTN_QUIT BUTTON_POWER	176	#define MIDI_QUIT BUTTON_POWER
177	#define BTN_RIGHT BUTTON_RIGHT	177	#define MIDI_FFWD BUTTON_RIGHT
178	#define BTN_LEFT BUTTON_LEFT	178	#define MIDI_REWIND BUTTON_LEFT
179	#define BTN_UP BUTTON_UP	179	#define MIDI_VOL_UP BUTTON_UP
180	#define BTN_DOWN BUTTON_DOWN	180	#define MIDI_VOL_DOWN BUTTON_DOWN
181	#define BTN_PLAY BUTTON_MENU	181	#define MIDI_PLAYPAUSE BUTTON_MENU
182		182
183	#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD	183	#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
184	#define BTN_QUIT BUTTON_POWER	184	#define MIDI_QUIT BUTTON_POWER
185	#define BTN_RIGHT BUTTON_NEXT	185	#define MIDI_FFWD BUTTON_NEXT
186	#define BTN_LEFT BUTTON_PREV	186	#define MIDI_REWIND BUTTON_PREV
187	#define BTN_UP BUTTON_UP	187	#define MIDI_VOL_UP BUTTON_UP
188	#define BTN_DOWN BUTTON_DOWN	188	#define MIDI_VOL_DOWN BUTTON_DOWN
189	#define BTN_PLAY BUTTON_MENU	189	#define MIDI_PLAYPAUSE BUTTON_MENU
190		190
191	#elif CONFIG_KEYPAD == ONDAVX747_PAD	191	#elif CONFIG_KEYPAD == ONDAVX747_PAD
192	#define BTN_QUIT BUTTON_POWER	192	#define MIDI_QUIT BUTTON_POWER
193	#elif CONFIG_KEYPAD == ONDAVX777_PAD	193	#elif CONFIG_KEYPAD == ONDAVX777_PAD
194	#define BTN_QUIT BUTTON_POWER	194	#define MIDI_QUIT BUTTON_POWER
195		195
196	#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \|\| \	196	#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \|\| \
197	(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)	197	(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
198	#define BTN_QUIT (BUTTON_PLAY\|BUTTON_REPEAT)	198	#define MIDI_QUIT (BUTTON_PLAY\|BUTTON_REPEAT)
199	#define BTN_RIGHT BUTTON_RIGHT	199	#define MIDI_FFWD BUTTON_RIGHT
200	#define BTN_LEFT BUTTON_LEFT	200	#define MIDI_REWIND BUTTON_LEFT
201	#define BTN_UP BUTTON_UP	201	#define MIDI_VOL_UP BUTTON_UP
202	#define BTN_DOWN BUTTON_DOWN	202	#define MIDI_VOL_DOWN BUTTON_DOWN
203	#define BTN_PLAY BUTTON_PLAY	203	#define MIDI_PLAYPAUSE BUTTON_PLAY
204		204
205	#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD	205	#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
206	#define BTN_QUIT BUTTON_REC	206	#define MIDI_QUIT BUTTON_REC
207	#define BTN_RIGHT BUTTON_NEXT	207	#define MIDI_FFWD BUTTON_NEXT
208	#define BTN_LEFT BUTTON_PREV	208	#define MIDI_REWIND BUTTON_PREV
209	#define BTN_UP BUTTON_UP	209	#define MIDI_VOL_UP BUTTON_UP
210	#define BTN_DOWN BUTTON_DOWN	210	#define MIDI_VOL_DOWN BUTTON_DOWN
211	#define BTN_PLAY BUTTON_PLAY	211	#define MIDI_PLAYPAUSE BUTTON_PLAY
212		212
213	#elif CONFIG_KEYPAD == MPIO_HD200_PAD	213	#elif CONFIG_KEYPAD == MPIO_HD200_PAD
214	#define BTN_QUIT (BUTTON_REC \| BUTTON_PLAY)	214	#define MIDI_QUIT (BUTTON_REC \| BUTTON_PLAY)
215	#define BTN_RIGHT BUTTON_FF	215	#define MIDI_FFWD BUTTON_FF
216	#define BTN_LEFT BUTTON_REW	216	#define MIDI_REWIND BUTTON_REW
217	#define BTN_UP BUTTON_VOL_UP	217	#define MIDI_VOL_UP BUTTON_VOL_UP
218	#define BTN_DOWN BUTTON_VOL_DOWN	218	#define MIDI_VOL_DOWN BUTTON_VOL_DOWN
219	#define BTN_PLAY BUTTON_PLAY	219	#define MIDI_PLAYPAUSE BUTTON_PLAY
220		220
221	#elif CONFIG_KEYPAD == MPIO_HD300_PAD	221	#elif CONFIG_KEYPAD == MPIO_HD300_PAD
222	#define BTN_QUIT (BUTTON_MENU \| BUTTON_REPEAT)	222	#define MIDI_QUIT (BUTTON_MENU \| BUTTON_REPEAT)
223	#define BTN_RIGHT BUTTON_FF	223	#define MIDI_FFWD BUTTON_FF
224	#define BTN_LEFT BUTTON_REW	224	#define MIDI_REWIND BUTTON_REW
225	#define BTN_UP BUTTON_UP	225	#define MIDI_VOL_UP BUTTON_UP
226	#define BTN_DOWN BUTTON_DOWN	226	#define MIDI_VOL_DOWN BUTTON_DOWN
227	#define BTN_PLAY BUTTON_PLAY	227	#define MIDI_PLAYPAUSE BUTTON_PLAY
228		228
229	#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD	229	#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
230	#define BTN_QUIT BUTTON_POWER	230	#define MIDI_QUIT BUTTON_POWER
231	#define BTN_RIGHT BUTTON_RIGHT	231	#define MIDI_FFWD BUTTON_RIGHT
232	#define BTN_LEFT BUTTON_LEFT	232	#define MIDI_REWIND BUTTON_LEFT
233	#define BTN_UP BUTTON_UP	233	#define MIDI_VOL_UP BUTTON_UP
234	#define BTN_DOWN BUTTON_DOWN	234	#define MIDI_VOL_DOWN BUTTON_DOWN
235	#define BTN_PLAY BUTTON_PLAYPAUSE	235	#define MIDI_PLAYPAUSE BUTTON_PLAYPAUSE
236		236
237	#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD	237	#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
238	#define BTN_QUIT BUTTON_POWER	238	#define MIDI_QUIT BUTTON_POWER
239	#define BTN_RIGHT BUTTON_RIGHT	239	#define MIDI_FFWD BUTTON_RIGHT
240	#define BTN_LEFT BUTTON_LEFT	240	#define MIDI_REWIND BUTTON_LEFT
241	#define BTN_UP BUTTON_UP	241	#define MIDI_VOL_UP BUTTON_UP
242	#define BTN_DOWN BUTTON_DOWN	242	#define MIDI_VOL_DOWN BUTTON_DOWN
243	#define BTN_PLAY BUTTON_SELECT	243	#define MIDI_PLAYPAUSE BUTTON_SELECT
244		244
245	#elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD	245	#elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD
246	#define BTN_QUIT BUTTON_BACK	246	#define MIDI_QUIT BUTTON_BACK
247	#define BTN_RIGHT BUTTON_RIGHT	247	#define MIDI_FFWD BUTTON_RIGHT
248	#define BTN_LEFT BUTTON_LEFT	248	#define MIDI_REWIND BUTTON_LEFT
249	#define BTN_UP BUTTON_UP	249	#define MIDI_VOL_UP BUTTON_UP
250	#define BTN_DOWN BUTTON_DOWN	250	#define MIDI_VOL_DOWN BUTTON_DOWN
251	#define BTN_PLAY BUTTON_USER	251	#define MIDI_PLAYPAUSE BUTTON_USER
252		252
253	#elif (CONFIG_KEYPAD == HM60X_PAD) \|\| \	253	#elif (CONFIG_KEYPAD == HM60X_PAD) \|\| \
254	(CONFIG_KEYPAD == HM801_PAD)	254	(CONFIG_KEYPAD == HM801_PAD)
255	#define BTN_QUIT BUTTON_POWER	255	#define MIDI_QUIT BUTTON_POWER
256	#define BTN_RIGHT BUTTON_RIGHT	256	#define MIDI_FFWD BUTTON_RIGHT
257	#define BTN_LEFT BUTTON_LEFT	257	#define MIDI_REWIND BUTTON_LEFT
258	#define BTN_UP BUTTON_UP	258	#define MIDI_VOL_UP BUTTON_UP
259	#define BTN_DOWN BUTTON_DOWN	259	#define MIDI_VOL_DOWN BUTTON_DOWN
260	#define BTN_PLAY BUTTON_SELECT	260	#define MIDI_PLAYPAUSE BUTTON_SELECT
261		261
262	#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)	262	#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
263	#define BTN_QUIT BUTTON_BACK	263	#define MIDI_QUIT BUTTON_BACK
264	#define BTN_RIGHT BUTTON_RIGHT	264	#define MIDI_FFWD BUTTON_RIGHT
265	#define BTN_LEFT BUTTON_LEFT	265	#define MIDI_REWIND BUTTON_LEFT
266	#define BTN_UP BUTTON_UP	266	#define MIDI_VOL_UP BUTTON_UP
267	#define BTN_DOWN BUTTON_DOWN	267	#define MIDI_VOL_DOWN BUTTON_DOWN
268	#define BTN_PLAY BUTTON_PLAY	268	#define MIDI_PLAYPAUSE BUTTON_PLAY
269		269
270	#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)	270	#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)
271	#define BTN_QUIT BUTTON_BACK	271	#define MIDI_QUIT BUTTON_BACK
272	#define BTN_RIGHT BUTTON_RIGHT	272	#define MIDI_FFWD BUTTON_RIGHT
273	#define BTN_LEFT BUTTON_LEFT	273	#define MIDI_REWIND BUTTON_LEFT
274	#define BTN_UP BUTTON_UP	274	#define MIDI_VOL_UP BUTTON_UP
275	#define BTN_DOWN BUTTON_DOWN	275	#define MIDI_VOL_DOWN BUTTON_DOWN
276	#define BTN_PLAY BUTTON_PLAYPAUSE	276	#define MIDI_PLAYPAUSE BUTTON_PLAYPAUSE
277		277
278	#elif CONFIG_KEYPAD == DX50_PAD	278	#elif CONFIG_KEYPAD == DX50_PAD
279	#define BTN_QUIT BUTTON_POWER	279	#define MIDI_QUIT BUTTON_POWER
280	#define BTN_RIGHT BUTTON_RIGHT	280	#define MIDI_FFWD BUTTON_RIGHT
281	#define BTN_LEFT BUTTON_LEFT	281	#define MIDI_REWIND BUTTON_LEFT
282	#define BTN_UP BUTTON_VOL_UP	282	#define MIDI_VOL_UP BUTTON_VOL_UP
283	#define BTN_DOWN BUTTON_VOL_DOWN	283	#define MIDI_VOL_DOWN BUTTON_VOL_DOWN
284		284
285	#else	285	#else
286	#error No keymap defined!	286	#error No keymap defined!
287	#endif	287	#endif
288		288
289	#ifdef HAVE_TOUCHSCREEN	289	#ifdef HAVE_TOUCHSCREEN
290	#ifndef BTN_QUIT	290	#ifndef MIDI_QUIT
291	#define BTN_QUIT BUTTON_TOPLEFT	291	#define MIDI_QUIT BUTTON_TOPLEFT
292	#endif	292	#endif
293	#ifndef BTN_RIGHT	293	#ifndef MIDI_FFWD
294	#define BTN_RIGHT BUTTON_MIDRIGHT	294	#define MIDI_FFWD BUTTON_MIDRIGHT
295	#endif	295	#endif
296	#ifndef BTN_LEFT	296	#ifndef MIDI_REWIND
297	#define BTN_LEFT BUTTON_MIDLEFT	297	#define MIDI_REWIND BUTTON_MIDLEFT
298	#endif	298	#endif
299	#ifndef BTN_UP	299	#ifndef MIDI_VOL_UP
300	#define BTN_UP BUTTON_TOPMIDDLE	300	#define MIDI_VOL_UP BUTTON_TOPMIDDLE
301	#endif	301	#endif
302	#ifndef BTN_DOWN	302	#ifndef MIDI_VOL_DOWN
303	#define BTN_DOWN BUTTON_BOTTOMMIDDLE	303	#define MIDI_VOL_DOWN BUTTON_BOTTOMMIDDLE
304	#endif	304	#endif
305	#ifndef BTN_PLAY	305	#ifndef MIDI_PLAYPAUSE
306	#define BTN_PLAY BUTTON_CENTER	306	#define MIDI_PLAYPAUSE BUTTON_CENTER
307	#endif	307	#endif
308	#endif	308	#endif
309		309
@@ -452,8 +452,8 @@ static int midimain(const void * filename)
452	/* Code taken from Oscilloscope plugin */	452	/* Code taken from Oscilloscope plugin */
453	switch (rb->button_get(false))	453	switch (rb->button_get(false))
454	{	454	{
455	case BTN_UP:	455	case MIDI_VOL_UP:
456	case BTN_UP \| BUTTON_REPEAT:	456	case MIDI_VOL_UP \| BUTTON_REPEAT:
457	{	457	{
458	vol = rb->global_settings->volume;	458	vol = rb->global_settings->volume;
459	if (vol < rb->sound_max(SOUND_VOLUME))	459	if (vol < rb->sound_max(SOUND_VOLUME))
@@ -465,8 +465,8 @@ static int midimain(const void * filename)
465	break;	465	break;
466	}	466	}
467		467
468	case BTN_DOWN:	468	case MIDI_VOL_DOWN:
469	case BTN_DOWN \| BUTTON_REPEAT:	469	case MIDI_VOL_DOWN \| BUTTON_REPEAT:
470	{	470	{
471	vol = rb->global_settings->volume;	471	vol = rb->global_settings->volume;
472	if (vol > rb->sound_min(SOUND_VOLUME))	472	if (vol > rb->sound_min(SOUND_VOLUME))
@@ -478,7 +478,7 @@ static int midimain(const void * filename)
478	break;	478	break;
479	}	479	}
480		480
481	case BTN_LEFT:	481	case MIDI_REWIND:
482	{	482	{
483	/* Rewinding is tricky. Basically start the file over */	483	/* Rewinding is tricky. Basically start the file over */
484	/* but run through the tracks without the synth running */	484	/* but run through the tracks without the synth running */
@@ -490,7 +490,7 @@ static int midimain(const void * filename)
490	break;	490	break;
491	}	491	}
492		492
493	case BTN_RIGHT:	493	case MIDI_FFWD:
494	{	494	{
495	rb->pcm_play_stop();	495	rb->pcm_play_stop();
496	seekForward(5);	496	seekForward(5);
@@ -500,7 +500,7 @@ static int midimain(const void * filename)
500	break;	500	break;
501	}	501	}
502		502
503	case BTN_PLAY:	503	case MIDI_PLAYPAUSE:
504	{	504	{
505	if (is_playing)	505	if (is_playing)
506	{	506	{
@@ -516,10 +516,10 @@ static int midimain(const void * filename)
516	break;	516	break;
517	}	517	}
518		518
519	#ifdef BTN_RC_QUIT	519	#ifdef MIDI_RC_QUIT
520	case BTN_RC_QUIT:	520	case MIDI_RC_QUIT:
521	#endif	521	#endif
522	case BTN_QUIT:	522	case MIDI_QUIT:
523	quit = true;	523	quit = true;
524	}	524	}
525	}	525	}