e200: Add recording. Just from MIC right now and FM integration will happen soon. Most every bit of weirdness is nescessary and no problems seem to exist that the retailos doesn't exhibit too (namely noise when LCD is on when recording from MIC).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13557 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 26 insertions, 0 deletions

diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 783d86f476..55e30ca258 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -201,6 +201,24 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_pitchscreen */
 
+/** Recording Screen **/
+static const struct button_mapping button_context_recscreen[]  = {
+    { ACTION_REC_PAUSE,         BUTTON_UP|BUTTON_REL,             BUTTON_UP    },
+    { ACTION_STD_CANCEL,        BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_REC_NEWFILE,       BUTTON_REC|BUTTON_REL,            BUTTON_REC   },
+    { ACTION_STD_MENU,          BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE  },
+    { ACTION_SETTINGS_INC,      BUTTON_RIGHT,                     BUTTON_NONE  },
+    { ACTION_SETTINGS_INC,      BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE  },
+    { ACTION_SETTINGS_DEC,      BUTTON_LEFT,                      BUTTON_NONE  },
+    { ACTION_SETTINGS_DEC,      BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE  },
+    { ACTION_STD_PREV,          BUTTON_SCROLL_UP,                 BUTTON_NONE  },
+    { ACTION_STD_PREV,          BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE  },
+    { ACTION_STD_NEXT,          BUTTON_SCROLL_DOWN,               BUTTON_NONE  },
+    { ACTION_STD_NEXT,          BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE  },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_recscreen */
+
 static const struct button_mapping button_context_keyboard[]  = {
     { ACTION_KBD_LEFT,         BUTTON_LEFT,                      BUTTON_NONE },
     { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
@@ -272,6 +290,8 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_quickscreen;
         case CONTEXT_PITCHSCREEN:
             return button_context_pitchscreen;
+        case CONTEXT_RECSCREEN:
+            return button_context_recscreen;
         case CONTEXT_KEYBOARD:
             return button_context_keyboard;
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 23bb81ac51..f91cacf190 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -792,15 +792,21 @@ const struct settings_list settings[] = {
     {F_T_INT|F_RECSETTING,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0),
         "cliplight","off,main,both,remote",UNUSED},
 #endif
+#ifdef DEFAULT_REC_MIC_GAIN
     {F_T_INT|F_RECSETTING,&global_settings.rec_mic_gain,
         LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN),
         "rec mic gain",NULL,UNUSED},
+#endif /* DEFAULT_REC_MIC_GAIN */
+#ifdef DEFAULT_REC_LEFT_GAIN
     {F_T_INT|F_RECSETTING,&global_settings.rec_left_gain,
         LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN),
         "rec left gain",NULL,UNUSED},
+#endif /* DEFAULT_REC_LEFT_GAIN */
+#ifdef DEFAULT_REC_RIGHT_GAIN
     {F_T_INT|F_RECSETTING,&global_settings.rec_right_gain,LANG_RECORDING_RIGHT,
         INT(DEFAULT_REC_RIGHT_GAIN),
         "rec right gain",NULL,UNUSED},
+#endif /* DEFAULT_REC_RIGHT_GAIN */
 #if CONFIG_CODEC == MAS3587F
     {F_T_INT|F_RECSETTING,&global_settings.rec_frequency,
         LANG_RECORDING_FREQUENCY,