diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 14:14:16 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-16 14:14:16 +0000 |
commit | f7db043fbc4f31f65f34601b39ba05a9e5e53a39 (patch) | |
tree | 093d44d2ffbba5d64f31d1824a2f09f4797acef4 /apps/screens.c | |
parent | 871be001f76e91bc8f632318748276119f3348a2 (diff) | |
download | rockbox-f7db043fbc4f31f65f34601b39ba05a9e5e53a39.tar.gz rockbox-f7db043fbc4f31f65f34601b39ba05a9e5e53a39.zip |
* fix pitchscreen
* stop yes/no screen eating the first press sometimes
* add enter id3 button from wps in irivier
* update keymap-h10 from Barry Wardell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10614 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/screens.c b/apps/screens.c index 42faac4cfa..2a19b23c9f 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2002 Björn Stenberg | 10 | * Copyright (C) 2002 Bj�n Stenberg |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -423,13 +423,13 @@ bool pitch_screen(void) | |||
423 | 423 | ||
424 | button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK); | 424 | button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK); |
425 | switch (button) { | 425 | switch (button) { |
426 | case ACTION_PS_DEC_SMALL: | 426 | case ACTION_PS_INC_SMALL: |
427 | if ( pitch < 2000 ) | 427 | if ( pitch < 2000 ) |
428 | pitch++; | 428 | pitch++; |
429 | sound_set_pitch(pitch); | 429 | sound_set_pitch(pitch); |
430 | break; | 430 | break; |
431 | 431 | ||
432 | case ACTION_PS_DEC_BIG: | 432 | case ACTION_PS_INC_BIG: |
433 | if ( pitch < 1990 ) | 433 | if ( pitch < 1990 ) |
434 | pitch += 10; | 434 | pitch += 10; |
435 | else | 435 | else |
@@ -437,13 +437,13 @@ bool pitch_screen(void) | |||
437 | sound_set_pitch(pitch); | 437 | sound_set_pitch(pitch); |
438 | break; | 438 | break; |
439 | 439 | ||
440 | case ACTION_PS_INC_SMALL: | 440 | case ACTION_PS_DEC_SMALL: |
441 | if ( pitch > 500 ) | 441 | if ( pitch > 500 ) |
442 | pitch--; | 442 | pitch--; |
443 | sound_set_pitch(pitch); | 443 | sound_set_pitch(pitch); |
444 | break; | 444 | break; |
445 | 445 | ||
446 | case ACTION_PS_INC_BIG: | 446 | case ACTION_PS_DEC_BIG: |
447 | if ( pitch > 510 ) | 447 | if ( pitch > 510 ) |
448 | pitch -= 10; | 448 | pitch -= 10; |
449 | else | 449 | else |
@@ -471,6 +471,7 @@ bool pitch_screen(void) | |||
471 | sound_set_pitch(pitch); | 471 | sound_set_pitch(pitch); |
472 | pitch_screen_draw(pitch); | 472 | pitch_screen_draw(pitch); |
473 | } | 473 | } |
474 | break; | ||
474 | case ACTION_PS_NUDGE_LEFTOFF: | 475 | case ACTION_PS_NUDGE_LEFTOFF: |
475 | pitch += 20; | 476 | pitch += 20; |
476 | sound_set_pitch(pitch); | 477 | sound_set_pitch(pitch); |
@@ -481,7 +482,7 @@ bool pitch_screen(void) | |||
481 | sound_set_pitch( pitch ); | 482 | sound_set_pitch( pitch ); |
482 | break; | 483 | break; |
483 | 484 | ||
484 | case ACTION_STD_CANCEL: | 485 | case ACTION_PS_EXIT: |
485 | exit = true; | 486 | exit = true; |
486 | break; | 487 | break; |
487 | 488 | ||