diff options
author | William Wilgus <me.theuser@yahoo.com> | 2018-12-17 22:27:55 -0600 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2018-12-22 12:27:21 -0600 |
commit | a06d9c85f7475d650cc451fb0f537623c0206f5a (patch) | |
tree | 952a0e7265e836328873a5e2f6eb0ca8ec3cc06a /apps/recorder/recording.c | |
parent | b3356e3aff34a4ab94778e7f6a8db43f9135296c (diff) | |
download | rockbox-a06d9c85f7475d650cc451fb0f537623c0206f5a.tar.gz rockbox-a06d9c85f7475d650cc451fb0f537623c0206f5a.zip |
Auto-Ranging Time Formatting For Menus (hh:mm:ss:mss)
Unifies time formatting in settings_list.c allows time format to
display as HH:MM:SS.MSS or any consecutive combination thereof
(hh:mm:ss, mm:ss, mm:ss.mss, ss.mss, hh, mm, ss ,mss)
works in INT and TABLE settings with the addition of flag 'F_TIME_SETTING'
Time is auto-ranged dependent on value
Adds talk_time_intervals to allow time values to be spoken similar to
display format: x Hours, x Minutes, x Seconds, x Milliseconds
Table lookups merged or removed from recording, clip meter and lcd timeout
-String_Choice replaced with TABLE_SETTING or INT_SETTING for these
functions as well, cleaned-up cfg_vals that get saved to cfgfile
RTL Languages ARE supported
Negative values ARE supported
Backlight on/off are now Always and Never to share formatter with LCD
Timeout
Added flag to allow ranged units to be locked to a minimum index
Added flag to allow leading zero to be supressed from the largest unit
merged talk_time_unit() and talk_time_intervals()
optimized time_split()
optimized format_time_auto()
Backlight time-out list same as original
Change-Id: I59027c62d3f2956bd16fdcc1a48b2ac32c084abd
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r-- | apps/recorder/recording.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index d47773071f..0098fea007 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -78,34 +78,6 @@ | |||
78 | #include "appevents.h" | 78 | #include "appevents.h" |
79 | 79 | ||
80 | #ifdef HAVE_RECORDING | 80 | #ifdef HAVE_RECORDING |
81 | /* This array holds the record timer interval lengths, in minutes */ | ||
82 | static const unsigned short rec_timer_minutes[] = | ||
83 | { | ||
84 | 0, /* 0 means OFF */ | ||
85 | 5, /* 00:05 */ | ||
86 | 10, /* 00:10 */ | ||
87 | 15, /* 00:15 */ | ||
88 | 30, /* 00:30 */ | ||
89 | 60, /* 01:00 */ | ||
90 | 74, /* 01:14 */ | ||
91 | 80, /* 01:20 */ | ||
92 | 2*60, /* 02:00 */ | ||
93 | 4*60, /* 04:00 */ | ||
94 | 6*60, /* 06:00 */ | ||
95 | 8*60, /* 08:00 */ | ||
96 | 10*60, /* 10:00 */ | ||
97 | 12*60, /* 12:00 */ | ||
98 | 18*60, /* 18:00 */ | ||
99 | 24*60 /* 24:00 */ | ||
100 | }; | ||
101 | |||
102 | static unsigned int rec_timesplit_seconds(void) | ||
103 | { | ||
104 | unsigned long tm_min = rec_timer_minutes[global_settings.rec_timesplit]; | ||
105 | unsigned long tm_sec = tm_min * 60; | ||
106 | return tm_sec; | ||
107 | } | ||
108 | |||
109 | /* This array holds the record size interval lengths, in mebibytes */ | 81 | /* This array holds the record size interval lengths, in mebibytes */ |
110 | static const unsigned short rec_size_mbytes[] = | 82 | static const unsigned short rec_size_mbytes[] = |
111 | { | 83 | { |
@@ -1003,8 +975,8 @@ bool recording_screen(bool no_source) | |||
1003 | int audio_stat = 0; /* status of the audio system */ | 975 | int audio_stat = 0; /* status of the audio system */ |
1004 | int last_audio_stat = -1; /* previous status so we can act on changes */ | 976 | int last_audio_stat = -1; /* previous status so we can act on changes */ |
1005 | struct viewport vp_list[NB_SCREENS], vp_top[NB_SCREENS]; /* the viewports */ | 977 | struct viewport vp_list[NB_SCREENS], vp_top[NB_SCREENS]; /* the viewports */ |
1006 | const long split_seconds = rec_timesplit_seconds(); | 978 | const unsigned long split_seconds = (unsigned) global_settings.rec_timesplit; |
1007 | const long split_bytes = rec_sizesplit_bytes(); | 979 | const unsigned long split_bytes = rec_sizesplit_bytes(); |
1008 | 980 | ||
1009 | #if CONFIG_CODEC == SWCODEC | 981 | #if CONFIG_CODEC == SWCODEC |
1010 | int warning_counter = 0; | 982 | int warning_counter = 0; |