tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

sdlapp: Enable compilation of most apps/games

Removes `#ifdef`s in many places to just have `HAVE_TOUCHSCREEN` be the
input fall back, as is already tentatively the case in the code.

Solitaire was the only app excluded since there aren’t enough buttons
for it mapped in the SDL layer.

Change-Id: I62450b7110b86c8037a121e96cd2e46754be79a3

authored by

Erin of Yukis and committed by
Solomon Peachy 96b5642c e677895e

+56 -93
+3
apps/plugins/SOURCES
··· 157 157 sliding_puzzle.c 158 158 snake.c 159 159 snake2.c 160 + #ifndef SDLAPP 161 + /* Too many buttons for SDL */ 160 162 solitaire.c 163 + #endif 161 164 sokoban.c 162 165 star.c 163 166 starfield.c
+1 -1
apps/plugins/SOURCES.app_build
··· 1 - #if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1) 1 + #if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1) || defined(SDLAPP) 2 2 /* In devices running RockBox as an application, but having a keypad */ 3 3 #include "SOURCES" 4 4 #else
+5 -1
apps/plugins/blackjack.c
··· 628 628 #define BJACK_RIGHT BUTTON_RIGHT 629 629 #define BJACK_LEFT BUTTON_LEFT 630 630 631 - #else 631 + #elif !defined(HAVE_TOUCHSCREEN) 632 632 #error No keymap defined! 633 633 #endif 634 634 ··· 640 640 #ifndef BJACK_SELECT 641 641 #define BJACK_SELECT BUTTON_CENTER 642 642 #define BJACK_SELECT_NAME "BUTTON_CENTER" 643 + #endif 644 + #ifndef BJACK_QUIT 645 + #define BJACK_QUIT BUTTON_BOTTOMRIGHT 646 + #define BJACK_QUIT_NAME "BUTTON_BOTTOMRIGHT" 643 647 #endif 644 648 #ifndef BJACK_MAX 645 649 #define BJACK_MAX BUTTON_TOPRIGHT
+6 -2
apps/plugins/boomshine.lua
··· 707 707 rb.touchscreen_mode(rb.TOUCHSCREEN_POINT) 708 708 end 709 709 710 - rb.backlight_force_on() 710 + if rb.backlight_force_on then 711 + rb.backlight_force_on() 712 + end 711 713 712 714 local eva = rockev.register("action", action_event, rb.HZ / 10) 713 715 ··· 761 763 end 762 764 763 765 -- Restore user backlight settings 764 - rb.backlight_use_settings() 766 + if rb.backlight_use_settings then 767 + rb.backlight_use_settings() 768 + end 765 769 if rb.cpu_boost then rb.cpu_boost(false) end 766 770 767 771 os.exit()
+4 -1
apps/plugins/brickmania.c
··· 382 382 #define UP BUTTON_UP 383 383 #define DOWN BUTTON_DOWN 384 384 385 - #else 385 + #elif !defined(HAVE_TOUCHSCREEN) 386 386 #error No keymap defined! 387 387 #endif 388 388 ··· 407 407 #endif 408 408 #ifndef DOWN 409 409 #define DOWN BUTTON_BOTTOMMIDDLE 410 + #endif 411 + #ifndef QUIT 412 + #define QUIT BUTTON_BOTTOMRIGHT 410 413 #endif 411 414 #endif 412 415
+4 -1
apps/plugins/calculator.c
··· 557 557 #define CALCULATOR_CALC BUTTON_MENU 558 558 #define CALCULATOR_CLEAR BUTTON_USER 559 559 560 - #else 560 + #elif !defined(HAVE_TOUCHSCREEN) 561 561 #error No keymap defined! 562 562 #endif 563 563 ··· 582 582 #endif 583 583 #ifndef CALCULATOR_CLEAR 584 584 #define CALCULATOR_CLEAR BUTTON_TOPRIGHT 585 + #endif 586 + #ifndef CALCULATOR_QUIT 587 + #define CALCULATOR_QUIT BUTTON_TOPLEFT 585 588 #endif 586 589 587 590 #include "lib/pluginlib_touchscreen.h"
+1 -4
apps/plugins/calendar.c
··· 409 409 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP 410 410 #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN 411 411 412 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 413 - /* use touchscreen */ 414 - 415 412 #elif CONFIG_KEYPAD == MA_PAD 416 413 #define CALENDAR_QUIT (BUTTON_BACK|BUTTON_MENU) 417 414 #define CALENDAR_SELECT BUTTON_PLAY ··· 443 440 #define CALENDAR_NEXT_MONTH BUTTON_POWER 444 441 #define CALENDAR_PREV_MONTH BUTTON_USER 445 442 446 - #else 443 + #elif !defined(HAVE_TOUCHSCREEN) 447 444 #error "No keypad setting." 448 445 #endif 449 446
+4 -1
apps/plugins/chessclock.c
··· 418 418 #define CHC_SETTINGS_OK BUTTON_SELECT 419 419 #define CHC_SETTINGS_CANCEL BUTTON_BACK 420 420 421 - #else 421 + #elif !defined(HAVE_TOUCHSCREEN) 422 422 #error No keymap defined! 423 423 #endif 424 424 ··· 443 443 #endif 444 444 #ifndef CHC_MENU 445 445 #define CHC_MENU BUTTON_TOPRIGHT 446 + #endif 447 + #ifndef CHC_QUIT 448 + #define CHC_QUIT BUTTON_BOTTOMRIGHT 446 449 #endif 447 450 #endif 448 451
+1 -4
apps/plugins/chip8.c
··· 1314 1314 #define CHIP8_KEY8 BUTTON_POWER 1315 1315 #define CHIP8_KEY9 BUTTON_USER 1316 1316 1317 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 1318 - /* use touchscreen */ 1319 - 1320 - #else 1317 + #elif !defined(HAVE_TOUCHSCREEN) 1321 1318 #error No keymap defined! 1322 1319 #endif 1323 1320
+1 -4
apps/plugins/cube.c
··· 392 392 #define CUBE_PAUSE BUTTON_PLAY 393 393 #define CUBE_HIGHSPEED BUTTON_BACK 394 394 395 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 396 - /* use touchscreen */ 397 - 398 395 #elif CONFIG_KEYPAD == MA_PAD 399 396 #define CUBE_QUIT BUTTON_BACK 400 397 #define CUBE_NEXT BUTTON_RIGHT ··· 425 422 #define CUBE_PAUSE BUTTON_USER 426 423 #define CUBE_HIGHSPEED BUTTON_SELECT 427 424 428 - #else 425 + #elif !defined(HAVE_TOUCHSCREEN) 429 426 #error No keymap defined! 430 427 #endif 431 428
+2 -1
apps/plugins/fft/fft.c
··· 56 56 57 57 #if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ 58 58 || (CONFIG_KEYPAD == IPOD_3G_PAD) \ 59 - || (CONFIG_KEYPAD == IPOD_4G_PAD) 59 + || (CONFIG_KEYPAD == IPOD_4G_PAD) \ 60 + || defined(SDLAPP) 60 61 #define FFT_QUIT PLA_UP 61 62 #else 62 63 #define FFT_QUIT PLA_EXIT
+1 -4
apps/plugins/flipit.c
··· 482 482 #define FLIPIT_STEP_BY_STEP BUTTON_VOL_UP 483 483 #define FLIPIT_TOGGLE BUTTON_SELECT 484 484 485 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 486 - /* use touchscreen */ 487 - 488 485 #elif CONFIG_KEYPAD == MA_PAD 489 486 490 487 #define FLIPIT_LEFT BUTTON_LEFT ··· 523 520 #define FLIPIT_STEP_BY_STEP BUTTON_POWER 524 521 #define FLIPIT_TOGGLE BUTTON_SELECT 525 522 526 - #else 523 + #elif !defined(HAVE_TOUCHSCREEN) 527 524 #error No keymap defined! 528 525 #endif 529 526
+1 -4
apps/plugins/invadrox.c
··· 281 281 #define RIGHT BUTTON_RIGHT 282 282 #define FIRE BUTTON_SELECT 283 283 284 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 285 - /* use touchscreen */ 286 - 287 284 #elif CONFIG_KEYPAD == MA_PAD 288 285 289 286 #define QUIT BUTTON_BACK ··· 305 302 #define RIGHT BUTTON_RIGHT 306 303 #define FIRE BUTTON_SELECT 307 304 308 - #else 305 + #elif !defined(HAVE_TOUCHSCREEN) 309 306 #error INVADROX: Unsupported keypad 310 307 #endif 311 308
+1 -4
apps/plugins/jewels.c
··· 367 367 #define HK_SELECT "SELECT" 368 368 #define HK_CANCEL "BACK" 369 369 370 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 371 - /* use touchscreen */ 372 - 373 370 #elif CONFIG_KEYPAD == MA_PAD 374 371 #define JEWELS_UP BUTTON_UP 375 372 #define JEWELS_DOWN BUTTON_DOWN ··· 400 397 #define HK_SELECT "A" 401 398 #define HK_CANCEL "B" 402 399 403 - #else 400 + #elif !defined(HAVE_TOUCHSCREEN) 404 401 #error No keymap defined! 405 402 #endif 406 403
+2
apps/plugins/metronome.c
··· 86 86 || (CONFIG_KEYPAD == IPOD_3G_PAD) \ 87 87 || (CONFIG_KEYPAD == IPOD_4G_PAD) 88 88 #define METRONOME_QUIT PLA_UP 89 + #elif defined(SDLAPP) 90 + #define METRONOME_QUIT PLA_CANCEL 89 91 #else 90 92 #define METRONOME_QUIT PLA_EXIT 91 93 #endif
+1 -4
apps/plugins/minesweeper.c
··· 442 442 # define MINESWP_DISCOVER (BUTTON_MENU|BUTTON_REPEAT) 443 443 # define MINESWP_INFO BUTTON_MENU 444 444 445 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 446 - /* use touchscreen */ 447 - 448 445 #elif CONFIG_KEYPAD == RG_NANO_PAD 449 446 # define MINESWP_LEFT BUTTON_LEFT 450 447 # define MINESWP_RIGHT BUTTON_RIGHT ··· 465 462 # define MINESWP_DISCOVER BUTTON_SELECT 466 463 # define MINESWP_INFO BUTTON_MENU 467 464 468 - #else 465 + #elif !defined(HAVE_TOUCHSCREEN) 469 466 #error No keymap defined! 470 467 #endif 471 468
+1 -4
apps/plugins/mp3_encoder.c
··· 2577 2577 #define MP3ENC_DONE BUTTON_POWER 2578 2578 #define MP3ENC_SELECT BUTTON_SELECT 2579 2579 2580 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 2581 - /* use touchscreen */ 2582 - 2583 2580 #elif CONFIG_KEYPAD == MA_PAD 2584 2581 #define MP3ENC_PREV BUTTON_LEFT 2585 2582 #define MP3ENC_NEXT BUTTON_RIGHT ··· 2598 2595 #define MP3ENC_DONE BUTTON_POWER 2599 2596 #define MP3ENC_SELECT BUTTON_SELECT 2600 2597 2601 - #else 2598 + #elif !defined(HAVE_TOUCHSCREEN) 2602 2599 #error No keymap defined! 2603 2600 #endif 2604 2601
+1 -4
apps/plugins/oscilloscope.c
··· 550 550 #define OSCILLOSCOPE_VOL_UP BUTTON_UP 551 551 #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN 552 552 553 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 554 - /* use touchscreen */ 555 - 556 553 #elif CONFIG_KEYPAD == RG_NANO_PAD 557 554 #define OSCILLOSCOPE_QUIT BUTTON_START 558 555 #define OSCILLOSCOPE_DRAWMODE BUTTON_X ··· 576 573 #define OSCILLOSCOPE_VOL_UP BUTTON_UP 577 574 #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN 578 575 579 - #else 576 + #elif !defined(HAVE_TOUCHSCREEN) 580 577 #error No keymap defined! 581 578 #endif 582 579
+1 -4
apps/plugins/pegbox.c
··· 711 711 #define LVL_UP_TEXT "UP+MENU" 712 712 #define LVL_DOWN_TEXT "DOWN+MENU" 713 713 714 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 715 - /* use touchscreen */ 716 - 717 714 #elif CONFIG_KEYPAD == RG_NANO_PAD 718 715 #define PEGBOX_SELECT BUTTON_A 719 716 #define PEGBOX_QUIT BUTTON_START ··· 748 745 #define LVL_DOWN_TEXT "Start" 749 746 #define SELECT_TEXT "A" 750 747 751 - #else 748 + #elif !defined(HAVE_TOUCHSCREEN) 752 749 #error "Unsupported keymap!" 753 750 #endif 754 751
+1 -4
apps/plugins/pong.c
··· 318 318 #define PONG_RIGHT_UP BUTTON_BACK 319 319 #define PONG_RIGHT_DOWN BUTTON_RIGHT 320 320 321 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 322 - /* use touchscreen */ 323 - 324 321 #elif CONFIG_KEYPAD == MA_PAD 325 322 #define PONG_QUIT BUTTON_BACK 326 323 #define PONG_PAUSE BUTTON_PLAY ··· 345 342 #define PONG_RIGHT_UP BUTTON_MENU 346 343 #define PONG_RIGHT_DOWN BUTTON_POWER 347 344 348 - #else 345 + #elif !defined(HAVE_TOUCHSCREEN) 349 346 #error No keymap defined! 350 347 #endif 351 348
+1 -4
apps/plugins/rockblox.c
··· 458 458 #define ROCKBLOX_RESTART BUTTON_BACK 459 459 #define ROCKBLOX_SCROLL_ENABLED 1 460 460 461 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 462 - /* use touchscreen */ 463 - 464 461 #elif CONFIG_KEYPAD == MA_PAD 465 462 #define ROCKBLOX_OFF (BUTTON_BACK|BUTTON_REPEAT) 466 463 #define ROCKBLOX_ROTATE_CCW BUTTON_UP ··· 495 492 #define ROCKBLOX_DROP BUTTON_SELECT 496 493 #define ROCKBLOX_RESTART BUTTON_USER 497 494 498 - #else 495 + #elif !defined(HAVE_TOUCHSCREEN) 499 496 #error No keymap defined! 500 497 #endif 501 498
+1 -4
apps/plugins/sliding_puzzle.c
··· 348 348 #define PUZZLE_SHUFFLE BUTTON_BACK 349 349 #define PUZZLE_PICTURE BUTTON_PLAY 350 350 351 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 352 - /* use touchscreen */ 353 - 354 351 #elif CONFIG_KEYPAD == MA_PAD 355 352 #define PUZZLE_QUIT BUTTON_BACK 356 353 #define PUZZLE_LEFT BUTTON_LEFT ··· 378 375 #define PUZZLE_SHUFFLE BUTTON_SELECT 379 376 #define PUZZLE_PICTURE BUTTON_MENU 380 377 381 - #else 378 + #elif !defined(HAVE_TOUCHSCREEN) 382 379 #error No keymap defined! 383 380 #endif 384 381
+1 -4
apps/plugins/snake.c
··· 305 305 #define SNAKE_DOWN BUTTON_DOWN 306 306 #define SNAKE_PLAYPAUSE BUTTON_PLAY 307 307 308 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 309 - /* use touchscreen */ 310 - 311 308 #elif CONFIG_KEYPAD == MA_PAD 312 309 #define SNAKE_QUIT BUTTON_BACK 313 310 #define SNAKE_LEFT BUTTON_LEFT ··· 332 329 #define SNAKE_DOWN BUTTON_DOWN 333 330 #define SNAKE_PLAYPAUSE BUTTON_SELECT 334 331 335 - #else 332 + #elif !defined(HAVE_TOUCHSCREEN) 336 333 #error No keymap defined! 337 334 #endif 338 335
+1 -4
apps/plugins/snake2.c
··· 449 449 #define SNAKE2_PLAYPAUSE BUTTON_PLAY 450 450 #define SNAKE2_PLAYPAUSE_TEXT "PLAY" 451 451 452 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 453 - /* use touchscreen */ 454 - 455 452 #elif CONFIG_KEYPAD == MA_PAD 456 453 #define SNAKE2_LEFT BUTTON_LEFT 457 454 #define SNAKE2_RIGHT BUTTON_RIGHT ··· 479 476 #define SNAKE2_PLAYPAUSE BUTTON_SELECT 480 477 #define SNAKE2_PLAYPAUSE_TEXT "A" 481 478 482 - #else 479 + #elif !defined(HAVE_TOUCHSCREEN) 483 480 #error No keymap defined! 484 481 #endif 485 482
+1 -4
apps/plugins/sokoban.c
··· 681 681 #define BUTTON_SAVE BUTTON_BACK 682 682 #define BUTTON_SAVE_NAME "BACK" 683 683 684 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 685 - /* use touchscreen */ 686 - 687 684 #elif CONFIG_KEYPAD == MA_PAD 688 685 #define SOKOBAN_LEFT BUTTON_LEFT 689 686 #define SOKOBAN_RIGHT BUTTON_RIGHT ··· 734 731 #define SOKOBAN_LEVEL_REPEAT_NAME "[TOPRIGHT]" 735 732 #define BUTTON_SAVE_NAME "A [CENTER]" 736 733 737 - #else 734 + #elif !defined(HAVE_TOUCHSCREEN) 738 735 #error No keymap defined! 739 736 #endif 740 737
+1 -4
apps/plugins/spacerocks.c
··· 363 363 #define AST_RIGHT BUTTON_RIGHT 364 364 #define AST_FIRE BUTTON_PLAY 365 365 366 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 367 - /* use touchscreen */ 368 - 369 366 #elif CONFIG_KEYPAD == MA_PAD 370 367 #define AST_PAUSE BUTTON_MENU 371 368 #define AST_QUIT BUTTON_BACK ··· 393 390 #define AST_RIGHT BUTTON_RIGHT 394 391 #define AST_FIRE BUTTON_SELECT 395 392 396 - #else 393 + #elif !defined(HAVE_TOUCHSCREEN) 397 394 #error No keymap defined! 398 395 #endif 399 396
+5 -5
apps/plugins/star.c
··· 705 705 #define STAR_LEVEL_DOWN_NAME "Start" 706 706 #define STAR_LEVEL_REPEAT_NAME "Y" 707 707 708 - #else 708 + #elif !defined(HAVE_TOUCHSCREEN) 709 709 #error No keymap defined! 710 710 #endif 711 711 712 712 #ifdef HAVE_TOUCHSCREEN 713 - //#ifndef STAR_QUIT 714 - //#define STAR_QUIT BUTTON_TOPLEFT 715 - //#define STAR_QUIT_NAME "TOPLEFT" 716 - //#endif 713 + #ifndef STAR_QUIT 714 + #define STAR_QUIT BUTTON_TOPRIGHT 715 + #define STAR_QUIT_NAME "TOPRIGHT" 716 + #endif 717 717 #ifndef STAR_LEFT 718 718 #define STAR_LEFT BUTTON_MIDLEFT 719 719 #endif
+1 -4
apps/plugins/vu_meter.c
··· 443 443 #define LABEL_MENU "MENU" 444 444 #define LABEL_VOLUME "VOL+/VOL-" 445 445 446 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 447 - /* use touchscreen */ 448 - 449 446 #elif CONFIG_KEYPAD == MA_PAD 450 447 #define VUMETER_QUIT BUTTON_BACK 451 448 #define VUMETER_HELP BUTTON_LEFT ··· 479 476 #define LABEL_MENU "X" 480 477 #define LABEL_VOLUME "Up/Down" 481 478 482 - #else 479 + #elif !defined(HAVE_TOUCHSCREEN) 483 480 #error No keymap defined! 484 481 #endif 485 482
+1 -4
apps/plugins/wormlet.c
··· 397 397 #define BTN_QUIT BUTTON_POWER 398 398 #define BTN_STOPRESET BUTTON_BACK 399 399 400 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 401 - /* use touchscreen */ 402 - 403 400 #elif CONFIG_KEYPAD == MA_PAD 404 401 #define BTN_DIR_UP BUTTON_UP 405 402 #define BTN_DIR_DOWN BUTTON_DOWN ··· 429 426 #define BTN_QUIT BUTTON_BACK 430 427 #define BTN_STOPRESET BUTTON_MENU 431 428 432 - #else 429 + #elif !defined(HAVE_TOUCHSCREEN) 433 430 #error No keymap defined! 434 431 #endif 435 432
+1 -4
apps/plugins/xobox.c
··· 351 351 #define DOWN BUTTON_DOWN 352 352 #define PAUSE BUTTON_PLAY 353 353 354 - #elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD 355 - /* use touchscreen */ 356 - 357 354 #elif CONFIG_KEYPAD == RG_NANO_PAD 358 355 359 356 #define QUIT BUTTON_START ··· 372 369 #define DOWN BUTTON_DOWN 373 370 #define PAUSE BUTTON_SELECT 374 371 375 - #else 372 + #elif !defined(HAVE_TOUCHSCREEN) 376 373 #error "No keymap defined!" 377 374 #endif 378 375