summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/sound_menu.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index f220d26f8f..c7edeb52a8 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -7,7 +7,7 @@
7 * \/ \/ \/ \/ \/ 7 * \/ \/ \/ \/ \/
8 * $Id$ 8 * $Id$
9 * 9 *
10 * Copyright (C) 2002 Björn Stenberg 10 * Copyright (C) 2002 Bj�n Stenberg
11 * 11 *
12 * All files in this archive are subject to the GNU General Public License. 12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement. 13 * See the file COPYING in the source tree root for full license agreement.
@@ -55,6 +55,7 @@
55#include "eq_menu.h" 55#include "eq_menu.h"
56#include "pcmbuf.h" 56#include "pcmbuf.h"
57#endif 57#endif
58#include "action.h"
58 59
59int selected_setting; /* Used by the callback */ 60int selected_setting; /* Used by the callback */
60void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) 61void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit)
@@ -901,7 +902,7 @@ bool rectrigger(void)
901 lcd_update(); 902 lcd_update();
902 903
903 switch (button) { 904 switch (button) {
904 case TRIG_CANCEL: 905 case ACTION_STD_CANCEL:
905 gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL)); 906 gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL));
906 global_settings.rec_start_thres = old_start_thres; 907 global_settings.rec_start_thres = old_start_thres;
907 global_settings.rec_start_duration = old_start_duration; 908 global_settings.rec_start_duration = old_start_duration;
@@ -913,26 +914,25 @@ bool rectrigger(void)
913 exit_request = true; 914 exit_request = true;
914 break; 915 break;
915 916
916 case TRIG_ACCEPT: 917 case ACTION_REC_PAUSE:
917 exit_request = true; 918 exit_request = true;
918 break; 919 break;
919 920
920 case BUTTON_UP: 921 case ACTION_STD_PREV:
921 selected += TRIG_OPTION_COUNT - 1; 922 selected += TRIG_OPTION_COUNT - 1;
922 selected %= TRIG_OPTION_COUNT; 923 selected %= TRIG_OPTION_COUNT;
923 offset = MIN(offset, (int)selected); 924 offset = MIN(offset, (int)selected);
924 offset = MAX(offset, (int)selected - option_lines + 1); 925 offset = MAX(offset, (int)selected - option_lines + 1);
925 break; 926 break;
926 927
927 case BUTTON_DOWN: 928 case ACTION_STD_NEXT:
928 selected ++; 929 selected ++;
929 selected %= TRIG_OPTION_COUNT; 930 selected %= TRIG_OPTION_COUNT;
930 offset = MIN(offset, (int)selected); 931 offset = MIN(offset, (int)selected);
931 offset = MAX(offset, (int)selected - option_lines + 1); 932 offset = MAX(offset, (int)selected - option_lines + 1);
932 break; 933 break;
933 934
934 case BUTTON_RIGHT: 935 case ACTION_SETTINGS_INC:
935 case BUTTON_RIGHT | BUTTON_REPEAT:
936 switch (selected) { 936 switch (selected) {
937 case TRIGGER_MODE: 937 case TRIGGER_MODE:
938 global_settings.rec_trigger_mode ++; 938 global_settings.rec_trigger_mode ++;
@@ -975,8 +975,7 @@ bool rectrigger(void)
975 settings_apply_trigger(); 975 settings_apply_trigger();
976 break; 976 break;
977 977
978 case BUTTON_LEFT: 978 case ACTION_SETTINGS_DEC:
979 case BUTTON_LEFT | BUTTON_REPEAT:
980 switch (selected) { 979 switch (selected) {
981 case TRIGGER_MODE: 980 case TRIGGER_MODE:
982 global_settings.rec_trigger_mode+=TRIGGER_MODE_COUNT-1; 981 global_settings.rec_trigger_mode+=TRIGGER_MODE_COUNT-1;
@@ -1023,7 +1022,7 @@ bool rectrigger(void)
1023 break; 1022 break;
1024 1023
1025#ifdef TRIG_RESET_SIM 1024#ifdef TRIG_RESET_SIM
1026 case TRIG_RESET_SIM: 1025 case ACTION_REC_F2:
1027 peak_meter_trigger(true); 1026 peak_meter_trigger(true);
1028 break; 1027 break;
1029#endif 1028#endif