devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

removed button_set_repeat/release() calls since we don't really need to do it

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2594 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Hak 2002-10-12 04:10:52 +00:00
parent 8279abe38e
commit dcb9efa2b8
2 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/tree.c
View file

@ -126,14 +126,12 @@ extern unsigned char bitmap_icons_6x8[LastIcon][6];
#define TREE_EXIT BUTTON_LEFT #define TREE_EXIT BUTTON_LEFT
#define TREE_ENTER BUTTON_RIGHT #define TREE_ENTER BUTTON_RIGHT
#define TREE_MENU BUTTON_F1 #define TREE_MENU BUTTON_F1
#define RELEASE_MASK (BUTTON_OFF | BUTTON_ON | BUTTON_F2 | BUTTON_F3)
#else #else
#define TREE_NEXT BUTTON_RIGHT #define TREE_NEXT BUTTON_RIGHT
#define TREE_PREV BUTTON_LEFT #define TREE_PREV BUTTON_LEFT
#define TREE_EXIT BUTTON_STOP #define TREE_EXIT BUTTON_STOP
#define TREE_ENTER BUTTON_PLAY #define TREE_ENTER BUTTON_PLAY
#define TREE_MENU BUTTON_MENU #define TREE_MENU BUTTON_MENU
#define RELEASE_MASK (BUTTON_STOP)
#endif /* HAVE_RECORDER_KEYPAD */ #endif /* HAVE_RECORDER_KEYPAD */
/* using attribute not used by FAT */ /* using attribute not used by FAT */
@ -704,8 +702,6 @@ bool dirbrowse(char *root)
memcpy(currdir,root,sizeof(currdir)); memcpy(currdir,root,sizeof(currdir));
start_resume(); start_resume();
button_set_release(RELEASE_MASK);
button_set_repeat(~0);
numentries = showdir(currdir, dirstart); numentries = showdir(currdir, dirstart);
if (numentries == -1) if (numentries == -1)

17
apps/wps.c
View file

@ -46,17 +46,10 @@
#define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
/* 3% of 30min file == 54s step size */ /* 3% of 30min file == 54s step size */
#ifdef HAVE_RECORDER_KEYPAD
#define RELEASE_MASK (BUTTON_F1 | BUTTON_F2 | BUTTON_F3 | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_UP | BUTTON_ON | BUTTON_PLAY )
#else
#define RELEASE_MASK (BUTTON_MENU | BUTTON_STOP | BUTTON_LEFT | BUTTON_RIGHT | BUTTON_PLAY)
#endif
bool keys_locked = false; bool keys_locked = false;
static bool ff_rewind = false; static bool ff_rewind = false;
static bool paused = false; static bool paused = false;
static struct mp3entry* id3 = NULL; static struct mp3entry* id3 = NULL;
static int old_release_mask;
#ifdef HAVE_PLAYER_KEYPAD #ifdef HAVE_PLAYER_KEYPAD
void player_change_volume(int button) void player_change_volume(int button)
@ -538,7 +531,7 @@ static bool menu(void)
exit = true; exit = true;
if ( !last_button ) { if ( !last_button ) {
lcd_stop_scroll(); lcd_stop_scroll();
button_set_release(old_release_mask);
if (main_menu()) if (main_menu())
return true; return true;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -547,7 +540,6 @@ static bool menu(void)
else else
lcd_setmargins(0, 0); lcd_setmargins(0, 0);
#endif #endif
old_release_mask = button_set_release(RELEASE_MASK);
} }
break; break;
@ -627,15 +619,11 @@ static bool menu(void)
int wps_show(void) int wps_show(void)
{ {
int button = 0, lastbutton = 0; int button = 0, lastbutton = 0;
int old_repeat_mask;
bool ignore_keyup = true; bool ignore_keyup = true;
bool restore = false; bool restore = false;
id3 = NULL; id3 = NULL;
old_release_mask = button_set_release(RELEASE_MASK);
old_repeat_mask = button_set_repeat(~0);
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
lcd_icon(ICON_AUDIO, true); lcd_icon(ICON_AUDIO, true);
lcd_icon(ICON_PARAM, false); lcd_icon(ICON_PARAM, false);
@ -715,8 +703,6 @@ int wps_show(void)
if (global_settings.browse_current && id3) if (global_settings.browse_current && id3)
set_current_file(id3->path); set_current_file(id3->path);
button_set_release(old_release_mask);
button_set_repeat(old_repeat_mask);
return 0; return 0;
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
} }
@ -852,7 +838,6 @@ int wps_show(void)
mpeg_stop(); mpeg_stop();
status_set_playmode(STATUS_STOP); status_set_playmode(STATUS_STOP);
button_set_release(old_release_mask);
return 0; return 0;
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED: