diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-e200.c | 20 | ||||
-rw-r--r-- | apps/settings_list.c | 6 |
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[] = { | |||
201 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 201 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
202 | }; /* button_context_pitchscreen */ | 202 | }; /* button_context_pitchscreen */ |
203 | 203 | ||
204 | /** Recording Screen **/ | ||
205 | static const struct button_mapping button_context_recscreen[] = { | ||
206 | { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | ||
207 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
208 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
209 | { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
210 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
211 | { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
212 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
213 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
214 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
215 | { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
217 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
218 | |||
219 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
220 | }; /* button_context_recscreen */ | ||
221 | |||
204 | static const struct button_mapping button_context_keyboard[] = { | 222 | static const struct button_mapping button_context_keyboard[] = { |
205 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 223 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
206 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 224 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -272,6 +290,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
272 | return button_context_quickscreen; | 290 | return button_context_quickscreen; |
273 | case CONTEXT_PITCHSCREEN: | 291 | case CONTEXT_PITCHSCREEN: |
274 | return button_context_pitchscreen; | 292 | return button_context_pitchscreen; |
293 | case CONTEXT_RECSCREEN: | ||
294 | return button_context_recscreen; | ||
275 | case CONTEXT_KEYBOARD: | 295 | case CONTEXT_KEYBOARD: |
276 | return button_context_keyboard; | 296 | return button_context_keyboard; |
277 | 297 | ||
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[] = { | |||
792 | {F_T_INT|F_RECSETTING,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0), | 792 | {F_T_INT|F_RECSETTING,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0), |
793 | "cliplight","off,main,both,remote",UNUSED}, | 793 | "cliplight","off,main,both,remote",UNUSED}, |
794 | #endif | 794 | #endif |
795 | #ifdef DEFAULT_REC_MIC_GAIN | ||
795 | {F_T_INT|F_RECSETTING,&global_settings.rec_mic_gain, | 796 | {F_T_INT|F_RECSETTING,&global_settings.rec_mic_gain, |
796 | LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), | 797 | LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN), |
797 | "rec mic gain",NULL,UNUSED}, | 798 | "rec mic gain",NULL,UNUSED}, |
799 | #endif /* DEFAULT_REC_MIC_GAIN */ | ||
800 | #ifdef DEFAULT_REC_LEFT_GAIN | ||
798 | {F_T_INT|F_RECSETTING,&global_settings.rec_left_gain, | 801 | {F_T_INT|F_RECSETTING,&global_settings.rec_left_gain, |
799 | LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), | 802 | LANG_RECORDING_LEFT,INT(DEFAULT_REC_LEFT_GAIN), |
800 | "rec left gain",NULL,UNUSED}, | 803 | "rec left gain",NULL,UNUSED}, |
804 | #endif /* DEFAULT_REC_LEFT_GAIN */ | ||
805 | #ifdef DEFAULT_REC_RIGHT_GAIN | ||
801 | {F_T_INT|F_RECSETTING,&global_settings.rec_right_gain,LANG_RECORDING_RIGHT, | 806 | {F_T_INT|F_RECSETTING,&global_settings.rec_right_gain,LANG_RECORDING_RIGHT, |
802 | INT(DEFAULT_REC_RIGHT_GAIN), | 807 | INT(DEFAULT_REC_RIGHT_GAIN), |
803 | "rec right gain",NULL,UNUSED}, | 808 | "rec right gain",NULL,UNUSED}, |
809 | #endif /* DEFAULT_REC_RIGHT_GAIN */ | ||
804 | #if CONFIG_CODEC == MAS3587F | 810 | #if CONFIG_CODEC == MAS3587F |
805 | {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, | 811 | {F_T_INT|F_RECSETTING,&global_settings.rec_frequency, |
806 | LANG_RECORDING_FREQUENCY, | 812 | LANG_RECORDING_FREQUENCY, |