diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
commit | 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 (patch) | |
tree | bae2154b272f786983cf8e6de28d33f98f327560 /apps/gui/gwps-common.c | |
parent | c0f8b187706364f5e4bda2ac26750d14454c901d (diff) | |
download | rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.tar.gz rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.zip |
Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/gwps-common.c')
-rw-r--r-- | apps/gui/gwps-common.c | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index d83ac55787..72ad4d6e93 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include "backdrop.h" | 52 | #include "backdrop.h" |
53 | #endif | 53 | #endif |
54 | #include "dsp.h" | 54 | #include "dsp.h" |
55 | #include "action.h" | ||
55 | 56 | ||
56 | #ifdef HAVE_LCD_CHARCELLS | 57 | #ifdef HAVE_LCD_CHARCELLS |
57 | static bool draw_player_progress(struct gui_wps *gwps); | 58 | static bool draw_player_progress(struct gui_wps *gwps); |
@@ -2319,19 +2320,18 @@ bool ffwd_rew(int button) | |||
2319 | bool usb = false; | 2320 | bool usb = false; |
2320 | int i = 0; | 2321 | int i = 0; |
2321 | 2322 | ||
2323 | if (button == ACTION_NONE) | ||
2324 | { | ||
2325 | status_set_ffmode(0); | ||
2326 | return usb; | ||
2327 | } | ||
2322 | while (!exit) | 2328 | while (!exit) |
2323 | { | 2329 | { |
2324 | switch ( button ) | 2330 | switch ( button ) |
2325 | { | 2331 | { |
2326 | case WPS_FFWD: | 2332 | case ACTION_WPS_SEEKFWD: |
2327 | #ifdef WPS_RC_FFWD | ||
2328 | case WPS_RC_FFWD: | ||
2329 | #endif | ||
2330 | direction = 1; | 2333 | direction = 1; |
2331 | case WPS_REW: | 2334 | case ACTION_WPS_SEEKBACK: |
2332 | #ifdef WPS_RC_REW | ||
2333 | case WPS_RC_REW: | ||
2334 | #endif | ||
2335 | if (wps_state.ff_rewind) | 2335 | if (wps_state.ff_rewind) |
2336 | { | 2336 | { |
2337 | if (direction == 1) | 2337 | if (direction == 1) |
@@ -2415,12 +2415,7 @@ bool ffwd_rew(int button) | |||
2415 | 2415 | ||
2416 | break; | 2416 | break; |
2417 | 2417 | ||
2418 | case WPS_PREV: | 2418 | case ACTION_WPS_STOPSEEK: |
2419 | case WPS_NEXT: | ||
2420 | #ifdef WPS_RC_PREV | ||
2421 | case WPS_RC_PREV: | ||
2422 | case WPS_RC_NEXT: | ||
2423 | #endif | ||
2424 | wps_state.id3->elapsed = wps_state.id3->elapsed+ff_rewind_count; | 2419 | wps_state.id3->elapsed = wps_state.id3->elapsed+ff_rewind_count; |
2425 | audio_ff_rewind(wps_state.id3->elapsed); | 2420 | audio_ff_rewind(wps_state.id3->elapsed); |
2426 | ff_rewind_count = 0; | 2421 | ff_rewind_count = 0; |
@@ -2445,9 +2440,9 @@ bool ffwd_rew(int button) | |||
2445 | break; | 2440 | break; |
2446 | } | 2441 | } |
2447 | if (!exit) | 2442 | if (!exit) |
2448 | button = button_get(true); | 2443 | button = get_action(CONTEXT_WPS,TIMEOUT_BLOCK); |
2449 | } | 2444 | } |
2450 | 2445 | action_signalscreenchange(); | |
2451 | return usb; | 2446 | return usb; |
2452 | } | 2447 | } |
2453 | 2448 | ||
@@ -2547,7 +2542,7 @@ bool update(struct gui_wps *gwps) | |||
2547 | return retcode; | 2542 | return retcode; |
2548 | } | 2543 | } |
2549 | 2544 | ||
2550 | #ifdef WPS_KEYLOCK | 2545 | |
2551 | void display_keylock_text(bool locked) | 2546 | void display_keylock_text(bool locked) |
2552 | { | 2547 | { |
2553 | char* s; | 2548 | char* s; |
@@ -2569,11 +2564,3 @@ void display_keylock_text(bool locked) | |||
2569 | gui_syncsplash(HZ, true, s); | 2564 | gui_syncsplash(HZ, true, s); |
2570 | } | 2565 | } |
2571 | 2566 | ||
2572 | void waitfor_nokey(void) | ||
2573 | { | ||
2574 | /* wait until all keys are released */ | ||
2575 | while (button_get(false) != BUTTON_NONE) | ||
2576 | yield(); | ||
2577 | } | ||
2578 | #endif | ||
2579 | |||