diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-25 18:22:26 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-25 18:22:26 +0200 |
commit | ddf56a102b053c29fa488bb9dbc99f863f610fdb (patch) | |
tree | d3de3af377fc2980f2c961fd668b8185b67fcb9f | |
parent | 7ba802b1b4be2f6c3296fd47db59a120e1c2c78d (diff) | |
download | rockbox-ddf56a1.tar.gz rockbox-ddf56a1.zip |
sonynwze360: fix simulator
Change-Id: Ib63d5aceeafb1078013599616cb6dcec3a2b8598
-rw-r--r-- | firmware/target/hosted/sdl/sim-ui-defines.h | 7 | ||||
-rw-r--r-- | uisimulator/bitmaps/UI-sonynwze360.bmp | bin | 0 -> 687534 bytes | |||
-rw-r--r-- | uisimulator/buttonmap/SOURCES | 4 | ||||
-rw-r--r-- | uisimulator/buttonmap/sony-nwze360.c | 88 |
4 files changed, 99 insertions, 0 deletions
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index edcc695ab2..0b7e3fc82a 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h @@ -452,6 +452,13 @@ #define UI_LCD_POSX 42 #define UI_LCD_POSY 42 +#elif defined(SONY_NWZE360) +#define UI_TITLE "Sony NWZ-E360" +#define UI_WIDTH 340 /* width of GUI window */ +#define UI_HEIGHT 674 /* height of GUI window */ +#define UI_LCD_POSX 50 +#define UI_LCD_POSY 62 + #elif defined(APPLICATION) #define UI_TITLE "Rockbox" #define UI_LCD_POSX 0 diff --git a/uisimulator/bitmaps/UI-sonynwze360.bmp b/uisimulator/bitmaps/UI-sonynwze360.bmp Binary files differnew file mode 100644 index 0000000000..3ce93b4029 --- /dev/null +++ b/uisimulator/bitmaps/UI-sonynwze360.bmp diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 57f0e643f4..3ed52f2c50 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -73,5 +73,9 @@ creative-zenxfi3.c creative-zenxfi2.c #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD sansa-connect.c +#elif CONFIG_KEYPAD == SONY_NWZ_PAD +# ifdef SONY_NWZE360 +sony-nwze360.c +# endif #endif #endif /* SIMULATOR */ diff --git a/uisimulator/buttonmap/sony-nwze360.c b/uisimulator/buttonmap/sony-nwze360.c new file mode 100644 index 0000000000..1b84dc3ac2 --- /dev/null +++ b/uisimulator/buttonmap/sony-nwze360.c @@ -0,0 +1,88 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2013 by Amaury Pouly + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include <SDL.h> +#include "button.h" +#include "buttonmap.h" + +int key_to_button(int keyboard_button) +{ + int new_btn = BUTTON_NONE; + switch (keyboard_button) + { + case SDLK_KP4: + case SDLK_LEFT: + new_btn = BUTTON_LEFT; + break; + case SDLK_KP6: + case SDLK_RIGHT: + new_btn = BUTTON_RIGHT; + break; + case SDLK_KP8: + case SDLK_UP: + new_btn = BUTTON_UP; + break; + case SDLK_KP2: + case SDLK_DOWN: + new_btn = BUTTON_DOWN; + break; + case SDLK_END: + case SDLK_KP3: + case SDLK_ESCAPE: + case SDLK_DELETE: + new_btn = BUTTON_POWER; + break; + case SDLK_KP_PLUS: + new_btn = BUTTON_VOL_UP; + break; + case SDLK_KP_MINUS: + new_btn = BUTTON_VOL_DOWN; + break; + case SDLK_KP1: + case SDLK_HOME: + case SDLK_BACKSPACE: + new_btn = BUTTON_BACK; + break; + case SDLK_KP_ENTER: + case SDLK_RETURN: + case SDLK_SPACE: + case SDLK_INSERT: + case SDLK_KP5: + new_btn = BUTTON_PLAY; + break; + } + return new_btn; +} + +struct button_map bm[] = { + { SDLK_LEFT, 100, 548, 30, "Left" }, + { SDLK_RIGHT, 240, 548, 30, "Right" }, + { SDLK_UP, 170, 478, 30, "Up" }, + { SDLK_DOWN, 170, 619, 30, "Down" }, + { SDLK_BACKSPACE, 81, 484, 35, "Back" }, + { SDLK_DELETE, 256, 484, 35, "Power" }, + { SDLK_RETURN, 170, 548, 40, "Play" }, + { SDLK_KP_MINUS, 339, 128, 30, "Volume -" }, + { SDLK_KP_PLUS, 339, 68, 30, "Volume +" }, + { 0, 0, 0, 0, "None" } +}; + |