summaryrefslogtreecommitdiff
path: root/apps/screens.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-11-28 22:26:20 +0000
committerThom Johansen <thomj@rockbox.org>2005-11-28 22:26:20 +0000
commit27c658c8a655ebe4f8160c24486867aca2900754 (patch)
tree9b91b1275e1c0ed493af477f5656f5edfb42b9aa /apps/screens.c
parent1d6eeea1e196b6d7beefab70a6ee664340ab7bef (diff)
downloadrockbox-27c658c8a655ebe4f8160c24486867aca2900754.tar.gz
rockbox-27c658c8a655ebe4f8160c24486867aca2900754.zip
Enabled playback speed adjustment support for H1x0. Modified the resampler to do both channels in one pass.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8099 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r--apps/screens.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/screens.c b/apps/screens.c
index 1693c31957..8bf18dc6c6 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -342,11 +342,16 @@ int charging_screen(void)
342#endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */ 342#endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */
343 343
344 344
345#if CONFIG_KEYPAD == RECORDER_PAD 345#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD
346/* returns: 346/* returns:
347 0 if no key was pressed 347 0 if no key was pressed
348 1 if a key was pressed (or if ON was held down long enough to repeat) 348 1 if a key was pressed (or if ON was held down long enough to repeat)
349 2 if USB was connected */ 349 2 if USB was connected */
350#if CONFIG_KEYPAD == RECORDER_PAD
351#define PITCH_PAUSE BUTTON_PLAY
352#elif CONFIG_KEYPAD == IRIVER_H100_PAD
353#define PITCH_PAUSE BUTTON_SELECT
354#endif
350int pitch_screen(void) 355int pitch_screen(void)
351{ 356{
352 int button; 357 int button;
@@ -411,17 +416,17 @@ int pitch_screen(void)
411 sound_set_pitch(pitch); 416 sound_set_pitch(pitch);
412 break; 417 break;
413 418
414 case BUTTON_ON | BUTTON_PLAY: 419 case BUTTON_ON | PITCH_PAUSE:
415 audio_pause(); 420 audio_pause();
416 used = true; 421 used = true;
417 break; 422 break;
418 423
419 case BUTTON_PLAY | BUTTON_REL: 424 case PITCH_PAUSE | BUTTON_REL:
420 audio_resume(); 425 audio_resume();
421 used = true; 426 used = true;
422 break; 427 break;
423 428
424 case BUTTON_ON | BUTTON_PLAY | BUTTON_REL: 429 case BUTTON_ON | PITCH_PAUSE | BUTTON_REL:
425 audio_resume(); 430 audio_resume();
426 exit = true; 431 exit = true;
427 break; 432 break;