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

Quickscreen for the radio screen. I added a keymap for almost all targets. I couldn't find a nice one (i.e. one that's consistent with the wps/menu quickscreen combo) for iaudio m3, ondavx747 and the gogears.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24795 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-02-20 20:53:13 +00:00
parent 69338424a8
commit 68169026e5
18 changed files with 52 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/action.h
View file

@ -155,6 +155,7 @@ enum {
/* radio */
ACTION_FM_MENU,
ACTION_FM_PRESET,
ACTION_FM_QUICKSCREEN,
ACTION_FM_RECORD,
ACTION_FM_FREEZE,
ACTION_FM_STOP,

1
apps/keymaps/keymap-av300.c
View file

@ -217,6 +217,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_ON | BUTTON_REPEAT, BUTTON_ON },
{ ACTION_FM_EXIT, BUTTON_ON | BUTTON_REL, BUTTON_ON },
{ ACTION_FM_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)

1
apps/keymaps/keymap-c100.c
View file

@ -194,6 +194,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
{ ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

3
apps/keymaps/keymap-c200.c
View file

@ -216,7 +216,7 @@ static const struct button_mapping button_context_recscreen[] = {
#if CONFIG_TUNER
static const struct button_mapping button_context_radio[] = {
{ ACTION_NONE, BUTTON_UP, BUTTON_NONE },
{ ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_FM_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
{ ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE },
@ -226,6 +226,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

3
apps/keymaps/keymap-clip.c
View file

@ -232,13 +232,14 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
{ ACTION_FM_MODE, BUTTON_HOME, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
{ ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

1
apps/keymaps/keymap-e200.c
View file

@ -241,6 +241,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
{ ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

2
apps/keymaps/keymap-fuze.c
View file

@ -242,7 +242,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
{ ACTION_FM_PRESET, BUTTON_HOME|BUTTON_REL, BUTTON_NONE },
{ ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

3
apps/keymaps/keymap-gigabeat-s.c
View file

@ -305,13 +305,14 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT },
{ ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_MENU, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_FM_EXIT, BUTTON_BACK, BUTTON_NONE },
{ ACTION_FM_PLAY, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

3
apps/keymaps/keymap-h10.c
View file

@ -320,7 +320,8 @@ const struct button_mapping button_context_recscreen[] = {
static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_PRESET, BUTTON_RIGHT | BUTTON_REL, BUTTON_RIGHT },
{ ACTION_FM_MENU, BUTTON_RIGHT | BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
{ ACTION_FM_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY },
{ ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE },
{ ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY },

3
apps/keymaps/keymap-h1x0_h3x0.c
View file

@ -280,6 +280,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MODE, BUTTON_ON | BUTTON_REPEAT, BUTTON_ON },
{ ACTION_FM_EXIT, BUTTON_MODE | BUTTON_REL, BUTTON_MODE },
{ ACTION_FM_PLAY, BUTTON_ON | BUTTON_REL, BUTTON_ON },
{ ACTION_FM_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
@ -690,6 +691,7 @@ static const struct button_mapping button_context_radio_h100remote[] = {
{ ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_RC_ON | BUTTON_REPEAT, BUTTON_RC_ON },
{ ACTION_FM_EXIT, BUTTON_RC_MODE | BUTTON_REL, BUTTON_RC_MODE },
{ ACTION_FM_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE },
{ ACTION_FM_PLAY, BUTTON_RC_ON | BUTTON_REL, BUTTON_RC_ON },
{ ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE, BUTTON_NONE },
{ ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE, BUTTON_NONE },
@ -711,6 +713,7 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
{ ACTION_FM_STOP, BUTTON_RC_STOP, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_RC_ON | BUTTON_REPEAT, BUTTON_RC_ON },
{ ACTION_FM_EXIT, BUTTON_RC_MODE | BUTTON_REL, BUTTON_RC_MODE },
{ ACTION_FM_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE },
{ ACTION_FM_PLAY, BUTTON_RC_ON | BUTTON_REL, BUTTON_RC_ON },
{ ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE, BUTTON_NONE },
{ ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE, BUTTON_NONE },

3
apps/keymaps/keymap-ipod.c
View file

@ -199,7 +199,8 @@ const struct button_mapping button_context_recscreen[] = {
{ ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY },
{ ACTION_FM_MODE, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_MENU | BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_MENU | BUTTON_REL, BUTTON_MENU },
{ ACTION_FM_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
{ ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY },
{ ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },

3
apps/keymaps/keymap-m200.c
View file

@ -234,7 +234,8 @@ static const struct button_mapping button_context_recscreen[] = {
#if CONFIG_TUNER
static const struct button_mapping button_context_radio[] = {
{ ACTION_NONE, BUTTON_UP, BUTTON_NONE },
{ ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_FM_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
{ ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
{ ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
// { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE },

1
apps/keymaps/keymap-m3.c
View file

@ -96,6 +96,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
//{ ACTION_FM_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

1
apps/keymaps/keymap-ondavx747.c
View file

@ -153,6 +153,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_PRESET, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
//{ ACTION_FM_QUICKSCREEN, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_radio */

3
apps/keymaps/keymap-recorder.c
View file

@ -212,7 +212,8 @@ static const struct button_mapping button_context_bmark[] = {
static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE },
{ ACTION_FM_PRESET, BUTTON_F2|BUTTON_REL, BUTTON_F2 },
{ ACTION_FM_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE },
{ ACTION_FM_FREEZE, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE },

3
apps/keymaps/keymap-touchscreen.c
View file

@ -274,7 +274,8 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_PRESET, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT },
{ ACTION_FM_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT },
{ ACTION_FM_PLAY, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_FM)
}; /* button_context_radio */

4
apps/keymaps/keymap-x5.c
View file

@ -100,6 +100,7 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE },
{ ACTION_FM_MODE, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY },
{ ACTION_FM_EXIT, BUTTON_REC | BUTTON_REL, BUTTON_REC },
{ ACTION_FM_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
{ ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY },
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
@ -114,7 +115,8 @@ static const struct button_mapping remote_button_context_radio[] = {
{ ACTION_FM_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
{ ACTION_FM_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
{ ACTION_FM_MODE, BUTTON_RC_REC|BUTTON_REPEAT, BUTTON_RC_REC },
{ ACTION_FM_EXIT, BUTTON_RC_MENU, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU },
{ ACTION_FM_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU },
{ ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },

23
apps/recorder/radio.c
View file

@ -67,6 +67,9 @@
#include "menus/exported_menus.h"
#include "root_menu.h"
#include "viewport.h"
#ifdef HAVE_QUICKSCREEN
#include "quickscreen.h"
#endif
#if CONFIG_TUNER
@ -801,6 +804,26 @@ int radio_screen(void)
break;
#endif /* FM_PRESET */
#ifdef HAVE_QUICKSCREEN
case ACTION_FM_QUICKSCREEN:
{
if (quick_screen_quick(button))
{
done = true;
break;
}
FOR_NB_SCREENS(i)
{
screens[i].set_viewport(&vp[i]);
screens[i].stop_scroll();
screens[i].clear_viewport();
screens[i].update_viewport();
screens[i].set_viewport(NULL);
}
update_screen = true;
}
break;
#endif
#ifdef FM_FREEZE
case ACTION_FM_FREEZE:
if(!screen_freeze)