From af97e9369a5ecbe4438a1a5df14269fa56320fa3 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Tue, 2 Oct 2007 21:04:10 +0000 Subject: Commit FS #7881 by Mark Arigo - enable radio on the Sansa c200. It seems that many (if not all) c200s have the radio hardware even if you can't use it with the original firmware... git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14963 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-c200.c | 15 ++++++++++----- apps/recorder/radio.c | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'apps') diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c index f8801a2abe..3f4bb49743 100644 --- a/apps/keymaps/keymap-c200.c +++ b/apps/keymaps/keymap-c200.c @@ -87,12 +87,12 @@ static const struct button_mapping button_context_wps[] = { static const struct button_mapping button_context_settings[] = { { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, - - { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + + { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, @@ -241,6 +241,11 @@ static const struct button_mapping button_context_radio[] = { { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, { 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 }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) }; /* button_context_radio */ #endif diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 5042305967..6f155e5417 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -45,7 +45,9 @@ #include "lang.h" #include "font.h" #include "sound_menu.h" +#ifdef HAVE_RECORDING #include "recording.h" +#endif #include "talk.h" #include "tuner.h" #include "power.h" @@ -90,7 +92,7 @@ #elif CONFIG_KEYPAD == ONDIO_PAD #define FM_RECORD_DBLPRE #define FM_RECORD -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) #define FM_MENU #define FM_PRESET #define FM_STOP -- cgit v1.2.3