From f7db043fbc4f31f65f34601b39ba05a9e5e53a39 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 16 Aug 2006 14:14:16 +0000 Subject: [PATCH] * 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 --- apps/gui/yesno.c | 2 +- apps/keymaps/keymap-h10.c | 52 ++++++++++++++++----------------- apps/keymaps/keymap-h1x0_h3x0.c | 5 ++-- apps/keymaps/keymap-ipod.c | 4 +-- apps/keymaps/keymap-ondio.c | 4 +-- apps/keymaps/keymap-recorder.c | 4 +-- apps/keymaps/keymap-x5.c | 4 +-- apps/screens.c | 13 +++++---- 8 files changed, 45 insertions(+), 43 deletions(-) diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index d567cf9ed4..2c3d6f7e10 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c @@ -71,10 +71,10 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message, gui_yesno_set_display(&(yn[i]), &(screens[i])); gui_yesno_draw(&(yn[i])); } + action_signalscreenchange(); while (result==-1) { button = get_action(CONTEXT_YESNOSCREEN,TIMEOUT_BLOCK); - DEBUGF("button=%x\n",button); switch (button) { case ACTION_YESNO_ACCEPT: diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 880d194a76..413683518c 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c @@ -31,36 +31,36 @@ * if there's no need to check the previous button's value, use BUTTON_NONE * Insert LAST_ITEM_IN_LIST at the end of each mapping */ -struct button_mapping button_context_standard[] = { - {ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, - {ACTION_STD_PREVREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, - {ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - {ACTION_STD_NEXTREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_SCROLL_DOWN}, +const struct button_mapping button_context_standard[] = { + { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_FF, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_QUICKSCREEN,BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, + { ACTION_STD_CONTEXT, BUTTON_FF, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_REW }, + { ACTION_STD_QUICKSCREEN, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, + { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_standard */ -struct button_mapping button_context_wps[] = { +const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY }, { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW}, - { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, + { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, - { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_FF }, + { ACTION_WPS_SEEKFWD, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL, BUTTON_FF|BUTTON_REPEAT }, { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_SCROLL_DOWN }, + { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, + { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -71,7 +71,7 @@ struct button_mapping button_context_wps[] = { }; /* button_context_wps */ -struct button_mapping button_context_settings[] = { +const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, @@ -82,7 +82,7 @@ struct button_mapping button_context_settings[] = { LAST_ITEM_IN_LIST }; /* button_context_settings */ -struct button_mapping button_context_tree[] = { +const struct button_mapping button_context_tree[] = { { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, @@ -90,7 +90,7 @@ struct button_mapping button_context_tree[] = { LAST_ITEM_IN_LIST }; /* button_context_tree */ -struct button_mapping button_context_tree_scroll_lr[] = { +const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, @@ -102,27 +102,27 @@ struct button_mapping button_context_tree_scroll_lr[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), }; /* button_context_tree_scroll_lr */ -struct button_mapping button_context_yesno[] = { +const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settings_yesno */ -struct button_mapping button_context_quickscreen[] = { +const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_SCROLL_UP }, + { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_SCROLL_DOWN }, + { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, + { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, + { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_quickscreen */ /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ -struct button_mapping* get_context_mapping(int context) +const struct button_mapping* get_context_mapping(int context) { switch (context) { diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index a087ea6c55..457431057e 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c @@ -84,6 +84,7 @@ const struct button_mapping button_context_wps[] = { { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, + { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_ON }, LAST_ITEM_IN_LIST }; /* button_context_wps */ @@ -182,9 +183,9 @@ const struct button_mapping button_context_quickscreen[] = { const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, + { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 96e2f20e9e..6cc6de6e1c 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -131,9 +131,9 @@ const struct button_mapping button_context_quickscreen[] = { const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_SCROLL_FWD }, + { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_SCROLL_BACK }, + { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 7ca7d20c83..12745dfb44 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c @@ -113,9 +113,9 @@ struct button_mapping button_context_bmark[] = { const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, + { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index a0a0426d32..5dae21c57c 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c @@ -127,9 +127,9 @@ const struct button_mapping button_context_quickscreen[] = { const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, + { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index d428de0e27..b94e98d001 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c @@ -126,9 +126,9 @@ const struct button_mapping button_context_quickscreen[] = { const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, + { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 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 @@ * \/ \/ \/ \/ \/ * $Id$ * - * Copyright (C) 2002 Björn Stenberg + * Copyright (C) 2002 Bj�n Stenberg * * All files in this archive are subject to the GNU General Public License. * See the file COPYING in the source tree root for full license agreement. @@ -423,13 +423,13 @@ bool pitch_screen(void) button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK); switch (button) { - case ACTION_PS_DEC_SMALL: + case ACTION_PS_INC_SMALL: if ( pitch < 2000 ) pitch++; sound_set_pitch(pitch); break; - case ACTION_PS_DEC_BIG: + case ACTION_PS_INC_BIG: if ( pitch < 1990 ) pitch += 10; else @@ -437,13 +437,13 @@ bool pitch_screen(void) sound_set_pitch(pitch); break; - case ACTION_PS_INC_SMALL: + case ACTION_PS_DEC_SMALL: if ( pitch > 500 ) pitch--; sound_set_pitch(pitch); break; - case ACTION_PS_INC_BIG: + case ACTION_PS_DEC_BIG: if ( pitch > 510 ) pitch -= 10; else @@ -471,6 +471,7 @@ bool pitch_screen(void) sound_set_pitch(pitch); pitch_screen_draw(pitch); } + break; case ACTION_PS_NUDGE_LEFTOFF: pitch += 20; sound_set_pitch(pitch); @@ -481,7 +482,7 @@ bool pitch_screen(void) sound_set_pitch( pitch ); break; - case ACTION_STD_CANCEL: + case ACTION_PS_EXIT: exit = true; break;