devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code police

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15889 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2007-12-07 00:28:16 +00:00
parent a007b558b3
commit 327d78eb6e
1 changed files with 79 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

36
apps/recorder/recording.c
View file

@ -1020,7 +1020,8 @@ bool recording_screen(bool no_source)
#endif /* CONFIG_LED */ #endif /* CONFIG_LED */
/* Wait for a button a while (HZ/10) drawing the peak meter */ /* Wait for a button a while (HZ/10) drawing the peak meter */
button = peak_meter_draw_get_btn(pm_x, pm_y, h * PM_HEIGHT, screen_update); button = peak_meter_draw_get_btn(pm_x, pm_y, h * PM_HEIGHT,
screen_update);
if (last_audio_stat != audio_stat) if (last_audio_stat != audio_stat)
{ {
@ -1477,7 +1478,8 @@ bool recording_screen(bool no_source)
} }
else else
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
if ((global_settings.rec_sizesplit) && (global_settings.rec_split_method)) if ((global_settings.rec_sizesplit) &&
(global_settings.rec_split_method))
{ {
dmb = dsize/1024/1024; dmb = dsize/1024/1024;
snprintf(buf, sizeof(buf), "%s %dMB", snprintf(buf, sizeof(buf), "%s %dMB",
@ -1497,13 +1499,15 @@ bool recording_screen(bool no_source)
if(audio_stat & AUDIO_STATUS_PRERECORD) if(audio_stat & AUDIO_STATUS_PRERECORD)
{ {
snprintf(buf, sizeof(buf), "%s...", str(LANG_SYSFONT_RECORD_PRERECORD)); snprintf(buf, sizeof(buf), "%s...",
str(LANG_SYSFONT_RECORD_PRERECORD));
} }
else else
{ {
/* Display the split interval if the record timesplit /* Display the split interval if the record timesplit
is active */ is active */
if ((global_settings.rec_timesplit) && !(global_settings.rec_split_method)) if ((global_settings.rec_timesplit) &&
!(global_settings.rec_split_method))
{ {
/* Display the record timesplit interval rather /* Display the record timesplit interval rather
than the file size if the record timer is than the file size if the record timer is
@ -1550,7 +1554,8 @@ bool recording_screen(bool no_source)
if ((audio_stat && !(global_settings.rec_split_method) if ((audio_stat && !(global_settings.rec_split_method)
&& global_settings.rec_timesplit && (seconds >= dseconds)) && 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)) && 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) if (!(global_settings.rec_split_type)
@ -1621,8 +1626,10 @@ bool recording_screen(bool no_source)
} }
} }
else if(0 else if(0
HAVE_LINE_REC_( || global_settings.rec_source == AUDIO_SRC_LINEIN) HAVE_LINE_REC_( || global_settings.rec_source ==
HAVE_FMRADIO_REC_( || global_settings.rec_source == AUDIO_SRC_FMRADIO) AUDIO_SRC_LINEIN)
HAVE_FMRADIO_REC_( || global_settings.rec_source ==
AUDIO_SRC_FMRADIO)
) )
{ {
/* Draw LINE or FMRADIO recording gain */ /* Draw LINE or FMRADIO recording gain */
@ -1703,7 +1710,8 @@ bool recording_screen(bool no_source)
break; break;
} /* end switch */ } /* end switch */
#ifdef HAVE_AGC #ifdef HAVE_AGC
if (screens[i].height < h * (2 + filename_offset[i] + PM_HEIGHT + line[i])) if (screens[i].height < h * (2 + filename_offset[i] +
PM_HEIGHT + line[i]))
{ {
line[i] -= 1; line[i] -= 1;
display_agc[i] = false; display_agc[i] = false;
@ -1757,10 +1765,11 @@ bool recording_screen(bool no_source)
screens[i].puts_style_offset(0, filename_offset[i] + screens[i].puts_style_offset(0, filename_offset[i] +
PM_HEIGHT + line[i], buf, style,0); PM_HEIGHT + line[i], buf, style,0);
} }
else if ( else if (global_settings.rec_source == AUDIO_SRC_MIC
global_settings.rec_source == AUDIO_SRC_MIC HAVE_LINE_REC_(|| global_settings.rec_source ==
HAVE_LINE_REC_(|| global_settings.rec_source == AUDIO_SRC_LINEIN) AUDIO_SRC_LINEIN)
HAVE_FMRADIO_REC_(|| global_settings.rec_source == AUDIO_SRC_FMRADIO) HAVE_FMRADIO_REC_(|| global_settings.rec_source ==
AUDIO_SRC_FMRADIO)
) )
{ {
for(i = 0; i < screen_update; i++) { for(i = 0; i < screen_update; i++) {
@ -1853,7 +1862,8 @@ bool recording_screen(bool no_source)
trig_xpos[i] = screens[i].width - trig_width[i]; trig_xpos[i] = screens[i].width - trig_width[i];
trig_ypos[i] = ((screens[i].height < 72) && (PM_HEIGHT > 1)) ? trig_ypos[i] = ((screens[i].height < 72) && (PM_HEIGHT > 1)) ?
h*2 : h*2 :
h*(1 + filename_offset[i] + PM_HEIGHT + line[i] h*(1 + filename_offset[i] + PM_HEIGHT +
line[i]
#ifdef HAVE_AGC #ifdef HAVE_AGC
+ 1 + 1
#endif #endif