Pitch screen now accessible from the WPS context menu for all targets. This means pitch adjustment is now available on the iPods and iAudio X5.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9175 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Zakk Roberts 2006-03-22 02:18:44 +00:00
parent e1226f4305
commit 5b93eb6f74
3 changed files with 46 additions and 32 deletions

View file

@ -907,19 +907,22 @@ int onplay(char* file, int attr, int from)
items[i].function = create_dir; items[i].function = create_dir;
i++; i++;
} }
#if CONFIG_CODEC == SWCODEC
/* Equalizer menu items */
if (context == CONTEXT_WPS) if (context == CONTEXT_WPS)
{ {
/* Pitch screen access */
items[i].desc = ID2P(LANG_PITCH);
items[i].function = pitch_screen;
i++;
#if CONFIG_CODEC == SWCODEC
/* Equalizer menu items */
items[i].desc = ID2P(LANG_EQUALIZER_GRAPHICAL); items[i].desc = ID2P(LANG_EQUALIZER_GRAPHICAL);
items[i].function = eq_menu_graphical; items[i].function = eq_menu_graphical;
i++; i++;
items[i].desc = ID2P(LANG_EQUALIZER_BROWSE); items[i].desc = ID2P(LANG_EQUALIZER_BROWSE);
items[i].function = eq_browse_presets; items[i].function = eq_browse_presets;
i++; i++;
}
#endif #endif
}
/* DIY menu handling, since we want to exit after selection */ /* DIY menu handling, since we want to exit after selection */
if (i) if (i)

View file

@ -345,7 +345,6 @@ int charging_screen(void)
} }
#endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */ #endif /* HAVE_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */
#if (CONFIG_KEYPAD != IAUDIO_X5_PAD) && (CONFIG_KEYPAD != PLAYER_PAD)
/* returns: /* returns:
0 if no key was pressed 0 if no key was pressed
1 if USB was connected */ 1 if USB was connected */
@ -459,8 +458,6 @@ bool pitch_screen(void)
return 0; return 0;
} }
#endif
#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) ||\ #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) ||\
(CONFIG_KEYPAD == IRIVER_H300_PAD) (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define bool_to_int(b)\ #define bool_to_int(b)\

View file

@ -44,6 +44,20 @@
#define PITCH_LEFT BUTTON_LEFT #define PITCH_LEFT BUTTON_LEFT
#define PITCH_EXIT BUTTON_SELECT #define PITCH_EXIT BUTTON_SELECT
#define PITCH_RESET BUTTON_MENU #define PITCH_RESET BUTTON_MENU
#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
#define PITCH_UP BUTTON_UP
#define PITCH_DOWN BUTTON_DOWN
#define PITCH_RIGHT BUTTON_RIGHT
#define PITCH_LEFT BUTTON_LEFT
#define PITCH_EXIT BUTTON_SELECT
#define PITCH_RESET BUTTON_A
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
#define PITCH_UP BUTTON_UP
#define PITCH_DOWN BUTTON_DOWN
#define PITCH_RIGHT BUTTON_RIGHT
#define PITCH_LEFT BUTTON_LEFT
#define PITCH_EXIT BUTTON_PLAY
#define PITCH_RESET BUTTON_POWER
#endif #endif
struct screen; struct screen;