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

Fixes: (1) Ondio: Off is now an alternative way to cancel settings. (2) Use proper function to clear button queue. (3) Create bookmark request now working properly, ignoring stray button releases. (4) Fixed button handling in bookmark display on Ondio (it was impossible to delete a bookmark before)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5338 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2004-10-24 21:45:37 +00:00
parent 821e625e74
commit 4dab0d2432
2 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

50
apps/bookmark.c
View file

@ -256,27 +256,25 @@ bool bookmark_autobookmark(void)
{ {
/* Wait for a key to be pushed */ /* Wait for a key to be pushed */
key = button_get(true); key = button_get(true);
if (key & BUTTON_REL) switch (key)
{ {
#ifdef BUTTON_PLAY case SETTINGS_OK:
if (key & BUTTON_PLAY)
#else
if (key & BUTTON_RIGHT)
#endif
{
if (global_settings.autocreatebookmark == if (global_settings.autocreatebookmark ==
BOOKMARK_RECENT_ONLY_ASK) BOOKMARK_RECENT_ONLY_ASK)
write_bookmark(false); return write_bookmark(false);
else else
write_bookmark(true); return write_bookmark(true);
} break;
done = true;
}
if (default_event_handler(key) == SYS_USB_CONNECTED) default:
return false; /* Handle sys events, ignore button releases & repeats */
if(default_event_handler(key) ||
!(key & (BUTTON_REL|BUTTON_REPEAT)))
done = true;
break;
}
} }
return true; return false;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -482,7 +480,7 @@ bool bookmark_autoload(const char* file)
} }
else else
{ {
while (button_get(false)); /* clear button queue */ button_clear_queue(); /* clear button queue */
/* Prompting user to confirm bookmark load */ /* Prompting user to confirm bookmark load */
lcd_clear_display(); lcd_clear_display();
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -512,11 +510,7 @@ bool bookmark_autoload(const char* file)
case BUTTON_DOWN: case BUTTON_DOWN:
return bookmark_load(global_bookmark_file_name, false); return bookmark_load(global_bookmark_file_name, false);
#endif #endif
#ifdef BUTTON_PLAY case SETTINGS_OK:
case BUTTON_PLAY:
#else
case BUTTON_RIGHT:
#endif
return bookmark_load(global_bookmark_file_name, true); return bookmark_load(global_bookmark_file_name, true);
default: default:
@ -621,7 +615,7 @@ static char* select_bookmark(const char* bookmark_file_name)
lcd_setmargins(0, 0); lcd_setmargins(0, 0);
#endif #endif
while (button_get(false)); /* clear button queue */ button_clear_queue(); /* clear button queue */
bookmark_count = get_bookmark_count(bookmark_file_name); bookmark_count = get_bookmark_count(bookmark_file_name);
while(true) while(true)
@ -644,7 +638,7 @@ static char* select_bookmark(const char* bookmark_file_name)
{ {
splash(HZ, true, str(LANG_BOOKMARK_LOAD_EMPTY)); splash(HZ, true, str(LANG_BOOKMARK_LOAD_EMPTY));
remove(bookmark_file_name); remove(bookmark_file_name);
while (button_get(false)); /* clear button queue */ button_clear_queue(); /* clear button queue */
return NULL; return NULL;
} }
else else
@ -674,10 +668,10 @@ static char* select_bookmark(const char* bookmark_file_name)
#endif #endif
return bookmark; return bookmark;
#if defined(BUTTON_ON) && defined(BUTTON_PLAY) #if CONFIG_KEYPAD == ONDIO_PAD
case BUTTON_ON | BUTTON_PLAY:
#elif defined(BUTTON_MENU) && defined(BUTTON_RIGHT)
case BUTTON_MENU | BUTTON_RIGHT: case BUTTON_MENU | BUTTON_RIGHT:
#else
case BUTTON_ON | BUTTON_PLAY:
#endif #endif
/* User wants to delete this bookmark */ /* User wants to delete this bookmark */
delete_bookmark(bookmark_file_name, bookmark_id); delete_bookmark(bookmark_file_name, bookmark_id);
@ -685,7 +679,7 @@ static char* select_bookmark(const char* bookmark_file_name)
bookmark_count--; bookmark_count--;
if(bookmark_id >= bookmark_count) if(bookmark_id >= bookmark_count)
bookmark_id = bookmark_count -1; bookmark_id = bookmark_count -1;
while (button_get(false)); /* clear button queue */ button_clear_queue(); /* clear button queue */
break; break;
case SETTINGS_INC: case SETTINGS_INC:
@ -696,7 +690,9 @@ static char* select_bookmark(const char* bookmark_file_name)
bookmark_id++; bookmark_id++;
break; break;
#if CONFIG_KEYPAD != ONDIO_PAD
case SETTINGS_CANCEL: case SETTINGS_CANCEL:
#endif
#ifdef SETTINGS_CANCEL2 #ifdef SETTINGS_CANCEL2
case SETTINGS_CANCEL2: case SETTINGS_CANCEL2:
#endif #endif

11
apps/settings.h
View file

@ -50,11 +50,12 @@
#define SETTINGS_CANCEL2 BUTTON_MENU #define SETTINGS_CANCEL2 BUTTON_MENU
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
#define SETTINGS_INC BUTTON_UP #define SETTINGS_INC BUTTON_UP
#define SETTINGS_DEC BUTTON_DOWN #define SETTINGS_DEC BUTTON_DOWN
#define SETTINGS_OK BUTTON_RIGHT #define SETTINGS_OK BUTTON_RIGHT
#define SETTINGS_OK2 BUTTON_LEFT #define SETTINGS_OK2 BUTTON_LEFT
#define SETTINGS_CANCEL BUTTON_MENU #define SETTINGS_CANCEL BUTTON_MENU
#define SETTINGS_CANCEL2 BUTTON_OFF
#endif #endif