1
0
Fork 0
forked from len0rd/rockbox

Fix the recording trigger screen for the Archos recorder

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11027 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Martin Scarratt 2006-09-22 13:40:12 +00:00
parent 50185441db
commit 435c825494

View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2002 Björn Stenberg * Copyright (C) 2002 Bj<EFBFBD>n Stenberg
* *
* All files in this archive are subject to the GNU General Public License. * All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement. * See the file COPYING in the source tree root for full license agreement.
@ -55,6 +55,7 @@
#include "eq_menu.h" #include "eq_menu.h"
#include "pcmbuf.h" #include "pcmbuf.h"
#endif #endif
#include "action.h"
int selected_setting; /* Used by the callback */ int selected_setting; /* Used by the callback */
void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit)
@ -901,7 +902,7 @@ bool rectrigger(void)
lcd_update(); lcd_update();
switch (button) { switch (button) {
case TRIG_CANCEL: case ACTION_STD_CANCEL:
gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL)); gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL));
global_settings.rec_start_thres = old_start_thres; global_settings.rec_start_thres = old_start_thres;
global_settings.rec_start_duration = old_start_duration; global_settings.rec_start_duration = old_start_duration;
@ -913,26 +914,25 @@ bool rectrigger(void)
exit_request = true; exit_request = true;
break; break;
case TRIG_ACCEPT: case ACTION_REC_PAUSE:
exit_request = true; exit_request = true;
break; break;
case BUTTON_UP: case ACTION_STD_PREV:
selected += TRIG_OPTION_COUNT - 1; selected += TRIG_OPTION_COUNT - 1;
selected %= TRIG_OPTION_COUNT; selected %= TRIG_OPTION_COUNT;
offset = MIN(offset, (int)selected); offset = MIN(offset, (int)selected);
offset = MAX(offset, (int)selected - option_lines + 1); offset = MAX(offset, (int)selected - option_lines + 1);
break; break;
case BUTTON_DOWN: case ACTION_STD_NEXT:
selected ++; selected ++;
selected %= TRIG_OPTION_COUNT; selected %= TRIG_OPTION_COUNT;
offset = MIN(offset, (int)selected); offset = MIN(offset, (int)selected);
offset = MAX(offset, (int)selected - option_lines + 1); offset = MAX(offset, (int)selected - option_lines + 1);
break; break;
case BUTTON_RIGHT: case ACTION_SETTINGS_INC:
case BUTTON_RIGHT | BUTTON_REPEAT:
switch (selected) { switch (selected) {
case TRIGGER_MODE: case TRIGGER_MODE:
global_settings.rec_trigger_mode ++; global_settings.rec_trigger_mode ++;
@ -975,8 +975,7 @@ bool rectrigger(void)
settings_apply_trigger(); settings_apply_trigger();
break; break;
case BUTTON_LEFT: case ACTION_SETTINGS_DEC:
case BUTTON_LEFT | BUTTON_REPEAT:
switch (selected) { switch (selected) {
case TRIGGER_MODE: case TRIGGER_MODE:
global_settings.rec_trigger_mode+=TRIGGER_MODE_COUNT-1; global_settings.rec_trigger_mode+=TRIGGER_MODE_COUNT-1;
@ -1023,7 +1022,7 @@ bool rectrigger(void)
break; break;
#ifdef TRIG_RESET_SIM #ifdef TRIG_RESET_SIM
case TRIG_RESET_SIM: case ACTION_REC_F2:
peak_meter_trigger(true); peak_meter_trigger(true);
break; break;
#endif #endif