diff options
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_settings.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 2cc8fbc718..308aee62f3 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -47,6 +47,13 @@ struct mpeg_settings settings; | |||
47 | #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP | 47 | #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP |
48 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 48 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
49 | 49 | ||
50 | #define MPEG_START_TIME_RC_SELECT (BUTTON_RC_PLAY | BUTTON_REL) | ||
51 | #define MPEG_START_TIME_RC_LEFT BUTTON_RC_REW | ||
52 | #define MPEG_START_TIME_RC_RIGHT BUTTON_RC_FF | ||
53 | #define MPEG_START_TIME_RC_UP BUTTON_RC_VOL_UP | ||
54 | #define MPEG_START_TIME_RC_DOWN BUTTON_RC_VOL_DOWN | ||
55 | #define MPEG_START_TIME_RC_EXIT (BUTTON_RC_PLAY | BUTTON_REPEAT) | ||
56 | |||
50 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 57 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
51 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 58 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
52 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | 59 | #define MPEG_START_TIME_LEFT BUTTON_LEFT |
@@ -439,12 +446,20 @@ static int get_start_time(uint32_t duration) | |||
439 | /* Coarse (1 minute) control */ | 446 | /* Coarse (1 minute) control */ |
440 | case MPEG_START_TIME_DOWN: | 447 | case MPEG_START_TIME_DOWN: |
441 | case MPEG_START_TIME_DOWN | BUTTON_REPEAT: | 448 | case MPEG_START_TIME_DOWN | BUTTON_REPEAT: |
449 | #if MPEG_START_TIME_RC_DOWN | ||
450 | case MPEG_START_TIME_RC_DOWN: | ||
451 | case MPEG_START_TIME_RC_DOWN | BUTTON_REPEAT: | ||
452 | #endif | ||
442 | resume_time = increment_time(resume_time, -60*TS_SECOND, duration); | 453 | resume_time = increment_time(resume_time, -60*TS_SECOND, duration); |
443 | slider_state = state0; | 454 | slider_state = state0; |
444 | break; | 455 | break; |
445 | 456 | ||
446 | case MPEG_START_TIME_UP: | 457 | case MPEG_START_TIME_UP: |
447 | case MPEG_START_TIME_UP | BUTTON_REPEAT: | 458 | case MPEG_START_TIME_UP | BUTTON_REPEAT: |
459 | #if MPEG_START_TIME_RC_UP | ||
460 | case MPEG_START_TIME_RC_UP: | ||
461 | case MPEG_START_TIME_RC_UP | BUTTON_REPEAT: | ||
462 | #endif | ||
448 | resume_time = increment_time(resume_time, 60*TS_SECOND, duration); | 463 | resume_time = increment_time(resume_time, 60*TS_SECOND, duration); |
449 | slider_state = state0; | 464 | slider_state = state0; |
450 | break; | 465 | break; |
@@ -452,6 +467,10 @@ static int get_start_time(uint32_t duration) | |||
452 | /* Fine (1 second) control */ | 467 | /* Fine (1 second) control */ |
453 | case MPEG_START_TIME_LEFT: | 468 | case MPEG_START_TIME_LEFT: |
454 | case MPEG_START_TIME_LEFT | BUTTON_REPEAT: | 469 | case MPEG_START_TIME_LEFT | BUTTON_REPEAT: |
470 | #if MPEG_START_TIME_RC_LEFT | ||
471 | case MPEG_START_TIME_RC_LEFT: | ||
472 | case MPEG_START_TIME_RC_LEFT | BUTTON_REPEAT: | ||
473 | #endif | ||
455 | #ifdef MPEG_START_TIME_SCROLL_UP | 474 | #ifdef MPEG_START_TIME_SCROLL_UP |
456 | case MPEG_START_TIME_SCROLL_UP: | 475 | case MPEG_START_TIME_SCROLL_UP: |
457 | case MPEG_START_TIME_SCROLL_UP | BUTTON_REPEAT: | 476 | case MPEG_START_TIME_SCROLL_UP | BUTTON_REPEAT: |
@@ -462,6 +481,10 @@ static int get_start_time(uint32_t duration) | |||
462 | 481 | ||
463 | case MPEG_START_TIME_RIGHT: | 482 | case MPEG_START_TIME_RIGHT: |
464 | case MPEG_START_TIME_RIGHT | BUTTON_REPEAT: | 483 | case MPEG_START_TIME_RIGHT | BUTTON_REPEAT: |
484 | #if MPEG_START_TIME_RC_RIGHT | ||
485 | case MPEG_START_TIME_RC_RIGHT: | ||
486 | case MPEG_START_TIME_RC_RIGHT | BUTTON_REPEAT: | ||
487 | #endif | ||
465 | #ifdef MPEG_START_TIME_SCROLL_DOWN | 488 | #ifdef MPEG_START_TIME_SCROLL_DOWN |
466 | case MPEG_START_TIME_SCROLL_DOWN: | 489 | case MPEG_START_TIME_SCROLL_DOWN: |
467 | case MPEG_START_TIME_SCROLL_DOWN | BUTTON_REPEAT: | 490 | case MPEG_START_TIME_SCROLL_DOWN | BUTTON_REPEAT: |
@@ -471,12 +494,18 @@ static int get_start_time(uint32_t duration) | |||
471 | break; | 494 | break; |
472 | 495 | ||
473 | case MPEG_START_TIME_SELECT: | 496 | case MPEG_START_TIME_SELECT: |
497 | #if MPEG_START_TIME_RC_SELECT | ||
498 | case MPEG_START_TIME_RC_SELECT: | ||
499 | #endif | ||
474 | settings.resume_time = resume_time; | 500 | settings.resume_time = resume_time; |
475 | button = MPEG_START_SEEK; | 501 | button = MPEG_START_SEEK; |
476 | slider_state = state9; | 502 | slider_state = state9; |
477 | break; | 503 | break; |
478 | 504 | ||
479 | case MPEG_START_TIME_EXIT: | 505 | case MPEG_START_TIME_EXIT: |
506 | #if MPEG_START_TIME_RC_EXIT | ||
507 | case MPEG_START_TIME_RC_EXIT: | ||
508 | #endif | ||
480 | button = MPEG_START_EXIT; | 509 | button = MPEG_START_EXIT; |
481 | slider_state = state9; | 510 | slider_state = state9; |
482 | break; | 511 | break; |