diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-10-12 04:10:52 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-10-12 04:10:52 +0000 |
commit | dcb9efa2b878e315bd42a3b612efa72e9818e9c3 (patch) | |
tree | acc1ac2c7dec1695e5411e38dbd971b7c17c5538 /apps | |
parent | 8279abe38eeea72f6f883a3fe558412cea7e4aa7 (diff) | |
download | rockbox-dcb9efa2b878e315bd42a3b612efa72e9818e9c3.tar.gz rockbox-dcb9efa2b878e315bd42a3b612efa72e9818e9c3.zip |
removed button_set_repeat/release() calls since we don't really need to do it
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2594 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tree.c | 4 | ||||
-rw-r--r-- | apps/wps.c | 17 |
2 files changed, 1 insertions, 20 deletions
diff --git a/apps/tree.c b/apps/tree.c index b35e44861c..b026211f3c 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -126,14 +126,12 @@ extern unsigned char bitmap_icons_6x8[LastIcon][6]; | |||
126 | #define TREE_EXIT BUTTON_LEFT | 126 | #define TREE_EXIT BUTTON_LEFT |
127 | #define TREE_ENTER BUTTON_RIGHT | 127 | #define TREE_ENTER BUTTON_RIGHT |
128 | #define TREE_MENU BUTTON_F1 | 128 | #define TREE_MENU BUTTON_F1 |
129 | #define RELEASE_MASK (BUTTON_OFF | BUTTON_ON | BUTTON_F2 | BUTTON_F3) | ||
130 | #else | 129 | #else |
131 | #define TREE_NEXT BUTTON_RIGHT | 130 | #define TREE_NEXT BUTTON_RIGHT |
132 | #define TREE_PREV BUTTON_LEFT | 131 | #define TREE_PREV BUTTON_LEFT |
133 | #define TREE_EXIT BUTTON_STOP | 132 | #define TREE_EXIT BUTTON_STOP |
134 | #define TREE_ENTER BUTTON_PLAY | 133 | #define TREE_ENTER BUTTON_PLAY |
135 | #define TREE_MENU BUTTON_MENU | 134 | #define TREE_MENU BUTTON_MENU |
136 | #define RELEASE_MASK (BUTTON_STOP) | ||
137 | #endif /* HAVE_RECORDER_KEYPAD */ | 135 | #endif /* HAVE_RECORDER_KEYPAD */ |
138 | 136 | ||
139 | /* using attribute not used by FAT */ | 137 | /* using attribute not used by FAT */ |
@@ -704,8 +702,6 @@ bool dirbrowse(char *root) | |||
704 | memcpy(currdir,root,sizeof(currdir)); | 702 | memcpy(currdir,root,sizeof(currdir)); |
705 | 703 | ||
706 | start_resume(); | 704 | start_resume(); |
707 | button_set_release(RELEASE_MASK); | ||
708 | button_set_repeat(~0); | ||
709 | 705 | ||
710 | numentries = showdir(currdir, dirstart); | 706 | numentries = showdir(currdir, dirstart); |
711 | if (numentries == -1) | 707 | if (numentries == -1) |
diff --git a/apps/wps.c b/apps/wps.c index 82b62ca1b1..1544dcad6f 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -46,17 +46,10 @@ | |||
46 | #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ | 46 | #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ |
47 | /* 3% of 30min file == 54s step size */ | 47 | /* 3% of 30min file == 54s step size */ |
48 | 48 | ||
49 | #ifdef HAVE_RECORDER_KEYPAD | ||
50 | #define RELEASE_MASK (BUTTON_F1 | BUTTON_F2 | BUTTON_F3 | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_UP | BUTTON_ON | BUTTON_PLAY ) | ||
51 | #else | ||
52 | #define RELEASE_MASK (BUTTON_MENU | BUTTON_STOP | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_PLAY) | ||
53 | #endif | ||
54 | |||
55 | bool keys_locked = false; | 49 | bool keys_locked = false; |
56 | static bool ff_rewind = false; | 50 | static bool ff_rewind = false; |
57 | static bool paused = false; | 51 | static bool paused = false; |
58 | static struct mp3entry* id3 = NULL; | 52 | static struct mp3entry* id3 = NULL; |
59 | static int old_release_mask; | ||
60 | 53 | ||
61 | #ifdef HAVE_PLAYER_KEYPAD | 54 | #ifdef HAVE_PLAYER_KEYPAD |
62 | void player_change_volume(int button) | 55 | void player_change_volume(int button) |
@@ -538,7 +531,7 @@ static bool menu(void) | |||
538 | exit = true; | 531 | exit = true; |
539 | if ( !last_button ) { | 532 | if ( !last_button ) { |
540 | lcd_stop_scroll(); | 533 | lcd_stop_scroll(); |
541 | button_set_release(old_release_mask); | 534 | |
542 | if (main_menu()) | 535 | if (main_menu()) |
543 | return true; | 536 | return true; |
544 | #ifdef HAVE_LCD_BITMAP | 537 | #ifdef HAVE_LCD_BITMAP |
@@ -547,7 +540,6 @@ static bool menu(void) | |||
547 | else | 540 | else |
548 | lcd_setmargins(0, 0); | 541 | lcd_setmargins(0, 0); |
549 | #endif | 542 | #endif |
550 | old_release_mask = button_set_release(RELEASE_MASK); | ||
551 | } | 543 | } |
552 | break; | 544 | break; |
553 | 545 | ||
@@ -627,15 +619,11 @@ static bool menu(void) | |||
627 | int wps_show(void) | 619 | int wps_show(void) |
628 | { | 620 | { |
629 | int button = 0, lastbutton = 0; | 621 | int button = 0, lastbutton = 0; |
630 | int old_repeat_mask; | ||
631 | bool ignore_keyup = true; | 622 | bool ignore_keyup = true; |
632 | bool restore = false; | 623 | bool restore = false; |
633 | 624 | ||
634 | id3 = NULL; | 625 | id3 = NULL; |
635 | 626 | ||
636 | old_release_mask = button_set_release(RELEASE_MASK); | ||
637 | old_repeat_mask = button_set_repeat(~0); | ||
638 | |||
639 | #ifdef HAVE_LCD_CHARCELLS | 627 | #ifdef HAVE_LCD_CHARCELLS |
640 | lcd_icon(ICON_AUDIO, true); | 628 | lcd_icon(ICON_AUDIO, true); |
641 | lcd_icon(ICON_PARAM, false); | 629 | lcd_icon(ICON_PARAM, false); |
@@ -715,8 +703,6 @@ int wps_show(void) | |||
715 | if (global_settings.browse_current && id3) | 703 | if (global_settings.browse_current && id3) |
716 | set_current_file(id3->path); | 704 | set_current_file(id3->path); |
717 | 705 | ||
718 | button_set_release(old_release_mask); | ||
719 | button_set_repeat(old_repeat_mask); | ||
720 | return 0; | 706 | return 0; |
721 | #ifdef HAVE_RECORDER_KEYPAD | 707 | #ifdef HAVE_RECORDER_KEYPAD |
722 | } | 708 | } |
@@ -852,7 +838,6 @@ int wps_show(void) | |||
852 | 838 | ||
853 | mpeg_stop(); | 839 | mpeg_stop(); |
854 | status_set_playmode(STATUS_STOP); | 840 | status_set_playmode(STATUS_STOP); |
855 | button_set_release(old_release_mask); | ||
856 | return 0; | 841 | return 0; |
857 | 842 | ||
858 | case SYS_USB_CONNECTED: | 843 | case SYS_USB_CONNECTED: |