From 65f61d6cce4a5d3b52860d38a922b01fcddc70cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Date: Tue, 9 Dec 2008 20:48:04 +0000 Subject: =?UTF-8?q?FS#9609=20FM=20radio=20support=20for=20the=20Gigabeat?= =?UTF-8?q?=20S,=20seeking/scanning=20is=20not=20yet=20implemented=20but?= =?UTF-8?q?=20manual=20tuning=20works=20nicely.=20Thanks=20to=20Rafa=C3=AB?= =?UTF-8?q?l=20Carr=C3=A9,=20Bertrik=20Sikken=20and=20Robert=20Menes=20for?= =?UTF-8?q?=20suggestions=20and=20debugging=20help.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19372 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-gigabeat-s.c | 18 ++++++++++++++++++ apps/recorder/radio.c | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index a60fd2d..b0cc870 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c @@ -276,6 +276,22 @@ static const struct button_mapping button_context_keyboard[] = { LAST_ITEM_IN_LIST }; /* button_context_keyboard */ +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_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 }, + + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) +}; + const struct button_mapping* get_context_mapping(int context) { switch (context) @@ -319,6 +335,8 @@ const struct button_mapping* get_context_mapping(int context) return button_context_pitchscreen; case CONTEXT_KEYBOARD: return button_context_keyboard; + case CONTEXT_FM: + return button_context_radio; } return button_context_standard; } diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 5f9fff8..dee38b5 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -104,13 +104,17 @@ #define FM_MODE #define FM_EXIT #define FM_PLAY + +#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) +#define FM_PRESET +#define FM_MODE #endif #define RADIO_SCAN_MODE 0 #define RADIO_PRESET_MODE 1 static int curr_preset = -1; -static int curr_freq; +static int curr_freq; /* current frequency in Hz */ static int radio_mode = RADIO_SCAN_MODE; static int search_dir = 0; -- cgit v1.1