mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-09 13:12:37 -05:00
SDL: Migrate to SDL2
Incorporates large portions of g#5879 g#5282 g#5285 g#5286 g#5287 Differences from the above patches: * Removed all MacOS-specific stuff * Removed support for SDL1 entirely * Properly implement mousewheel support * Bumped up minimum stack size for sigalstack threading * Check for overflow before enqueing scrollwheel events Tested on: * sdl application (Linux) * Simulator (x86_64, Linux) -- xduoox3/ipod4g/sansafuze * Simulator (i686, Windows) -- xduoox3 * Simulator (arm64, Linux) Change-Id: Ia3012dd1be123feb2888798a42d5b7cc149f382b
This commit is contained in:
parent
d13029ebdd
commit
7927423e34
49 changed files with 709 additions and 717 deletions
|
|
@ -29,19 +29,19 @@ int key_to_button(int keyboard_button)
|
|||
int new_btn = BUTTON_NONE;
|
||||
switch (keyboard_button)
|
||||
{
|
||||
case SDLK_KP4:
|
||||
case SDLK_KP_4:
|
||||
case SDLK_LEFT:
|
||||
new_btn = BUTTON_LEFT;
|
||||
break;
|
||||
case SDLK_KP6:
|
||||
case SDLK_KP_6:
|
||||
case SDLK_RIGHT:
|
||||
new_btn = BUTTON_RIGHT;
|
||||
break;
|
||||
case SDLK_KP8:
|
||||
case SDLK_KP_8:
|
||||
case SDLK_UP:
|
||||
new_btn = BUTTON_UP;
|
||||
break;
|
||||
case SDLK_KP2:
|
||||
case SDLK_KP_2:
|
||||
case SDLK_DOWN:
|
||||
new_btn = BUTTON_DOWN;
|
||||
break;
|
||||
|
|
@ -58,7 +58,7 @@ int key_to_button(int keyboard_button)
|
|||
case SDLK_F1:
|
||||
new_btn = BUTTON_REC;
|
||||
break;
|
||||
case SDLK_KP5:
|
||||
case SDLK_KP_5:
|
||||
case SDLK_SPACE:
|
||||
new_btn = BUTTON_SELECT;
|
||||
break;
|
||||
|
|
@ -76,25 +76,25 @@ struct button_map bm[] = {
|
|||
{ SDLK_KP_PLUS, 327, 36, 16, "Play" },
|
||||
{ SDLK_KP_ENTER, 330, 99, 18, "Stop" },
|
||||
{ SDLK_KP_PERIOD, 330, 163, 18, "AB" },
|
||||
{ SDLK_KP5, 186, 227, 27, "5" },
|
||||
{ SDLK_KP8, 187, 185, 19, "8" },
|
||||
{ SDLK_KP4, 142, 229, 23, "4" },
|
||||
{ SDLK_KP6, 231, 229, 22, "6" },
|
||||
{ SDLK_KP2, 189, 272, 28, "2" },
|
||||
{ SDLK_KP_5, 186, 227, 27, "5" },
|
||||
{ SDLK_KP_8, 187, 185, 19, "8" },
|
||||
{ SDLK_KP_4, 142, 229, 23, "4" },
|
||||
{ SDLK_KP_6, 231, 229, 22, "6" },
|
||||
{ SDLK_KP_2, 189, 272, 28, "2" },
|
||||
/* Remote Buttons */
|
||||
{ SDLK_KP_ENTER, 250, 404, 20, "Stop" },
|
||||
{ SDLK_SPACE, 285, 439, 29, "Space" },
|
||||
{ SDLK_h, 336, 291, 24, "Hold" },
|
||||
#elif defined (IRIVER_H300)
|
||||
{ SDLK_KP_PLUS, 56, 335, 20, "Play" },
|
||||
{ SDLK_KP8, 140, 304, 29, "Up" },
|
||||
{ SDLK_KP_8, 140, 304, 29, "Up" },
|
||||
{ SDLK_KP_DIVIDE, 233, 331, 23, "Record" },
|
||||
{ SDLK_KP_ENTER, 54, 381, 24, "Stop" },
|
||||
{ SDLK_KP4, 100, 353, 17, "Left" },
|
||||
{ SDLK_KP5, 140, 351, 19, "Navi" },
|
||||
{ SDLK_KP6, 185, 356, 19, "Right" },
|
||||
{ SDLK_KP_4, 100, 353, 17, "Left" },
|
||||
{ SDLK_KP_5, 140, 351, 19, "Navi" },
|
||||
{ SDLK_KP_6, 185, 356, 19, "Right" },
|
||||
{ SDLK_KP_PERIOD, 230, 380, 20, "AB" },
|
||||
{ SDLK_KP2, 142, 402, 24, "Down" },
|
||||
{ SDLK_KP_2, 142, 402, 24, "Down" },
|
||||
{ SDLK_KP_ENTER, 211, 479, 21, "Stop" },
|
||||
{ SDLK_KP_PLUS, 248, 513, 29, "Play" },
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue