diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/common/README | 3 | ||||
-rw-r--r-- | uisimulator/sdl/UI-mrobe100.bmp | bin | 309558 -> 343782 bytes | |||
-rwxr-xr-x | uisimulator/sdl/UI-mrobe500.bmp | bin | 630054 -> 473254 bytes | |||
-rw-r--r-- | uisimulator/sdl/button.c | 28 | ||||
-rw-r--r-- | uisimulator/sdl/uisdl.h | 10 |
5 files changed, 30 insertions, 11 deletions
diff --git a/uisimulator/common/README b/uisimulator/common/README index 6f920cf43e..3ee2b45f0e 100644 --- a/uisimulator/common/README +++ b/uisimulator/common/README | |||
@@ -8,6 +8,3 @@ | |||
8 | This directory is for code that is shared between all versions of the | 8 | This directory is for code that is shared between all versions of the |
9 | simulator, but is not needed for the target device. | 9 | simulator, but is not needed for the target device. |
10 | 10 | ||
11 | The first code is for the software mpeg audio decoder. The actual | ||
12 | mpeg decoding code is here and the O/S specific sound drivers should | ||
13 | be located in the x11 and win32 directories as appropriate. | ||
diff --git a/uisimulator/sdl/UI-mrobe100.bmp b/uisimulator/sdl/UI-mrobe100.bmp index 19e5e1f3d3..2a9df60cf1 100644 --- a/uisimulator/sdl/UI-mrobe100.bmp +++ b/uisimulator/sdl/UI-mrobe100.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/sdl/UI-mrobe500.bmp b/uisimulator/sdl/UI-mrobe500.bmp index 6aebbee8fd..c7d0bec362 100755 --- a/uisimulator/sdl/UI-mrobe500.bmp +++ b/uisimulator/sdl/UI-mrobe500.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 5f92b655d1..5987584420 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -760,6 +760,30 @@ void button_event(int key, bool pressed) | |||
760 | new_btn = BUTTON_POWER; | 760 | new_btn = BUTTON_POWER; |
761 | break; | 761 | break; |
762 | #elif CONFIG_KEYPAD == MROBE100_PAD | 762 | #elif CONFIG_KEYPAD == MROBE100_PAD |
763 | case SDLK_F9: | ||
764 | new_btn = BUTTON_RC_HEART; | ||
765 | break; | ||
766 | case SDLK_F10: | ||
767 | new_btn = BUTTON_RC_MODE; | ||
768 | break; | ||
769 | case SDLK_F11: | ||
770 | new_btn = BUTTON_RC_VOL_DOWN; | ||
771 | break; | ||
772 | case SDLK_F12: | ||
773 | new_btn = BUTTON_RC_VOL_UP; | ||
774 | break; | ||
775 | case SDLK_LEFT: | ||
776 | new_btn = BUTTON_RC_FF; | ||
777 | break; | ||
778 | case SDLK_RIGHT: | ||
779 | new_btn = BUTTON_RC_REW; | ||
780 | break; | ||
781 | case SDLK_UP: | ||
782 | new_btn = BUTTON_RC_PLAY; | ||
783 | break; | ||
784 | case SDLK_DOWN: | ||
785 | new_btn = BUTTON_RC_DOWN; | ||
786 | break; | ||
763 | case SDLK_KP1: | 787 | case SDLK_KP1: |
764 | new_btn = BUTTON_DISPLAY; | 788 | new_btn = BUTTON_DISPLAY; |
765 | break; | 789 | break; |
@@ -770,19 +794,15 @@ void button_event(int key, bool pressed) | |||
770 | new_btn = BUTTON_PLAY; | 794 | new_btn = BUTTON_PLAY; |
771 | break; | 795 | break; |
772 | case SDLK_KP4: | 796 | case SDLK_KP4: |
773 | case SDLK_LEFT: | ||
774 | new_btn = BUTTON_LEFT; | 797 | new_btn = BUTTON_LEFT; |
775 | break; | 798 | break; |
776 | case SDLK_KP6: | 799 | case SDLK_KP6: |
777 | case SDLK_RIGHT: | ||
778 | new_btn = BUTTON_RIGHT; | 800 | new_btn = BUTTON_RIGHT; |
779 | break; | 801 | break; |
780 | case SDLK_KP8: | 802 | case SDLK_KP8: |
781 | case SDLK_UP: | ||
782 | new_btn = BUTTON_UP; | 803 | new_btn = BUTTON_UP; |
783 | break; | 804 | break; |
784 | case SDLK_KP2: | 805 | case SDLK_KP2: |
785 | case SDLK_DOWN: | ||
786 | new_btn = BUTTON_DOWN; | 806 | new_btn = BUTTON_DOWN; |
787 | break; | 807 | break; |
788 | case SDLK_KP5: | 808 | case SDLK_KP5: |
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 0fe0463b60..1543dcec37 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -163,14 +163,14 @@ | |||
163 | #define UI_LCD_POSY 90 /* y position of lcd */ | 163 | #define UI_LCD_POSY 90 /* y position of lcd */ |
164 | 164 | ||
165 | #elif defined(MROBE_500) | 165 | #elif defined(MROBE_500) |
166 | #if LCD_WIDHT==320 | 166 | #if LCD_WIDTH==320 |
167 | #define UI_TITLE "Olympus M:Robe 500" | 167 | #define UI_TITLE "Olympus M:Robe 500" |
168 | #define UI_WIDTH 450 /* width of GUI window */ | 168 | #define UI_WIDTH 450 /* width of GUI window */ |
169 | #define UI_HEIGHT 350 /* height of GUI window */ | 169 | #define UI_HEIGHT 350 /* height of GUI window */ |
170 | #define UI_LCD_POSX 65 /* x position of lcd */ | 170 | #define UI_LCD_POSX 65 /* x position of lcd */ |
171 | #define UI_LCD_POSY 30 /* y position of lcd */ | 171 | #define UI_LCD_POSY 30 /* y position of lcd */ |
172 | #define UI_REMOTE_POSX 50 /* x position of remote lcd */ | 172 | #define UI_REMOTE_POSX 36 /* x position of remote lcd */ |
173 | #define UI_REMOTE_POSY 325 /* y position of remote lcd */ | 173 | #define UI_REMOTE_POSY 318 /* y position of remote lcd */ |
174 | #else | 174 | #else |
175 | #define UI_TITLE "Olympus M:Robe 500" | 175 | #define UI_TITLE "Olympus M:Robe 500" |
176 | #define UI_WIDTH 900 /* width of GUI window */ | 176 | #define UI_WIDTH 900 /* width of GUI window */ |
@@ -235,9 +235,11 @@ | |||
235 | #elif defined(MROBE_100) | 235 | #elif defined(MROBE_100) |
236 | #define UI_TITLE "Olympus M:Robe 100" | 236 | #define UI_TITLE "Olympus M:Robe 100" |
237 | #define UI_WIDTH 247 /* width of GUI window */ | 237 | #define UI_WIDTH 247 /* width of GUI window */ |
238 | #define UI_HEIGHT 416 /* height of GUI window */ | 238 | #define UI_HEIGHT 462 /* height of GUI window */ |
239 | #define UI_LCD_POSX 43 /* x position of lcd */ | 239 | #define UI_LCD_POSX 43 /* x position of lcd */ |
240 | #define UI_LCD_POSY 25 /* y position of lcd */ | 240 | #define UI_LCD_POSY 25 /* y position of lcd */ |
241 | #define UI_REMOTE_POSX 34 /* x position of remote lcd */ | ||
242 | #define UI_REMOTE_POSY 432 /* y position of remote lcd */ | ||
241 | 243 | ||
242 | #elif defined(COWON_D2) | 244 | #elif defined(COWON_D2) |
243 | #define UI_TITLE "Cowon D2" | 245 | #define UI_TITLE "Cowon D2" |