diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 13:25:45 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 13:25:45 +0000 |
commit | 5e5bfabf6731758302a8ec15dc4f93109bf91d84 (patch) | |
tree | c539ebce3ac1aef9081201dcc52956704458216e /apps/gui | |
parent | 75765df6df134c718189125073806bfb4a1512b1 (diff) | |
download | rockbox-5e5bfabf6731758302a8ec15dc4f93109bf91d84.tar.gz rockbox-5e5bfabf6731758302a8ec15dc4f93109bf91d84.zip |
* fixed the pitch screen key mappings for all targets, targets require a
mapping to access the screen from the wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10611 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 2b80172ad4..12e120f7d4 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include <string.h> | 20 | #include <string.h> |
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include "config.h" | ||
22 | 23 | ||
23 | #include "system.h" | 24 | #include "system.h" |
24 | #include "file.h" | 25 | #include "file.h" |
@@ -373,10 +374,11 @@ long gui_wps_show(void) | |||
373 | audio_next(); | 374 | audio_next(); |
374 | break; | 375 | break; |
375 | /* next / prev directories */ | 376 | /* next / prev directories */ |
376 | case ACTION_WPS_NEXTDIR: | 377 | /* and set A-B markers if in a-b mode */ |
378 | case ACTION_WPS_ABSETB_NEXTDIR: | ||
377 | if (global_settings.party_mode) | 379 | if (global_settings.party_mode) |
378 | break; | 380 | break; |
379 | #if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS) | 381 | #if defined(AB_REPEAT_ENABLE) |
380 | if (ab_repeat_mode_enabled()) | 382 | if (ab_repeat_mode_enabled()) |
381 | { | 383 | { |
382 | ab_set_B_marker(wps_state.id3->elapsed); | 384 | ab_set_B_marker(wps_state.id3->elapsed); |
@@ -389,10 +391,10 @@ long gui_wps_show(void) | |||
389 | audio_next_dir(); | 391 | audio_next_dir(); |
390 | } | 392 | } |
391 | break; | 393 | break; |
392 | case ACTION_WPS_PREVDIR: | 394 | case ACTION_WPS_ABSETA_PREVDIR: |
393 | if (global_settings.party_mode) | 395 | if (global_settings.party_mode) |
394 | break; | 396 | break; |
395 | #if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS) | 397 | #if defined(AB_REPEAT_ENABLE) |
396 | if (ab_repeat_mode_enabled()) | 398 | if (ab_repeat_mode_enabled()) |
397 | ab_set_A_marker(wps_state.id3->elapsed); | 399 | ab_set_A_marker(wps_state.id3->elapsed); |
398 | else | 400 | else |
@@ -465,10 +467,10 @@ long gui_wps_show(void) | |||
465 | { | 467 | { |
466 | gui_wps_set_margin(&gui_wps[i]); | 468 | gui_wps_set_margin(&gui_wps[i]); |
467 | } | 469 | } |
468 | #endif /* BUTTON_F3 */ | 470 | #endif |
469 | restore = true; | 471 | restore = true; |
470 | break; | 472 | break; |
471 | #endif | 473 | #endif /* BUTTON_F3 */ |
472 | 474 | ||
473 | /* pitch screen */ | 475 | /* pitch screen */ |
474 | #ifdef HAVE_PITCHSCREEN | 476 | #ifdef HAVE_PITCHSCREEN |
@@ -476,6 +478,7 @@ long gui_wps_show(void) | |||
476 | #ifdef HAVE_LCD_COLOR | 478 | #ifdef HAVE_LCD_COLOR |
477 | show_main_backdrop(); | 479 | show_main_backdrop(); |
478 | #endif | 480 | #endif |
481 | action_signalscreenchange(); | ||
479 | if (1 == pitch_screen()) | 482 | if (1 == pitch_screen()) |
480 | return SYS_USB_CONNECTED; | 483 | return SYS_USB_CONNECTED; |
481 | #ifdef HAVE_LCD_COLOR | 484 | #ifdef HAVE_LCD_COLOR |
@@ -505,22 +508,6 @@ long gui_wps_show(void) | |||
505 | } | 508 | } |
506 | ab_set_A_marker(wps_state.id3->elapsed); | 509 | ab_set_A_marker(wps_state.id3->elapsed); |
507 | break; | 510 | break; |
508 | |||
509 | |||
510 | /* set A marker for A-B repeat */ | ||
511 | case ACTION_WPSAB_SETA: | ||
512 | if (ab_repeat_mode_enabled()) | ||
513 | ab_set_A_marker(wps_state.id3->elapsed); | ||
514 | break; | ||
515 | /* set B marker for A-B repeat and jump to A */ | ||
516 | case ACTION_WPSAB_SETB: | ||
517 | if (ab_repeat_mode_enabled()) | ||
518 | { | ||
519 | ab_set_B_marker(wps_state.id3->elapsed); | ||
520 | ab_jump_to_A_marker(); | ||
521 | update_track = true; | ||
522 | } | ||
523 | break; | ||
524 | /* reset A&B markers */ | 511 | /* reset A&B markers */ |
525 | case ACTION_WPSAB_RESET: | 512 | case ACTION_WPSAB_RESET: |
526 | if (ab_repeat_mode_enabled()) | 513 | if (ab_repeat_mode_enabled()) |