summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2008-08-06 20:12:44 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2008-08-06 20:12:44 +0000
commit496e1f7e85f929c487eb89f85ff0fc7edfcf3a27 (patch)
tree6c1ebac920b55979d6ac56972ffaee0747403e25 /apps
parent729d259388f0f418bcf285698a6c751335457ac0 (diff)
downloadrockbox-496e1f7e85f929c487eb89f85ff0fc7edfcf3a27.tar.gz
rockbox-496e1f7e85f929c487eb89f85ff0fc7edfcf3a27.zip
First step of the recording screen redesign. The screen is split into a fixed top part containing essential data and the peakmeters/triggerbar, and a bottom part that is in fact a list. The list contains the items that can be changed, and also some stuff that isn't important enough to be on the top part, like the filename. That filename is now shown completely. If the font is too big to have 6 lines on the display, sysfont is used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18202 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/english.lang299
-rw-r--r--apps/menus/recording_menu.c22
-rw-r--r--apps/recorder/peakmeter.c33
-rw-r--r--apps/recorder/peakmeter.h4
-rw-r--r--apps/recorder/recording.c1173
-rw-r--r--apps/settings_list.c16
6 files changed, 781 insertions, 766 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index b81d2343a6..5575db9d9f 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6470,15 +6470,15 @@
</phrase>
<phrase>
id: LANG_RECORDING_LEFT
- desc: in the recording screen
+ desc: deprecated
user:
<source>
*: none
- recording: "Gain Left"
+ recording: ""
</source>
<dest>
*: none
- recording: "Gain Left"
+ recording: ""
</dest>
<voice>
*: none
@@ -6487,15 +6487,15 @@
</phrase>
<phrase>
id: LANG_RECORDING_RIGHT
- desc: in the recording screen
+ desc: deprecated
user:
<source>
*: none
- recording: "Gain Right"
+ recording: ""
</source>
<dest>
*: none
- recording: "Gain Right"
+ recording: ""
</dest>
<voice>
*: none
@@ -6504,18 +6504,18 @@
</phrase>
<phrase>
id: LANG_RECORD_AGC_PRESET
- desc: automatic gain control in record settings
+ desc: deprecated
<source>
*: none
- agc: "Automatic Gain Control"
+ recording: ""
</source>
<dest>
*: none
- agc: "Automatic Gain Control"
+ recording: ""
</dest>
<voice>
*: none
- agc: "Automatic gain control"
+ recording: ""
</voice>
</phrase>
<phrase>
@@ -6600,18 +6600,18 @@
</phrase>
<phrase>
id: LANG_RECORD_AGC_CLIPTIME
- desc: in record settings
+ desc: deprecated
<source>
*: none
- agc: "AGC clip time"
+ agc: ""
</source>
<dest>
*: none
- agc: "AGC clip time"
+ agc: ""
</dest>
<voice>
*: none
- agc: "AGC clip time"
+ agc: ""
</voice>
</phrase>
<phrase>
@@ -10156,19 +10156,19 @@
</phrase>
<phrase>
id: LANG_SYSFONT_OFF
- desc: Used in a lot of places
+ desc: deprecated
user:
<source>
*: none
- lcd_bitmap: "Off"
+ lcd_bitmap: ""
</source>
<dest>
*: none
- lcd_bitmap: "Off"
+ lcd_bitmap: ""
</dest>
<voice>
*: none
- lcd_bitmap: "Off"
+ lcd_bitmap: ""
</voice>
</phrase>
<phrase>
@@ -10496,19 +10496,15 @@
</phrase>
<phrase>
id: LANG_SYSFONT_DISK_FULL
- desc: in recording screen
+ desc: deprecated
user:
<source>
*: none
- recording: "The disk is full. Press OFF to continue."
- h100,h120,h300: "The disk is full. Press STOP to continue."
- m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200,c200: "The disk is full. Press LEFT to continue."
+ recording: ""
</source>
<dest>
*: none
- recording: "The disk is full. Press OFF to continue."
- h100,h120,h300: "The disk is full. Press STOP to continue."
- m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200,c200: "The disk is full. Press LEFT to continue."
+ recording: ""
</dest>
<voice>
*: none
@@ -10517,19 +10513,19 @@
</phrase>
<phrase>
id: LANG_SYSFONT_VOLUME
- desc: in sound_settings
+ desc: deprecated
user:
<source>
*: none
- recording: "Volume"
+ recording: ""
</source>
<dest>
*: none
- recording: "Volume"
+ recording: ""
</dest>
<voice>
*: none
- recording: "Volume"
+ recording: ""
</voice>
</phrase>
<phrase>
@@ -10704,15 +10700,15 @@
</phrase>
<phrase>
id: LANG_SYSFONT_RECORDING_TIME
- desc: Display of recorded time
+ desc: deprecated
user:
<source>
*: none
- recording: "Time:"
+ recording: ""
</source>
<dest>
*: none
- recording: "Time:"
+ recording: ""
</dest>
<voice>
*: none
@@ -10721,15 +10717,15 @@
</phrase>
<phrase>
id: LANG_SYSFONT_RECORD_TIMESPLIT_REC
- desc: Display of record timer interval setting, on the record screen
+ desc: deprecated
user:
<source>
*: none
- recording: "Split Time:"
+ recording: ""
</source>
<dest>
*: none
- recording: "Split Time:"
+ recording: ""
</dest>
<voice>
*: none
@@ -10755,15 +10751,15 @@
</phrase>
<phrase>
id: LANG_SYSFONT_RECORD_PRERECORD
- desc: in recording and radio screen
+ desc: deprecated
user:
<source>
*: none
- recording: "Pre-Recording"
+ recording: ""
</source>
<dest>
*: none
- recording: "Pre-Recording"
+ recording: ""
</dest>
<voice>
*: none
@@ -10806,31 +10802,32 @@
</phrase>
<phrase>
id: LANG_SYSFONT_SPLIT_SIZE
- desc: in record timesplit options
+ desc: deprecated
+ user:
<source>
*: none
- recording: "Split Filesize"
+ recording: ""
</source>
<dest>
*: none
- recording: "Split Filesize"
+ recording: ""
</dest>
<voice>
*: none
- recording: "Split Filesize"
+ recording: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_RECORDING_FILENAME
- desc: Filename header in recording screen
+ desc: deprecated
user:
<source>
*: none
- recording: "Filename:"
+ recording: ""
</source>
<dest>
*: none
- recording: "Filename:"
+ recording: ""
</dest>
<voice>
*: none
@@ -10839,114 +10836,114 @@
</phrase>
<phrase>
id: LANG_SYSFONT_RECORDING_AGC_PRESET
- desc: automatic gain control in recording screen
+ desc: deprecated
<source>
*: none
- agc: "AGC"
+ agc: ""
</source>
<dest>
*: none
- agc: "AGC"
+ agc: ""
</dest>
<voice>
*: none
- agc: "AGC"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_AGC_SAFETY
- desc: AGC preset
+ desc: deprecated
<source>
*: none
- agc: "Safety (clip)"
+ agc: ""
</source>
<dest>
*: none
- agc: "Safety (clip)"
+ agc: ""
</dest>
<voice>
*: none
- agc: "Safety (clip)"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_AGC_LIVE
- desc: AGC preset
+ desc: deprecated
<source>
*: none
- agc: "Live (slow)"
+ agc: ""
</source>
<dest>
*: none
- agc: "Live (slow)"
+ agc: ""
</dest>
<voice>
*: none
- agc: "Live (slow)"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_AGC_DJSET
- desc: AGC preset
+ desc: deprecated
<source>
*: none
- agc: "DJ-Set (slow)"
+ agc: ""
</source>
<dest>
*: none
- agc: "DJ-Set (slow)"
+ agc: ""
</dest>
<voice>
*: none
- agc: "DJ set (slow)"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_AGC_MEDIUM
- desc: AGC preset
+ desc: deprecated
<source>
*: none
- agc: "Medium"
+ agc: ""
</source>
<dest>
*: none
- agc: "Medium"
+ agc: ""
</dest>
<voice>
*: none
- agc: "Medium"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_AGC_VOICE
- desc: AGC preset
+ desc: deprecated
<source>
*: none
- agc: "Voice (fast)"
+ agc: ""
</source>
<dest>
*: none
- agc: "Voice (fast)"
+ agc: ""
</dest>
<voice>
*: none
- agc: "Voice (fast)"
+ agc: ""
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
- desc: AGC maximum gain in recording screen
+ desc: deprecated
<source>
*: none
- agc: "AGC max. gain"
+ agc: ""
</source>
<dest>
*: none
- agc: "AGC max. gain"
+ agc: ""
</dest>
<voice>
*: none
- agc: "AGC maximum gain"
+ agc: ""
</voice>
</phrase>
<phrase>
@@ -11162,15 +11159,15 @@
</phrase>
<phrase>
id: LANG_SYSFONT_PM_CLIPCOUNT
- desc: in recording GUI, for recording peak meter. MAX 5 characters!
+ desc: deprecated
user:
<source>
*: none
- recording: "CLIP:"
+ recording: ""
</source>
<dest>
*: none
- recording: "CLIP:"
+ recording: ""
</dest>
<voice>
*: none
@@ -11857,3 +11854,153 @@
*: "slash"
</voice>
</phrase>
+<phrase>
+ id: LANG_GAIN_LEFT
+ desc: in the recording screen
+ user:
+ <source>
+ *: none
+ recording: "Gain L"
+ </source>
+ <dest>
+ *: none
+ recording: "Gain L"
+ </dest>
+ <voice>
+ *: none
+ recording: "Gain Left"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_GAIN_RIGHT
+ desc: in the recording screen
+ user:
+ <source>
+ *: none
+ recording: "Gain R"
+ </source>
+ <dest>
+ *: none
+ recording: "Gain R"
+ </dest>
+ <voice>
+ *: none
+ recording: "Gain Right"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_AGC_PRESET
+ desc: automatic gain control in record settings and screen
+ <source>
+ *: none
+ agc: "AGC"
+ </source>
+ <dest>
+ *: none
+ agc: "AGC"
+ </dest>
+ <voice>
+ *: none
+ agc: "Automatic gain control"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_AGC_CLIPTIME
+ desc: in record settings
+ <source>
+ *: none
+ agc: "AGC clip time"
+ </source>
+ <dest>
+ *: none
+ agc: "AGC clip time"
+ </dest>
+ <voice>
+ *: none
+ agc: "AGC clip time"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_AGC_MAXGAIN
+ desc: AGC maximum gain in recording screen
+ <source>
+ *: none
+ agc: "AGC max. gain"
+ </source>
+ <dest>
+ *: none
+ agc: "AGC max. gain"
+ </dest>
+ <voice>
+ *: none
+ agc: "AGC maximum gain"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_FILENAME
+ desc: Filename header in recording screen
+ user:
+ <source>
+ *: none
+ recording: "Filename:"
+ </source>
+ <dest>
+ *: none
+ recording: "Filename:"
+ </dest>
+ <voice>
+ *: none
+ recording: ""
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_PM_CLIPCOUNT
+ desc: in recording GUI, for recording peak meter. MAX 5 characters!
+ user:
+ <source>
+ *: none
+ recording: "CLIP:"
+ </source>
+ <dest>
+ *: none
+ recording: "CLIP:"
+ </dest>
+ <voice>
+ *: none
+ recording: ""
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_TIMESPLIT_REC
+ desc: Display of record timer interval setting, on the record screen
+ user:
+ <source>
+ *: none
+ recording: "Split Time:"
+ </source>
+ <dest>
+ *: none
+ recording: "Split Time:"
+ </dest>
+ <voice>
+ *: none
+ recording: ""
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RECORDING_SIZE
+ desc: Display of recorded file size
+ user:
+ <source>
+ *: none
+ recording: "Size:"
+ </source>
+ <dest>
+ *: none
+ recording: "Size:"
+ </dest>
+ <voice>
+ *: none
+ recording: ""
+ </voice>
+</phrase>
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index b3b33b7f52..277f8d93b7 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -344,11 +344,11 @@ static int agc_preset_func(void)
{ STR(LANG_AGC_VOICE) },
};
if (global_settings.rec_source)
- return set_option(str(LANG_RECORD_AGC_PRESET),
+ return set_option(str(LANG_RECORDING_AGC_PRESET),
&global_settings.rec_agc_preset_line,
INT, names, 6, NULL );
else
- return set_option(str(LANG_RECORD_AGC_PRESET),
+ return set_option(str(LANG_RECORDING_AGC_PRESET),
&global_settings.rec_agc_preset_mic,
INT, names, 6, NULL );
}
@@ -362,13 +362,13 @@ static int agc_cliptime_func(void)
{ "800ms", TALK_ID(800, UNIT_MS) },
{ "1s", TALK_ID(1, UNIT_SEC) }
};
- return set_option(str(LANG_RECORD_AGC_CLIPTIME),
+ return set_option(str(LANG_RECORDING_AGC_CLIPTIME),
&global_settings.rec_agc_cliptime,
INT, names, 5, NULL );
}
-MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORD_AGC_PRESET),
+MENUITEM_FUNCTION(agc_preset, 0, ID2P(LANG_RECORDING_AGC_PRESET),
agc_preset_func, NULL, NULL, Icon_Menu_setting);
-MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORD_AGC_CLIPTIME),
+MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME),
agc_cliptime_func, NULL, NULL, Icon_Menu_setting);
#endif /* HAVE_AGC */
@@ -441,12 +441,14 @@ int rectrigger(void)
int i, action = ACTION_REDRAW;
bool done = false, changed = true;
const struct settings_list *settings[TRIG_OPTION_COUNT];
-
+
+ int pm_x[NB_SCREENS];
int pm_y[NB_SCREENS];
+ int pm_h[NB_SCREENS];
int trig_xpos[NB_SCREENS];
int trig_ypos[NB_SCREENS];
int trig_width[NB_SCREENS];
-
+
int old_start_thres_db = global_settings.rec_start_thres_db;
int old_start_thres_linear = global_settings.rec_start_thres_linear;
int old_start_duration = global_settings.rec_start_duration;
@@ -466,7 +468,9 @@ int rectrigger(void)
vp[i].height -= SYSFONT_HEIGHT*2;
trig_xpos[i] = 0;
trig_ypos[i] = vp[i].y + vp[i].height;
+ pm_x[i] = 0;
pm_y[i] = screens[i].getheight() - SYSFONT_HEIGHT;
+ pm_h[i] = SYSFONT_HEIGHT;
trig_width[i] = screens[i].getwidth();
}
/* TODO: what to do if there is < 4 lines on the screen? */
@@ -518,8 +522,8 @@ int rectrigger(void)
}
peak_meter_draw_trig(trig_xpos, trig_ypos, trig_width, NB_SCREENS);
- action = peak_meter_draw_get_btn(CONTEXT_SETTINGS_RECTRIGGER, 0, pm_y,
- SYSFONT_HEIGHT, NB_SCREENS);
+ action = peak_meter_draw_get_btn(CONTEXT_SETTINGS_RECTRIGGER,
+ pm_x, pm_y, pm_h, NB_SCREENS);
FOR_NB_SCREENS(i)
screens[i].update();
i = gui_synclist_get_sel_pos(&lists);
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index fc7c9bc5f5..ce0974a084 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -47,7 +47,7 @@
#if CONFIG_CODEC == SWCODEC
#include "pcm.h"
-#ifdef HAVE_RECORDING
+#ifdef HAVE_RECORDING
#include "pcm_record.h"
#endif
@@ -265,7 +265,7 @@ int calc_db (int isample)
}
}
}
-
+
return n + (m * (long)(isample - istart)) / 100L;
}
@@ -319,13 +319,13 @@ int peak_meter_db2sample(int db)
/* range check: db value to big */
if (max_peak_db + db < 0) {
retval = 0;
- }
-
+ }
+
/* range check: db value too small */
else if (max_peak_db + db >= max_peak_db) {
retval = MAX_PEAK -1;
- }
-
+ }
+
/* value in range: find the matching linear value */
else {
retval = db_to_sample_bin_search(0, MAX_PEAK, max_peak_db + db);
@@ -359,7 +359,7 @@ static void peak_meter_set_min(int newmin)
}
pm_range = peak_meter_range_max - peak_meter_range_min;
-
+
/* Avoid division by zero. */
if (pm_range == 0) {
pm_range = 1;
@@ -586,10 +586,10 @@ void peak_meter_peek(void)
#if CONFIG_CODEC == SWCODEC
if (pm_playback)
pcm_calculate_peaks(&pm_cur_left, &pm_cur_right);
-#ifdef HAVE_RECORDING
+#ifdef HAVE_RECORDING
else
pcm_calculate_rec_peaks(&pm_cur_left, &pm_cur_right);
-#endif
+#endif
left = pm_cur_left;
right = pm_cur_right;
#else
@@ -812,7 +812,7 @@ static int peak_meter_read_l(void)
/* reset pm_max_left so that subsequent calls of peak_meter_peek don't
get fooled by an old maximum value */
pm_max_left = pm_cur_left;
-
+
#if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC)
srand(current_tick);
retval = rand()%MAX_PEAK;
@@ -1328,8 +1328,8 @@ void peak_meter_draw_trig(int xpos[], int ypos[],
}
#endif
-int peak_meter_draw_get_btn(int action_context, int x, int y[],
- int height, int nb_screens)
+int peak_meter_draw_get_btn(int action_context, int x[], int y[],
+ int height[], int nb_screens)
{
int button = BUTTON_NONE;
long next_refresh = current_tick;
@@ -1362,10 +1362,10 @@ int peak_meter_draw_get_btn(int action_context, int x, int y[],
if (TIME_AFTER(current_tick, next_refresh)) {
for(i = 0; i < nb_screens; i++)
{
- peak_meter_screen(&screens[i], x, y[i], height);
- screens[i].update_viewport_rect(x, y[i],
- screens[i].getwidth() - x,
- height);
+ peak_meter_screen(&screens[i], x[i], y[i], height[i]);
+ screens[i].update_viewport_rect(x[i], y[i],
+ screens[i].getwidth() - x[i],
+ height[i]);
}
next_refresh += HZ / PEAK_METER_FPS;
dopeek = true;
@@ -1430,3 +1430,4 @@ bool peak_meter_histogram(void)
}
#endif
+
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h
index 7fbb14973a..8d3e92939f 100644
--- a/apps/recorder/peakmeter.h
+++ b/apps/recorder/peakmeter.h
@@ -35,8 +35,8 @@ extern void pm_activate_clipcount(bool active);
extern bool peak_meter_enabled;
extern void peak_meter_playback(bool playback);
-extern int peak_meter_draw_get_btn(int action_context, int x, int y[],
- int height, int nb_screens);
+extern int peak_meter_draw_get_btn(int action_context, int x[], int y[],
+ int height[], int nb_screens);
extern void peak_meter_set_clip_hold(int time);
extern void peak_meter_peek(void);
extern void peak_meter_init_range( bool dbfs, int range_min, int range_max);
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index d9ef6812e1..7dfa16cb93 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -71,6 +71,7 @@
#include "radio.h"
#include "sound_menu.h"
#include "viewport.h"
+#include "list.h"
#ifdef HAVE_RECORDING
/* This array holds the record timer interval lengths, in seconds */
@@ -164,8 +165,6 @@ bool in_recording_screen(void)
return (rec_status & RCSTAT_IN_RECSCREEN) != 0;
}
-#define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1)
-
#if CONFIG_KEYPAD == RECORDER_PAD
static bool f2_rec_screen(void);
static bool f3_rec_screen(void);
@@ -180,6 +179,11 @@ static int screen_update = NB_SCREENS;
static bool remote_display_on = true;
#endif
+/* as we have the ability to disable the remote, we need an alternative loop */
+#define FOR_NB_ACTIVE_SCREENS(i) for(i = 0; i < screen_update; i++)
+
+static bool update_list = false; /* (GIU) list needs updating */
+
/** File name creation **/
#if CONFIG_RTC == 0
/* current file number to assist in creating unique numbered filenames
@@ -279,6 +283,7 @@ static void set_gain(void)
}
/* reset the clipping indicators */
peak_meter_set_clip_hold(global_settings.peak_meter_clip_hold);
+ update_list = true;
}
#ifdef HAVE_AGC
@@ -541,51 +546,6 @@ static char *fmt_gain(int snd, int val, char *str, int len)
return str;
}
-static int cursor;
-
-static void adjust_cursor(void)
-{
- int max_cursor;
-
- if(cursor < 0)
- cursor = 0;
-
-#ifdef HAVE_AGC
- switch(global_settings.rec_source)
- {
- case REC_SRC_MIC:
- if(cursor == 2)
- cursor = 4;
- else if(cursor == 3)
- cursor = 1;
- HAVE_LINE_REC_(case AUDIO_SRC_LINEIN:)
- HAVE_FMRADIO_REC_(case AUDIO_SRC_FMRADIO:)
- max_cursor = 5;
- break;
- default:
- max_cursor = 0;
- break;
- }
-#else /* !HAVE_AGC */
- switch(global_settings.rec_source)
- {
- case AUDIO_SRC_MIC:
- max_cursor = 1;
- break;
- HAVE_LINE_REC_(case AUDIO_SRC_LINEIN:)
- HAVE_FMRADIO_REC_(case AUDIO_SRC_FMRADIO:)
- max_cursor = 3;
- break;
- default:
- max_cursor = 0;
- break;
- }
-#endif /* HAVE_AGC */
-
- if(cursor > max_cursor)
- cursor = max_cursor;
-}
-
/* the list below must match enum audio_sources in audio.h */
static const char* const prestr[] =
{
@@ -744,6 +704,7 @@ void rec_command(enum recording_command cmd)
audio_resume_recording();
break;
}
+ update_list = true;
}
/* used in trigger_listerner and recording_screen */
@@ -807,7 +768,7 @@ static void trigger_listener(int trigger_status)
/* tell recording_screen to reset the time */
last_seconds = 0;
break;
-
+
case 3: /* Stop and shutdown */
rec_command(RECORDING_CMD_STOP_SHUTDOWN);
break;
@@ -823,25 +784,176 @@ static void trigger_listener(int trigger_status)
}
}
+/* Stuff for drawing the screen */
+
+enum rec_list_items_stereo {
+ ITEM_VOLUME = 0,
+ ITEM_GAIN = 1,
+ ITEM_GAIN_L = 2,
+ ITEM_GAIN_R = 3,
+#ifdef HAVE_AGC
+ ITEM_AGC_MODE = 4,
+ ITEM_AGC_MAXDB = 5,
+ ITEM_FILENAME = 6,
+ ITEM_COUNT = 7,
+#else
+ ITEM_FILENAME = 4,
+ ITEM_COUNT = 5,
+#endif
+};
+
+enum rec_list_items_mono {
+ ITEM_VOLUME_M = 0,
+ ITEM_GAIN_M = 1,
+#ifdef HAVE_AGC
+ ITEM_AGC_MODE_M = 4,
+ ITEM_AGC_MAXDB_M = 5,
+ ITEM_FILENAME_M = 6,
+ ITEM_COUNT_M = 5,
+#else
+ ITEM_FILENAME_M = 4,
+ ITEM_COUNT_M = 3,
+#endif
+};
+
+static int listid_to_enum[ITEM_COUNT];
+
+static char * reclist_get_name(int selected_item, void * data,
+ char * buffer, size_t buffer_len)
+{
+ char buf2[32];
+#ifdef HAVE_AGC
+ char buf3[32];
+#endif
+ data = data; /* not used */
+ if(selected_item >= ITEM_COUNT)
+ return "";
+
+ switch (listid_to_enum[selected_item])
+ {
+ case ITEM_VOLUME:
+ snprintf(buffer, buffer_len, "%s: %s", str(LANG_VOLUME),
+ fmt_gain(SOUND_VOLUME,
+ global_settings.volume,
+ buf2, sizeof(buf2)));
+ break;
+ case ITEM_GAIN:
+ if(global_settings.rec_source == AUDIO_SRC_MIC)
+ {
+ /* Draw MIC recording gain */
+ snprintf(buffer, buffer_len, "%s: %s", str(LANG_GAIN),
+ fmt_gain(SOUND_MIC_GAIN,
+ global_settings.rec_mic_gain,
+ buf2, sizeof(buf2)));
+ }
+ else
+ {
+ int avg_gain = (global_settings.rec_left_gain +
+ global_settings.rec_right_gain) / 2;
+ snprintf(buffer, buffer_len, "%s: %s", str(LANG_GAIN),
+ fmt_gain(SOUND_LEFT_GAIN,
+ avg_gain,
+ buf2, sizeof(buf2)));
+ }
+ break;
+ case ITEM_GAIN_L:
+ snprintf(buffer, buffer_len, "%s: %s",
+ str(LANG_GAIN_LEFT),
+ fmt_gain(SOUND_LEFT_GAIN,
+ global_settings.rec_left_gain,
+ buf2, sizeof(buf2)));
+ break;
+ case ITEM_GAIN_R:
+ snprintf(buffer, buffer_len, "%s: %s",
+ str(LANG_GAIN_RIGHT),
+ fmt_gain(SOUND_RIGHT_GAIN,
+ global_settings.rec_right_gain,
+ buf2, sizeof(buf2)));
+ break;
+#ifdef HAVE_AGC
+ case ITEM_AGC_MODE:
+ snprintf(buffer, buffer_len, "%s: %s",
+ str(LANG_RECORDING_AGC_PRESET),
+ agc_preset_str[agc_preset]);
+ break;
+ case ITEM_AGC_MAXDB:
+ if (agc_preset == 0)
+ snprintf(buffer, buffer_len, "%s: %s",
+ str(LANG_RECORDING_AGC_MAXGAIN),
+ fmt_gain(SOUND_LEFT_GAIN,
+ agc_maxgain, buf2, sizeof(buf2)));
+ else if (global_settings.rec_source == AUDIO_SRC_MIC)
+ snprintf(buffer, buffer_len, "%s: %s (%s)",
+ str(LANG_RECORDING_AGC_MAXGAIN),
+ fmt_gain(SOUND_MIC_GAIN,
+ agc_maxgain, buf2, sizeof(buf2)),
+ fmt_gain(SOUND_MIC_GAIN,
+ agc_maxgain - global_settings.rec_mic_gain,
+ buf3, sizeof(buf3)));
+ else
+ snprintf(buffer, buffer_len, "%s: %s (%s)",
+ str(LANG_RECORDING_AGC_MAXGAIN),
+ fmt_gain(SOUND_LEFT_GAIN,
+ agc_maxgain, buf2, sizeof(buf2)),
+ fmt_gain(SOUND_LEFT_GAIN,
+ agc_maxgain -
+ (global_settings.rec_left_gain +
+ global_settings.rec_right_gain)/2,
+ buf3, sizeof(buf3)));
+ break;
+#endif
+ case ITEM_FILENAME:
+ {
+ if(audio_status() & AUDIO_STATUS_RECORD)
+ {
+ size_t tot_len = strlen(path_buffer) +
+ strlen(str(LANG_RECORDING_FILENAME)) + 1;
+ if(tot_len > buffer_len)
+ {
+ snprintf(buffer, buffer_len, "%s %s",
+ str(LANG_RECORDING_FILENAME),
+ path_buffer + tot_len - buffer_len);
+ }
+ else
+ {
+ snprintf(buffer, buffer_len, "%s %s",
+ str(LANG_RECORDING_FILENAME), path_buffer);
+ }
+ }
+ else
+ {
+ strncpy(buffer, str(LANG_RECORDING_FILENAME), buffer_len);
+ }
+ break;
+ }
+ default:
+ return "";
+ }
+ return buffer;
+}
+
+
bool recording_start_automatic = false;
bool recording_screen(bool no_source)
{
- long button;
- bool done = false;
- char buf[32];
- char buf2[32];
- int w, h;
- int update_countdown = 1;
+ int button;
+ int done = -1; /* negative to re-init, positive to quit, zero to run */
+ char buf[32]; /* for preparing strings */
+ char buf2[32]; /* for preparing strings */
+ int w, h; /* character width/height */
+ int update_countdown = 1; /* refresh counter */
unsigned int seconds;
int hours, minutes;
- char filename[13];
- int last_audio_stat = -1;
- int audio_stat;
+ int audio_stat = 0; /* status of the audio system */
+ int last_audio_stat = -1; /* previous status so we can act on changes */
+ struct viewport vp_list[NB_SCREENS], vp_top[NB_SCREENS]; /* the viewports */
+
#if CONFIG_CODEC == SWCODEC
int warning_counter = 0;
#define WARNING_PERIOD 7
#endif
+
#ifdef HAVE_FMRADIO_REC
/* Radio is left on if:
* 1) Is was on at the start and the initial source is FM Radio
@@ -859,18 +971,24 @@ bool recording_screen(bool no_source)
bool peak_valid = false;
int peak_l, peak_r;
int balance = 0;
- bool display_agc[NB_SCREENS];
#endif
- int line[NB_SCREENS];
int i;
- int filename_offset[NB_SCREENS];
- int pm_y[NB_SCREENS];
- int trig_xpos[NB_SCREENS];
- int trig_ypos[NB_SCREENS];
- int trig_width[NB_SCREENS];
- /* pm_x = offset pm to put clipcount in front.
- Use lcd_getstringsize() when not using SYSFONT */
- int pm_x = global_settings.peak_meter_clipcounter ? 30 : 0;
+ int pm_x[NB_SCREENS]; /* peakmeter (and trigger bar) x pos */
+ int pm_y[NB_SCREENS]; /* peakmeter y pos */
+ int pm_h[NB_SCREENS]; /* peakmeter height */
+ int trig_ypos[NB_SCREENS]; /* trigger bar y pos */
+ int trig_width[NB_SCREENS]; /* trigger bar width */
+ struct gui_synclist lists; /* the list in the bottom vp */
+#ifdef HAVE_FMRADIO_REC
+ int prev_rec_source = global_settings.rec_source; /* detect source change */
+#endif
+
+#if CONFIG_TUNER
+ bool statusbar = global_settings.statusbar;
+ global_status.statusbar_forced = statusbar?0:1;
+ global_settings.statusbar = true;
+ gui_syncstatusbar_draw(&statusbars,true);
+#endif
static const unsigned char *byte_units[] = {
ID2P(LANG_BYTE),
@@ -879,29 +997,9 @@ bool recording_screen(bool no_source)
ID2P(LANG_GIGABYTE)
};
- int base_style = STYLE_INVERT;
- int style;
- struct viewport vp[NB_SCREENS];
- int ymargin = global_settings.cursor_style?0:10;
-#ifdef HAVE_LCD_COLOR
- if (global_settings.cursor_style == 2) {
- base_style |= STYLE_COLORBAR;
- }
- else if (global_settings.cursor_style == 3) {
- base_style |= STYLE_GRADIENT;
- }
-#endif
-
struct audio_recording_options rec_options;
rec_status = RCSTAT_IN_RECSCREEN;
- if (rec_create_directory() < 0)
- {
- rec_status = 0;
- return false;
- }
-
- cursor = 0;
#if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR)
ata_set_led_enabled(false);
#endif
@@ -917,68 +1015,166 @@ bool recording_screen(bool no_source)
peak_meter_playback(true);
#endif
- audio_init_recording(0);
- sound_set_volume(global_settings.volume);
-
#ifdef HAVE_AGC
peak_meter_get_peakhold(&peak_l, &peak_r);
#endif
- rec_init_recording_options(&rec_options);
- rec_set_recording_options(&rec_options);
-
- set_gain();
-
-#if CONFIG_RTC == 0
- /* Create new filename for recording start */
- rec_init_filename();
-#endif
-
pm_reset_clipcount();
pm_activate_clipcount(false);
settings_apply_trigger();
#ifdef HAVE_AGC
- agc_preset_str[0] = str(LANG_SYSFONT_OFF);
- agc_preset_str[1] = str(LANG_SYSFONT_AGC_SAFETY);
- agc_preset_str[2] = str(LANG_SYSFONT_AGC_LIVE);
- agc_preset_str[3] = str(LANG_SYSFONT_AGC_DJSET);
- agc_preset_str[4] = str(LANG_SYSFONT_AGC_MEDIUM);
- agc_preset_str[5] = str(LANG_SYSFONT_AGC_VOICE);
- if (global_settings.rec_source == AUDIO_SRC_MIC) {
- agc_preset = global_settings.rec_agc_preset_mic;
- agc_maxgain = global_settings.rec_agc_maxgain_mic;
- }
- else {
- agc_preset = global_settings.rec_agc_preset_line;
- agc_maxgain = global_settings.rec_agc_maxgain_line;
- }
+ agc_preset_str[0] = str(LANG_OFF);
+ agc_preset_str[1] = str(LANG_AGC_SAFETY);
+ agc_preset_str[2] = str(LANG_AGC_LIVE);
+ agc_preset_str[3] = str(LANG_AGC_DJSET);
+ agc_preset_str[4] = str(LANG_AGC_MEDIUM);
+ agc_preset_str[5] = str(LANG_AGC_VOICE);
#endif /* HAVE_AGC */
+#if CONFIG_CODEC == SWCODEC
+ audio_close_recording();
+#endif
+ audio_init_recording(0);
+ sound_set_volume(global_settings.volume);
+
+#if CONFIG_RTC == 0
+ /* Create new filename for recording start */
+ rec_init_filename();
+#endif
+
+ /* viewport init and calculations that only needs to be done once */
FOR_NB_SCREENS(i)
{
- viewport_set_defaults(&vp[i], i);
- vp[i].font = FONT_SYSFIXED;
- screens[i].set_viewport(&vp[i]);
- screens[i].getstringsize("M", &w, &h);
- filename_offset[i] = ((vp[i].height >= 7*h) ? 1 : 0);
- pm_y[i] = h * (2 + filename_offset[i]);
+ struct viewport *v;
+ /* top vp, 4 lines, force sys font if total screen < 6 lines
+ NOTE: one could limit the list to 1 line and get away with 5 lines */
+ v = &vp_top[i];
+ viewport_set_defaults(v, i); /*already takes care of statusbar*/
+ if (viewport_get_nb_lines(v) < (4+2)) /*top=4,list=2*/
+ v->font = FONT_SYSFIXED;
+ v->height = (font_get(v->font)->height)*4;
+
+ /* list section, rest of the screen */
+ v = &vp_list[i];
+ viewport_set_defaults(v, i);
+ v->font = vp_top[i].font;
+ v->y = vp_top[i].y + vp_top[i].height;
+ v->height = screens[i].lcdheight - v->y; /* the rest */
+ screens[i].set_viewport(&vp_top[i]); /* req for next calls */
+
+ screens[i].getstringsize("W", &w, &h);
+ pm_y[i] = font_get(vp_top[i].font)->height * 2;
+ trig_ypos[i] = font_get(vp_top[i].font)->height * 3;
}
-#ifdef HAVE_REMOTE_LCD
- if (!remote_display_on)
+ /* init the bottom list */
+ gui_synclist_init(&lists, reclist_get_name, NULL, false, 1, vp_list);
+ gui_synclist_set_title(&lists, NULL, Icon_NOICON);
+
+ /* start of the loop: we stay in this loop until user quits recscreen */
+ while(done <= 0)
{
- screens[1].clear_display();
- snprintf(buf, sizeof(buf), str(LANG_REMOTE_LCD_ON));
- screens[1].puts((vp[1].width/w - strlen(buf))/2 + 1,
- vp[1].height/(h*2) + 1, buf);
- screens[1].update();
- gui_syncsplash(0, str(LANG_REMOTE_LCD_OFF));
- }
+ if(done < 0)
+ {
+ /* request to re-init stuff, done after settings screen */
+ done = 0;
+#ifdef HAVE_FMRADIO_REC
+ /* If input changes away from FM Radio,
+ radio will remain off when recording screen closes. */
+ if (global_settings.rec_source != prev_rec_source
+ && prev_rec_source == AUDIO_SRC_FMRADIO)
+ radio_status = FMRADIO_OFF;
+ prev_rec_source = global_settings.rec_source;
#endif
- while(!done)
- {
+ FOR_NB_SCREENS(i)
+ {
+ pm_x[i] = 0;
+ if(global_settings.peak_meter_clipcounter)
+ {
+ int clipwidth = 0;
+ screens[i].getstringsize(str(LANG_PM_CLIPCOUNT),
+ &clipwidth, &h); /* h is same */
+ pm_x[i] = clipwidth+1;
+ }
+ if(global_settings.rec_trigger_mode == TRIG_MODE_OFF)
+ pm_h[i] = font_get(vp_top[i].font)->height * 2;
+ else
+ pm_h[i] = font_get(vp_top[i].font)->height;
+ trig_width[i] = vp_top[i].width - pm_x[i];
+ screens[i].clear_display();
+ screens[i].update();
+ }
+
+#if CONFIG_CODEC == SWCODEC
+ audio_close_recording();
+ audio_init_recording(0);
+#endif
+
+ rec_init_recording_options(&rec_options);
+ rec_set_recording_options(&rec_options);
+
+ if(rec_create_directory() < 0)
+ {
+ rec_status = 0;
+ goto rec_abort;
+ }
+
+#if CONFIG_CODEC == SWCODEC && CONFIG_RTC == 0
+ /* If format changed, a new number is required */
+ rec_init_filename();
+#endif
+
+#ifdef HAVE_AGC
+ if (global_settings.rec_source == AUDIO_SRC_MIC) {
+ agc_preset = global_settings.rec_agc_preset_mic;
+ agc_maxgain = global_settings.rec_agc_maxgain_mic;
+ }
+ else {
+ agc_preset = global_settings.rec_agc_preset_line;
+ agc_maxgain = global_settings.rec_agc_maxgain_line;
+ }
+#endif
+
+ set_gain();
+ update_countdown = 1; /* Update immediately */
+
+ /* populate translation table for list id -> enum */
+ if(global_settings.rec_source == AUDIO_SRC_MIC)
+ {
+ listid_to_enum[0] = ITEM_VOLUME_M;
+ listid_to_enum[1] = ITEM_GAIN_M;
+#ifdef HAVE_AGC
+ listid_to_enum[2] = ITEM_AGC_MODE_M;
+ listid_to_enum[3] = ITEM_AGC_MAXDB_M;
+ listid_to_enum[4] = ITEM_FILENAME_M;
+#else
+ listid_to_enum[2] = ITEM_FILENAME_M;
+#endif
+ }
+ else
+ {
+ listid_to_enum[0] = ITEM_VOLUME;
+ listid_to_enum[1] = ITEM_GAIN;
+ listid_to_enum[2] = ITEM_GAIN_L;
+ listid_to_enum[3] = ITEM_GAIN_R;
+#ifdef HAVE_AGC
+ listid_to_enum[4] = ITEM_AGC_MODE;
+ listid_to_enum[5] = ITEM_AGC_MAXDB;
+ listid_to_enum[6] = ITEM_FILENAME;
+#else
+ listid_to_enum[4] = ITEM_FILENAME;
+#endif
+ }
+
+ if(global_settings.rec_source == AUDIO_SRC_MIC)
+ gui_synclist_set_nb_items(&lists, ITEM_COUNT_M); /* mono */
+ else
+ gui_synclist_set_nb_items(&lists, ITEM_COUNT); /* stereo */
+ gui_synclist_draw(&lists);
+ } /* if(done < 0) */
+
audio_stat = audio_status();
#if (CONFIG_LED == LED_REAL)
@@ -1028,9 +1224,13 @@ bool recording_screen(bool no_source)
}
#endif /* CONFIG_LED */
+ /* first set current vp - stays like this for drawing that follows */
+ FOR_NB_SCREENS(i)
+ screens[i].set_viewport(&vp_top[i]);
+
/* Wait for a button a while (HZ/10) drawing the peak meter */
button = peak_meter_draw_get_btn(CONTEXT_RECSCREEN,
- pm_x, pm_y, h * PM_HEIGHT,
+ pm_x, pm_y, pm_h,
screen_update);
if (last_audio_stat != audio_stat)
@@ -1040,9 +1240,9 @@ bool recording_screen(bool no_source)
rec_status |= RCSTAT_HAVE_RECORDED;
}
last_audio_stat = audio_stat;
+ update_list = true;
}
-
if (recording_start_automatic)
{
/* simulate a button press */
@@ -1050,133 +1250,29 @@ bool recording_screen(bool no_source)
recording_start_automatic = false;
}
- switch(button)
- {
-#ifdef HAVE_REMOTE_LCD
- case ACTION_REC_LCD:
- if (remote_display_on)
- {
- remote_display_on = false;
- screen_update = 1;
- screens[1].clear_display();
- snprintf(buf, sizeof(buf), str(LANG_REMOTE_LCD_ON));
- screens[1].puts((screens[1].getwidth()/w - strlen(buf))/2 +
- 1,
- screens[1].getheight()/(h*2) + 1, buf);
- screens[1].update();
- gui_syncsplash(0, str(LANG_REMOTE_LCD_OFF));
- }
- else
- {
- remote_display_on = true;
- screen_update = NB_SCREENS;
- }
- break;
-#endif
- case ACTION_STD_CANCEL:
- /* turn off the trigger */
- peak_meter_trigger(false);
- peak_meter_set_trigger_listener(NULL);
+ /* let list handle the button */
+ gui_synclist_do_button(&lists, &button, LIST_WRAP_UNLESS_HELD);
- if(audio_stat & AUDIO_STATUS_RECORD)
- {
- rec_command(RECORDING_CMD_STOP);
- }
- else
- {
-#if CONFIG_CODEC != SWCODEC
- peak_meter_playback(true);
- peak_meter_enabled = false;
-#endif
- done = true;
- }
- update_countdown = 1; /* Update immediately */
- break;
-
- case ACTION_REC_PAUSE:
- case ACTION_REC_NEWFILE:
- /* Only act if the mpeg is stopped */
- if(!(audio_stat & AUDIO_STATUS_RECORD))
- {
- /* is this manual or triggered recording? */
- if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) ||
- (peak_meter_trigger_status() != TRIG_OFF))
- {
- /* manual recording */
- rec_status |= RCSTAT_HAVE_RECORDED;
- rec_command(RECORDING_CMD_START);
- last_seconds = 0;
- if (global_settings.talk_menu)
- {
- /* no voice possible here, but a beep */
- audio_beep(HZ/2); /* longer beep on start */
- }
- }
- /* this is triggered recording */
- else
- {
- /* we don't start recording now, but enable the
- trigger and let the callback function
- trigger_listener control when the recording starts */
- peak_meter_trigger(true);
- peak_meter_set_trigger_listener(&trigger_listener);
- }
- }
- else
- {
- /*if new file button pressed, start new file */
- if (button == ACTION_REC_NEWFILE)
- {
- rec_command(RECORDING_CMD_START_NEWFILE);
- last_seconds = 0;
- }
- else
- /* if pause button pressed, pause or resume */
- {
- if(audio_stat & AUDIO_STATUS_PAUSE)
- {
- rec_command(RECORDING_CMD_RESUME);
- if (global_settings.talk_menu)
- {
- /* no voice possible here, but a beep */
- audio_beep(HZ/4); /* short beep on resume */
- }
- }
- else
- {
- rec_command(RECORDING_CMD_PAUSE);
- }
- }
- }
- update_countdown = 1; /* Update immediately */
- break;
-
- case ACTION_STD_PREV:
- cursor--;
- adjust_cursor();
- update_countdown = 1; /* Update immediately */
- break;
-
- case ACTION_STD_NEXT:
- cursor++;
- adjust_cursor();
- update_countdown = 1; /* Update immediately */
- break;
+ /* list code changes active viewport - change it back */
+ FOR_NB_SCREENS(i)
+ screens[i].set_viewport(&vp_top[i]);
+ switch(button)
+ {
case ACTION_SETTINGS_INC:
case ACTION_SETTINGS_INCREPEAT:
- switch(cursor)
+ switch (listid_to_enum[gui_synclist_get_sel_pos(&lists)])
{
- case 0:
+ case ITEM_VOLUME:
global_settings.volume++;
setvol();
break;
- case 1:
+ case ITEM_GAIN:
if(global_settings.rec_source == AUDIO_SRC_MIC)
{
if(global_settings.rec_mic_gain <
sound_max(SOUND_MIC_GAIN))
- global_settings.rec_mic_gain++;
+ global_settings.rec_mic_gain++;
}
else
{
@@ -1188,18 +1284,18 @@ bool recording_screen(bool no_source)
global_settings.rec_right_gain++;
}
break;
- case 2:
+ case ITEM_GAIN_L:
if(global_settings.rec_left_gain <
sound_max(SOUND_LEFT_GAIN))
global_settings.rec_left_gain++;
break;
- case 3:
+ case ITEM_GAIN_R:
if(global_settings.rec_right_gain <
sound_max(SOUND_RIGHT_GAIN))
global_settings.rec_right_gain++;
break;
#ifdef HAVE_AGC
- case 4:
+ case ITEM_AGC_MODE:
agc_preset = MIN(agc_preset + 1, AGC_MODE_SIZE);
agc_enable = (agc_preset != 0);
if (global_settings.rec_source == AUDIO_SRC_MIC) {
@@ -1210,7 +1306,7 @@ bool recording_screen(bool no_source)
agc_maxgain = global_settings.rec_agc_maxgain_line;
}
break;
- case 5:
+ case ITEM_AGC_MAXDB:
if (global_settings.rec_source == AUDIO_SRC_MIC)
{
agc_maxgain = MIN(agc_maxgain + 1,
@@ -1229,16 +1325,15 @@ bool recording_screen(bool no_source)
set_gain();
update_countdown = 1; /* Update immediately */
break;
-
case ACTION_SETTINGS_DEC:
case ACTION_SETTINGS_DECREPEAT:
- switch(cursor)
+ switch (listid_to_enum[gui_synclist_get_sel_pos(&lists)])
{
- case 0:
+ case ITEM_VOLUME:
global_settings.volume--;
setvol();
break;
- case 1:
+ case ITEM_GAIN:
if(global_settings.rec_source == AUDIO_SRC_MIC)
{
if(global_settings.rec_mic_gain >
@@ -1255,18 +1350,18 @@ bool recording_screen(bool no_source)
global_settings.rec_right_gain--;
}
break;
- case 2:
+ case ITEM_GAIN_L:
if(global_settings.rec_left_gain >
sound_min(SOUND_LEFT_GAIN))
global_settings.rec_left_gain--;
break;
- case 3:
+ case ITEM_GAIN_R:
if(global_settings.rec_right_gain >
sound_min(SOUND_RIGHT_GAIN))
global_settings.rec_right_gain--;
break;
#ifdef HAVE_AGC
- case 4:
+ case ITEM_AGC_MODE:
agc_preset = MAX(agc_preset - 1, 0);
agc_enable = (agc_preset != 0);
if (global_settings.rec_source == AUDIO_SRC_MIC) {
@@ -1277,7 +1372,7 @@ bool recording_screen(bool no_source)
agc_maxgain = global_settings.rec_agc_maxgain_line;
}
break;
- case 5:
+ case ITEM_AGC_MAXDB:
if (global_settings.rec_source == AUDIO_SRC_MIC)
{
agc_maxgain = MAX(agc_maxgain - 1,
@@ -1296,25 +1391,123 @@ bool recording_screen(bool no_source)
set_gain();
update_countdown = 1; /* Update immediately */
break;
+ case ACTION_STD_CANCEL:
+ /* turn off the trigger */
+ peak_meter_trigger(false);
+ peak_meter_set_trigger_listener(NULL);
+ if(audio_stat & AUDIO_STATUS_RECORD)
+ {
+ rec_command(RECORDING_CMD_STOP);
+ }
+ else
+ {
+#if CONFIG_CODEC != SWCODEC
+ peak_meter_playback(true);
+ peak_meter_enabled = false;
+#endif
+ done = 1;
+ }
+ update_countdown = 1; /* Update immediately */
+ break;
+#ifdef HAVE_REMOTE_LCD
+ case ACTION_REC_LCD:
+ /* this feature exists for some h1x0/h3x0 targets that suffer
+ from noise caused by remote LCD updates
+ NOTE 1: this will leave the list on the remote
+ NOTE 2: to be replaced by a global LCD_off() routine */
+ if(remote_display_on)
+ {
+ /* switch to single screen and put up a splash on the main.
+ On the remote we put a two line message */
+ screen_update = 1;
+ screens[1].clear_viewport();
+ screens[1].puts(0, 0, str(LANG_REMOTE_LCD_OFF));
+ screens[1].puts(0, 1, str(LANG_REMOTE_LCD_ON));
+ screens[1].update_viewport();
+ gui_splash(&screens[0], 0, str(LANG_REMOTE_LCD_OFF));
+ }
+ else
+ {
+ /* remote switched on again */
+ update_list = true;
+ screen_update = NB_SCREENS;
+ }
+ remote_display_on = !remote_display_on; /* toggle */
+ update_countdown = 1; /* Update immediately */
+ break;
+#endif
+ case ACTION_REC_PAUSE:
+ case ACTION_REC_NEWFILE:
+ /* Only act if the mpeg is stopped */
+ if(!(audio_stat & AUDIO_STATUS_RECORD))
+ {
+ /* is this manual or triggered recording? */
+ if ((global_settings.rec_trigger_mode == TRIG_MODE_OFF) ||
+ (peak_meter_trigger_status() != TRIG_OFF))
+ {
+ /* manual recording */
+ rec_status |= RCSTAT_HAVE_RECORDED;
+ rec_command(RECORDING_CMD_START);
+ last_seconds = 0;
+ if (global_settings.talk_menu)
+ {
+ /* no voice possible here, but a beep */
+ audio_beep(HZ/2); /* longer beep on start */
+ }
+ }
+ /* this is triggered recording */
+ else
+ {
+ /* we don't start recording now, but enable the
+ trigger and let the callback function
+ trigger_listener control when the recording starts */
+ peak_meter_trigger(true);
+ peak_meter_set_trigger_listener(&trigger_listener);
+ }
+ }
+ else
+ {
+ /*if new file button pressed, start new file */
+ if (button == ACTION_REC_NEWFILE)
+ {
+ rec_command(RECORDING_CMD_START_NEWFILE);
+ last_seconds = 0;
+ }
+ else
+ /* if pause button pressed, pause or resume */
+ {
+ if(audio_stat & AUDIO_STATUS_PAUSE)
+ {
+ rec_command(RECORDING_CMD_RESUME);
+ if (global_settings.talk_menu)
+ {
+ /* no voice possible here, but a beep */
+ audio_beep(HZ/4); /* short beep on resume */
+ }
+ }
+ else
+ {
+ rec_command(RECORDING_CMD_PAUSE);
+ }
+ }
+ }
+ update_countdown = 1; /* Update immediately */
+ break;
case ACTION_STD_MENU:
#if CONFIG_CODEC == SWCODEC
if(!(audio_stat & AUDIO_STATUS_RECORD))
#else
- if(audio_stat != AUDIO_STATUS_RECORD)
+ if(audio_stat != AUDIO_STATUS_RECORD)
#endif
{
-#ifdef HAVE_FMRADIO_REC
- const int prev_rec_source = global_settings.rec_source;
-#endif
-
#if (CONFIG_LED == LED_REAL)
/* led is restored at begin of loop / end of function */
led(false);
#endif
if (recording_menu(no_source))
{
- done = true;
+ done = 1;
rec_status |= RCSTAT_BEEN_IN_USB_MODE;
#ifdef HAVE_FMRADIO_REC
radio_status = FMRADIO_OFF;
@@ -1322,53 +1515,8 @@ bool recording_screen(bool no_source)
}
else
{
-#ifdef HAVE_FMRADIO_REC
- /* If input changes away from FM Radio, radio will
- remain off when recording screen closes. */
- if (global_settings.rec_source != prev_rec_source
- && prev_rec_source == AUDIO_SRC_FMRADIO)
- radio_status = FMRADIO_OFF;
-#endif
-
-#if CONFIG_CODEC == SWCODEC
- /* reinit after submenu exit */
- audio_close_recording();
- audio_init_recording(0);
-#endif
-
- rec_init_recording_options(&rec_options);
- rec_set_recording_options(&rec_options);
-
- if(rec_create_directory() < 0)
- {
- goto rec_abort;
- }
-
-#if CONFIG_CODEC == SWCODEC && CONFIG_RTC == 0
- /* If format changed, a new number is required */
- rec_init_filename();
-#endif
-
-#ifdef HAVE_AGC
- if (global_settings.rec_source == AUDIO_SRC_MIC) {
- agc_preset = global_settings.rec_agc_preset_mic;
- agc_maxgain = global_settings.rec_agc_maxgain_mic;
- }
- else {
- agc_preset = global_settings.rec_agc_preset_line;
- agc_maxgain = global_settings.rec_agc_maxgain_line;
- }
-#endif
-
- adjust_cursor();
- set_gain();
- update_countdown = 1; /* Update immediately */
-
- FOR_NB_SCREENS(i)
- {
- screens[i].set_viewport(&vp[i]);
- screens[i].setfont(FONT_SYSFIXED);
- }
+ done = -1;
+ /* the init is now done at the beginning of the loop */
}
}
break;
@@ -1418,6 +1566,8 @@ bool recording_screen(bool no_source)
/* Only accept USB connection when not recording */
if(!(audio_stat & AUDIO_STATUS_RECORD))
{
+ FOR_NB_SCREENS(i)
+ screens[i].set_viewport(NULL);
default_event_handler(SYS_USB_CONNECTED);
done = true;
rec_status |= RCSTAT_BEEN_IN_USB_MODE;
@@ -1426,11 +1576,7 @@ bool recording_screen(bool no_source)
#endif
}
break;
-
- default:
- default_event_handler(button);
- break;
- } /* end switch */
+ } /*switch(button)*/
#ifdef HAVE_AGC
peak_read = !peak_read;
@@ -1444,17 +1590,17 @@ bool recording_screen(bool no_source)
auto_gain_control(&peak_l, &peak_r, &balance);
#endif
- FOR_NB_SCREENS(i)
- screens[i].setfont(FONT_SYSFIXED);
-
seconds = audio_recorded_time() / HZ;
- update_countdown--;
- if(update_countdown == 0 || seconds > last_seconds)
+ /* start of vp_top drawing */
+ if(update_countdown-- == 0 || seconds > last_seconds)
{
unsigned int dseconds, dhours, dminutes;
unsigned long num_recorded_bytes, dsize, dmb;
- int pos = 0;
+
+ /* we assume vp_top is the current viewport! */
+ FOR_NB_ACTIVE_SCREENS(i)
+ screens[i].clear_viewport();
update_countdown = 5;
last_seconds = seconds;
@@ -1463,17 +1609,6 @@ bool recording_screen(bool no_source)
dsize = rec_sizesplit_bytes();
num_recorded_bytes = audio_num_recorded_bytes();
- for(i = 0; i < screen_update; i++)
- screens[i].clear_display();
-
- style = base_style;
-
-#ifdef HAVE_LCD_COLOR
- /* special action for gradient - set default for 1 line gradient */
- if(global_settings.cursor_style == 3)
- style = base_style | CURLN_PACK(0) | NUMLN_PACK(1);
-#endif /* HAVE_LCD_COLOR */
-
#if CONFIG_CODEC == SWCODEC
if ((audio_stat & AUDIO_STATUS_WARNING)
&& (warning_counter++ % WARNING_PERIOD) < WARNING_PERIOD/2)
@@ -1493,40 +1628,39 @@ bool recording_screen(bool no_source)
{
dmb = dsize/1024/1024;
snprintf(buf, sizeof(buf), "%s %dMB",
- str(LANG_SYSFONT_SPLIT_SIZE), dmb);
+ str(LANG_SPLIT_SIZE), dmb);
}
else
{
hours = seconds / 3600;
minutes = (seconds - (hours * 3600)) / 60;
snprintf(buf, sizeof(buf), "%s %02d:%02d:%02d",
- str(LANG_SYSFONT_RECORDING_TIME),
- hours, minutes, seconds%60);
+ str(LANG_RECORDING_TIME),
+ hours, minutes, seconds%60);
}
- for(i = 0; i < screen_update; i++)
+ FOR_NB_ACTIVE_SCREENS(i)
screens[i].puts(0, 0, buf);
if(audio_stat & AUDIO_STATUS_PRERECORD)
{
snprintf(buf, sizeof(buf), "%s...",
- str(LANG_SYSFONT_RECORD_PRERECORD));
+ str(LANG_RECORD_PRERECORD));
}
else
{
/* Display the split interval if the record timesplit
is active */
if ((global_settings.rec_timesplit) &&
- !(global_settings.rec_split_method))
+ !(global_settings.rec_split_method))
{
/* Display the record timesplit interval rather
- than the file size if the record timer is
- active */
+ than the file size if the record timer is active */
dhours = dseconds / 3600;
dminutes = (dseconds - (dhours * 3600)) / 60;
snprintf(buf, sizeof(buf), "%s %02d:%02d",
- str(LANG_SYSFONT_RECORD_TIMESPLIT_REC),
- dhours, dminutes);
+ str(LANG_RECORDING_TIMESPLIT_REC),
+ dhours, dminutes);
}
else
{
@@ -1534,42 +1668,25 @@ bool recording_screen(bool no_source)
num_recorded_bytes,
byte_units, true);
snprintf(buf, sizeof(buf), "%s %s",
- str(LANG_SYSFONT_RECORDING_SIZE), buf2);
+ str(LANG_RECORDING_SIZE), buf2);
}
}
- for(i = 0; i < screen_update; i++)
- screens[i].puts(0, 1, buf);
- for(i = 0; i < screen_update; i++)
- {
- if (filename_offset[i] > 0)
- {
- *filename = '\0';
- if (audio_stat & AUDIO_STATUS_RECORD)
- {
- strncpy(filename, path_buffer +
- strlen(path_buffer) - 12, 13);
- filename[12]='\0';
- }
-
- snprintf(buf, sizeof(buf), "%s %s",
- str(LANG_SYSFONT_RECORDING_FILENAME), filename);
- screens[i].puts(0, 2, buf);
- }
- }
+ FOR_NB_ACTIVE_SCREENS(i)
+ screens[i].puts(0, 1, buf);
/* We will do file splitting regardless, either at the end of
- a split interval, or when the filesize approaches the 2GB
- FAT file size (compatibility) limit. */
+ a split interval, or when the filesize approaches the 2GB
+ FAT file size (compatibility) limit. */
if ((audio_stat && !(global_settings.rec_split_method)
&& global_settings.rec_timesplit && (seconds >= dseconds))
- || (audio_stat && global_settings.rec_split_method
+ || (audio_stat && global_settings.rec_split_method
&& global_settings.rec_sizesplit
&& (num_recorded_bytes >= dsize))
- || (num_recorded_bytes >= MAX_FILE_SIZE))
+ || (num_recorded_bytes >= MAX_FILE_SIZE))
{
if (!(global_settings.rec_split_type)
- || (num_recorded_bytes >= MAX_FILE_SIZE))
+ || (num_recorded_bytes >= MAX_FILE_SIZE))
{
rec_command(RECORDING_CMD_START_NEWFILE);
last_seconds = 0;
@@ -1591,214 +1708,28 @@ bool recording_screen(bool no_source)
{
char clpstr[32];
snprintf(clpstr, 32, "%4d", pm_get_clipcount());
- for(i = 0; i < screen_update; i++)
- {
- if(PM_HEIGHT > 1)
- screens[i].puts(0, 2 + filename_offset[i],
- str(LANG_SYSFONT_PM_CLIPCOUNT));
- screens[i].puts(0, 1 + PM_HEIGHT + filename_offset[i],
- clpstr);
- }
- }
-
- snprintf(buf, sizeof(buf), "%s: %s", str(LANG_SYSFONT_VOLUME),
- fmt_gain(SOUND_VOLUME,
- global_settings.volume,
- buf2, sizeof(buf2)));
-
- if (global_settings.cursor_style && (pos++ == cursor))
- {
- for(i = 0; i < screen_update; i++)
- screens[i].puts_style_offset(0, filename_offset[i] +
- PM_HEIGHT + 2, buf, style,0);
- }
- else
- {
- for(i = 0; i < screen_update; i++)
- screens[i].putsxy(ymargin,
- SYSFONT_HEIGHT*(filename_offset[i]+
- PM_HEIGHT + 2), buf);
- }
-
- if(global_settings.rec_source == AUDIO_SRC_MIC)
- {
- /* Draw MIC recording gain */
- snprintf(buf, sizeof(buf), "%s:%s", str(LANG_SYSFONT_GAIN),
- fmt_gain(SOUND_MIC_GAIN,
- global_settings.rec_mic_gain,
- buf2, sizeof(buf2)));
- if(global_settings.cursor_style && ((1==cursor)||(2==cursor)))
- {
- for(i = 0; i < screen_update; i++)
- screens[i].puts_style_offset(0, filename_offset[i] +
- PM_HEIGHT + 3, buf, style,0);
- }
- else
- {
- for(i = 0; i < screen_update; i++)
- screens[i].putsxy(ymargin,
- SYSFONT_HEIGHT*(filename_offset[i] +
- PM_HEIGHT + 3), buf);
- }
- }
- else if(0
- HAVE_LINE_REC_( || global_settings.rec_source ==
- AUDIO_SRC_LINEIN)
- HAVE_FMRADIO_REC_( || global_settings.rec_source ==
- AUDIO_SRC_FMRADIO)
- )
- {
- /* Draw LINE or FMRADIO recording gain */
- snprintf(buf, sizeof(buf), "%s:%s",
- str(LANG_SYSFONT_RECORDING_LEFT),
- fmt_gain(SOUND_LEFT_GAIN,
- global_settings.rec_left_gain,
- buf2, sizeof(buf2)));
-#ifdef HAVE_LCD_COLOR
- /* special action for gradient - double line gradient - line1 */
- if((global_settings.cursor_style == 3) &&
- (1==cursor))
- style = base_style | CURLN_PACK(0) | NUMLN_PACK(2);
-#endif /* HAVE_LCD_COLOR */
- if(global_settings.cursor_style && ((1==cursor)||(2==cursor)))
- {
- for(i = 0; i < screen_update; i++)
- screens[i].puts_style_offset(0, filename_offset[i] +
- PM_HEIGHT + 3, buf, style,0);
- }
- else
- {
- for(i = 0; i < screen_update; i++)
- screens[i].putsxy(ymargin,
- SYSFONT_HEIGHT*(filename_offset[i] +
- PM_HEIGHT + 3), buf);
- }
-
- snprintf(buf, sizeof(buf), "%s:%s",
- str(LANG_SYSFONT_RECORDING_RIGHT),
- fmt_gain(SOUND_RIGHT_GAIN,
- global_settings.rec_right_gain,
- buf2, sizeof(buf2)));
-#ifdef HAVE_LCD_COLOR
- /* special action for gradient - double line gradient - line2 */
- if((global_settings.cursor_style == 3) &&
- (1==cursor))
- style = base_style | CURLN_PACK(1) | NUMLN_PACK(2);
-#endif /* HAVE_LCD_COLOR */
- if(global_settings.cursor_style && ((1==cursor)||(3==cursor)))
- {
- for(i = 0; i < screen_update; i++)
- screens[i].puts_style_offset(0, filename_offset[i] +
- PM_HEIGHT + 4, buf, style,0);
- }
- else
+ FOR_NB_ACTIVE_SCREENS(i)
{
- for(i = 0; i < screen_update; i++)
- screens[i].putsxy(ymargin,
- SYSFONT_HEIGHT*(filename_offset[i] +
- PM_HEIGHT + 4), buf);
+ screens[i].puts(0, 2,str(LANG_PM_CLIPCOUNT));
+ screens[i].puts(0, 3, clpstr);
}
}
-#ifdef HAVE_LCD_COLOR
- /* special action for gradient - back to single line gradient */
- if(global_settings.cursor_style == 3)
- style = base_style | CURLN_PACK(0) | NUMLN_PACK(1);
-#endif /* HAVE_LCD_COLOR */
- FOR_NB_SCREENS(i)
- {
- switch (global_settings.rec_source)
- {
- HAVE_LINE_REC_(case AUDIO_SRC_LINEIN:)
- HAVE_FMRADIO_REC_(case AUDIO_SRC_FMRADIO:)
- line[i] = 5;
- break;
-
- case AUDIO_SRC_MIC:
- line[i] = 4;
- break;
-#ifdef HAVE_SPDIF_REC
- case AUDIO_SRC_SPDIF:
- line[i] = 3;
- break;
-#endif
- default:
- line[i] = 5; /* to prevent uninitialisation
- warnings for line[0] */
- break;
- } /* end switch */
#ifdef HAVE_AGC
- if (vp[i].height < h * (2 + filename_offset[i] +
- PM_HEIGHT + line[i]))
- {
- line[i] -= 1;
- display_agc[i] = false;
- }
- else
- display_agc[i] = true;
-
- if ((cursor==4) || (cursor==5))
- display_agc[i] = true;
- }
-
- /************** AGC test info ******************
- snprintf(buf, sizeof(buf), "D:%d U:%d",
- (agc_droptime+2)/5, (agc_risetime+2)/5);
- lcd_putsxy(1, LCD_HEIGHT - 8, buf);
- snprintf(buf, sizeof(buf), "B:%d",
- (agc_baltime+2)/5);
- lcd_putsxy(LCD_WIDTH/2 + 3, LCD_HEIGHT - 8, buf);
- ***********************************************/
-
- if (cursor == 5)
- snprintf(buf, sizeof(buf), "%s: %s",
- str(LANG_SYSFONT_RECORDING_AGC_MAXGAIN),
- fmt_gain(SOUND_LEFT_GAIN,
- agc_maxgain, buf2, sizeof(buf2)));
- else if (agc_preset == 0)
- snprintf(buf, sizeof(buf), "%s: %s",
- str(LANG_SYSFONT_RECORDING_AGC_PRESET),
- agc_preset_str[agc_preset]);
- else if (global_settings.rec_source == AUDIO_SRC_MIC)
- snprintf(buf, sizeof(buf), "%s: %s%s",
- str(LANG_SYSFONT_RECORDING_AGC_PRESET),
- agc_preset_str[agc_preset],
- fmt_gain(SOUND_LEFT_GAIN,
- agc_maxgain -
- global_settings.rec_mic_gain,
- buf2, sizeof(buf2)));
- else
- snprintf(buf, sizeof(buf), "%s: %s%s",
- str(LANG_SYSFONT_RECORDING_AGC_PRESET),
- agc_preset_str[agc_preset],
- fmt_gain(SOUND_LEFT_GAIN,
- agc_maxgain -
- (global_settings.rec_left_gain +
- global_settings.rec_right_gain)/2,
- buf2, sizeof(buf2)));
+ hist_time++;
+#endif
- if(global_settings.cursor_style && ((cursor==4) || (cursor==5)))
- {
- for(i = 0; i < screen_update; i++)
- screens[i].puts_style_offset(0, filename_offset[i] +
- PM_HEIGHT + line[i], buf, style,0);
- }
- else if (global_settings.rec_source == AUDIO_SRC_MIC
- HAVE_LINE_REC_(|| global_settings.rec_source ==
- AUDIO_SRC_LINEIN)
- HAVE_FMRADIO_REC_(|| global_settings.rec_source ==
- AUDIO_SRC_FMRADIO)
- )
+ /* draw the trigger status */
+ if (peak_meter_trigger_status() != TRIG_OFF)
{
- for(i = 0; i < screen_update; i++) {
- if (display_agc[i]) {
- screens[i].putsxy(ymargin,
- SYSFONT_HEIGHT*(filename_offset[i] +
- PM_HEIGHT + line[i]), buf);
- }
- }
+ peak_meter_draw_trig(pm_x, trig_ypos, trig_width,
+ screen_update);
+ FOR_NB_ACTIVE_SCREENS(i)
+ screens[i].update_viewport_rect(pm_x[i], trig_ypos[i],
+ trig_width[i] + 2, TRIG_HEIGHT);
}
+#ifdef HAVE_AGC
if (global_settings.rec_source == AUDIO_SRC_MIC)
{
if(agc_maxgain < (global_settings.rec_mic_gain))
@@ -1811,98 +1742,25 @@ bool recording_screen(bool no_source)
if(agc_maxgain < (global_settings.rec_right_gain))
change_recording_gain(false, false, true);
}
-#else /* !HAVE_AGC */
- }
#endif /* HAVE_AGC */
- if(!global_settings.cursor_style) {
- switch(cursor)
- {
- case 1:
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + 3, true);
-
- if(global_settings.rec_source != AUDIO_SRC_MIC)
- {
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + 4, true);
- }
- break;
- case 2:
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + 3, true);
- break;
- case 3:
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + 4, true);
- break;
-#ifdef HAVE_AGC
- case 4:
- case 5:
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + line[i], true);
- break;
-#endif /* HAVE_AGC */
- default:
- for(i = 0; i < screen_update; i++)
- screen_put_cursorxy(&screens[i], 0,
- filename_offset[i] +
- PM_HEIGHT + 2, true);
- }
+ if(update_list)
+ {
+ /* update_list is set whenever content changes */
+ update_list = false;
+ gui_synclist_draw(&lists);
}
-#ifdef HAVE_AGC
- hist_time++;
-#endif
-
- for(i = 0; i < screen_update; i++)
+ /* draw peakmeter again (check if this can be removed) */
+ FOR_NB_ACTIVE_SCREENS(i)
{
screens[i].set_viewport(NULL);
gui_statusbar_draw(&(statusbars.statusbars[i]), true);
- screens[i].set_viewport(&vp[i]);
- peak_meter_screen(&screens[i], pm_x, pm_y[i], h*PM_HEIGHT);
+ screens[i].set_viewport(&vp_top[i]);
+ peak_meter_screen(&screens[i], pm_x[i], pm_y[i], pm_h[i]);
screens[i].update();
}
-
- /* draw the trigger status */
- FOR_NB_SCREENS(i)
- {
- /* NOTE: UGLY width setting based on height! To be fixed! */
- trig_width[i] = ((vp[i].height < 64) ||
- ((vp[i].height < 72) && (PM_HEIGHT > 1))) ?
- screens[i].getwidth() - 14 * w :
- screens[i].getwidth();
- trig_xpos[i] = screens[i].getwidth() - trig_width[i];
- trig_ypos[i] = ((vp[i].height < 72) && (PM_HEIGHT > 1)) ?
- h*2 :
- h*(1 + filename_offset[i] + PM_HEIGHT +
- line[i]
-#ifdef HAVE_AGC
- + 1
-#endif
- );
- }
-
- if (peak_meter_trigger_status() != TRIG_OFF)
- {
- peak_meter_draw_trig(trig_xpos, trig_ypos, trig_width,
- screen_update);
- for(i = 0; i < screen_update; i++){
- screens[i].update_rect(trig_xpos[i], trig_ypos[i],
- trig_width[i] + 2, TRIG_HEIGHT);
- }
- }
- }
+ } /* display update every second */
if(audio_stat & AUDIO_STATUS_ERROR)
{
@@ -1913,7 +1771,7 @@ bool recording_screen(bool no_source)
audio_stat = audio_status();
if (audio_stat & AUDIO_STATUS_ERROR)
{
- gui_syncsplash(0, str(LANG_SYSFONT_DISK_FULL));
+ gui_syncsplash(0, str(LANG_DISK_FULL));
gui_syncstatusbar_draw(&statusbars, true);
FOR_NB_SCREENS(i)
@@ -1977,6 +1835,11 @@ rec_abort:
ata_set_led_enabled(true);
#endif
+#if CONFIG_TUNER
+ global_settings.statusbar = statusbar;
+ global_status.statusbar_forced = 0;
+#endif
+
settings_save();
return (rec_status & RCSTAT_BEEN_IN_USB_MODE) != 0;
@@ -2056,10 +1919,10 @@ static bool f2_rec_screen(void)
{
screens[i].getstringsize(str(LANG_SYSFONT_CHANNELS), &w, &h);
screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2,
- str(LANG_SYSFONT_CHANNELS));
+ str(LANG_SYSFONT_CHANNELS));
screens[i].getstringsize(str(LANG_SYSFONT_MODE), &w, &h);
screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h,
- str(LANG_SYSFONT_MODE));
+ str(LANG_SYSFONT_MODE));
screens[i].getstringsize(ptr, &w, &h);
screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr);
screens[i].mono_bitmap(bitmap_icons_7x8[Icon_FastForward],
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 48ebd9e63d..477d0138b1 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -899,11 +899,11 @@ const struct settings_list settings[] = {
#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),
+ LANG_GAIN_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,
+ {F_T_INT|F_RECSETTING,&global_settings.rec_right_gain,LANG_GAIN_RIGHT,
INT(DEFAULT_REC_RIGHT_GAIN),
"rec right gain",NULL,UNUSED},
#endif /* DEFAULT_REC_RIGHT_GAIN */
@@ -1180,16 +1180,16 @@ const struct settings_list settings[] = {
#endif
#ifdef HAVE_AGC
- {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1),
- "agc mic preset",NULL,UNUSED},
- {F_T_INT,&global_settings.rec_agc_preset_line,LANG_RECORD_AGC_PRESET,INT(1),
- "agc line preset",NULL,UNUSED},
+ {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORDING_AGC_PRESET,
+ INT(1),"agc mic preset",NULL,UNUSED},
+ {F_T_INT,&global_settings.rec_agc_preset_line,LANG_RECORDING_AGC_PRESET,
+ INT(1),"agc line preset",NULL,UNUSED},
{F_T_INT,&global_settings.rec_agc_maxgain_mic,-1,INT(104),
"agc maximum mic gain",NULL,UNUSED},
{F_T_INT,&global_settings.rec_agc_maxgain_line,-1,INT(96),
"agc maximum line gain",NULL,UNUSED},
- {F_T_INT,&global_settings.rec_agc_cliptime,LANG_RECORD_AGC_CLIPTIME,INT(1),
- "agc cliptime","0.2s,0.4s,0.6s,0.8,1s",UNUSED},
+ {F_T_INT,&global_settings.rec_agc_cliptime,LANG_RECORDING_AGC_CLIPTIME,
+ INT(1),"agc cliptime","0.2s,0.4s,0.6s,0.8,1s",UNUSED},
#endif
#ifdef HAVE_REMOTE_LCD