diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES | 5 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 3 | ||||
-rw-r--r-- | apps/plugins/jpeg.c | 11 | ||||
-rw-r--r-- | apps/plugins/midi/midiplay.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 10 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 7 |
6 files changed, 41 insertions, 1 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 33ebec31bd..ebe4aa8b03 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -20,6 +20,11 @@ stopwatch.c | |||
20 | vbrfix.c | 20 | vbrfix.c |
21 | viewer.c | 21 | viewer.c |
22 | 22 | ||
23 | #ifdef OLYMPUS_MROBE_500 | ||
24 | /* remove these once the plugins before it are compileable */ | ||
25 | jpeg.c | ||
26 | #endif | ||
27 | |||
23 | #ifndef OLYMPUS_MROBE_500 | 28 | #ifndef OLYMPUS_MROBE_500 |
24 | 29 | ||
25 | #if CONFIG_CODEC == SWCODEC | 30 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 97731a1e6c..0b963b0fd2 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -37,7 +37,8 @@ pacbox | |||
37 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300) | 37 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300) |
38 | doom | 38 | doom |
39 | #endif | 39 | #endif |
40 | 40 | #endif /* mrobe 500 */ | |
41 | #if !defined(IRIVER_IFP7XX_SERIES) | ||
41 | /* For all the swcodec targets */ | 42 | /* For all the swcodec targets */ |
42 | #if CONFIG_CODEC == SWCODEC | 43 | #if CONFIG_CODEC == SWCODEC |
43 | midi | 44 | midi |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 09f7455f8b..9e11ca431b 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -169,6 +169,17 @@ PLUGIN_HEADER | |||
169 | #define JPEG_NEXT BUTTON_FF | 169 | #define JPEG_NEXT BUTTON_FF |
170 | #define JPEG_PREVIOUS BUTTON_REW | 170 | #define JPEG_PREVIOUS BUTTON_REW |
171 | 171 | ||
172 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
173 | #define JPEG_ZOOM_IN BUTTON_RC_VOL_UP | ||
174 | #define JPEG_ZOOM_OUT BUTTON_RC_VOL_DOWN | ||
175 | #define JPEG_UP BUTTON_RC_PLAY | ||
176 | #define JPEG_DOWN BUTTON_RC_DOWN | ||
177 | #define JPEG_LEFT BUTTON_LEFT | ||
178 | #define JPEG_RIGHT BUTTON_RIGHT | ||
179 | #define JPEG_MENU BUTTON_POWER | ||
180 | #define JPEG_NEXT BUTTON_RC_HEART | ||
181 | #define JPEG_PREVIOUS BUTTON_RC_MODE | ||
182 | |||
172 | #endif | 183 | #endif |
173 | 184 | ||
174 | /* different graphics libraries */ | 185 | /* different graphics libraries */ |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 974dc99069..a5ecfdf1f7 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -79,6 +79,12 @@ PLUGIN_IRAM_DECLARE | |||
79 | #define BTN_UP BUTTON_SCROLL_UP | 79 | #define BTN_UP BUTTON_SCROLL_UP |
80 | #define BTN_DOWN BUTTON_SCROLL_DOWN | 80 | #define BTN_DOWN BUTTON_SCROLL_DOWN |
81 | 81 | ||
82 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
83 | #define BTN_QUIT BUTTON_POWER | ||
84 | #define BTN_RIGHT BUTTON_RIGHT | ||
85 | #define BTN_UP BUTTON_RC_PLAY | ||
86 | #define BTN_DOWN BUTTON_RC_DOWN | ||
87 | |||
82 | #endif | 88 | #endif |
83 | 89 | ||
84 | #undef SYNC | 90 | #undef SYNC |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 0a717aeaac..6cd5f7b186 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -90,6 +90,16 @@ volatile long thumbDelayTimer; | |||
90 | #define MPEG_DOWN BUTTON_DOWN | 90 | #define MPEG_DOWN BUTTON_DOWN |
91 | #define MPEG_EXIT BUTTON_POWER | 91 | #define MPEG_EXIT BUTTON_POWER |
92 | 92 | ||
93 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
94 | #define MPEG_SELECT BUTTON_RC_HEART | ||
95 | #define MPEG_SCROLL_UP BUTTON_RC_VOL_UP | ||
96 | #define MPEG_SCROLL_DOWN BUTTON_RC_VOL_DOWN | ||
97 | #define MPEG_LEFT BUTTON_LEFT | ||
98 | #define MPEG_RIGHT BUTTON_RIGHT | ||
99 | #define MPEG_UP BUTTON_RC_PLAY | ||
100 | #define MPEG_DOWN BUTTON_RC_DOWN | ||
101 | #define MPEG_EXIT BUTTON_POWER | ||
102 | |||
93 | #else | 103 | #else |
94 | #error MPEGPLAYER: Unsupported keypad | 104 | #error MPEGPLAYER: Unsupported keypad |
95 | #endif | 105 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 770abf95ca..aed96d6af9 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -162,6 +162,13 @@ PLUGIN_IRAM_DECLARE | |||
162 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN | 162 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN |
163 | #define MPEG_VOLUP BUTTON_VOL_UP | 163 | #define MPEG_VOLUP BUTTON_VOL_UP |
164 | 164 | ||
165 | #elif CONFIG_KEYPAD == MROBE500_PAD | ||
166 | #define MPEG_MENU BUTTON_RC_HEART | ||
167 | #define MPEG_STOP BUTTON_POWER | ||
168 | #define MPEG_PAUSE BUTTON_TOUCHPAD | ||
169 | #define MPEG_VOLDOWN BUTTON_RC_VOL_DOWN | ||
170 | #define MPEG_VOLUP BUTTON_RC_VOL_UP | ||
171 | |||
165 | #else | 172 | #else |
166 | #error MPEGPLAYER: Unsupported keypad | 173 | #error MPEGPLAYER: Unsupported keypad |
167 | #endif | 174 | #endif |