From 5e1e05f6162677caf408e5256f64d70ec4433433 Mon Sep 17 00:00:00 2001 From: Mustapha Senhaji Date: Fri, 24 Dec 2010 03:31:40 +0000 Subject: [PATCH] Add "file size" to the track information screen of WPS. Reuse "LANG_FILE_SIZE" from recording settings, with now a unified "LANG_FILESIZE" string. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28886 a1c6a512-1295-4272-9138-f99709370657 --- apps/lang/english.lang | 22 ++++++++++++++++++---- apps/screens.c | 5 +++++ apps/settings_list.c | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/apps/lang/english.lang b/apps/lang/english.lang index fb92cfb02c..a7b86ab25e 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -5960,19 +5960,19 @@ id: LANG_REC_SIZE - desc: in record timesplit options + desc: deprecated user: core *: none - recording: "Filesize" + recording: "" *: none - recording: "Filesize" + recording: "" *: none - recording: "Filesize" + recording: "" @@ -12674,3 +12674,17 @@ radio: "Signal strength:" + + id: LANG_FILESIZE + desc: in record timesplit options and in track information viewer + user: core + + *: "Filesize" + + + *: "Filesize" + + + *: "Filesize" + + diff --git a/apps/screens.c b/apps/screens.c index c053a1756c..81472e6cc7 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -629,6 +629,7 @@ static const int id3_headers[]= LANG_ID3_TRACK_GAIN, LANG_ID3_ALBUM_GAIN, #endif + LANG_FILESIZE, LANG_ID3_PATH, }; @@ -739,6 +740,10 @@ static const char* id3_get_info(int selected_item, void* data, case LANG_ID3_COMPOSER: val=id3->composer; break; + case LANG_FILESIZE: /* not LANG_ID3_FILESIZE because the string is shared */ + output_dyn_value(buffer, buffer_len, id3->filesize, byte_units, true); + val=buffer; + break; } return val && *val ? val : NULL; } diff --git a/apps/settings_list.c b/apps/settings_list.c index 8c1b5897dd..80000ab23f 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1139,7 +1139,7 @@ const struct settings_list settings[] = { ID2P(LANG_START_NEW_FILE), ID2P(LANG_STOP_RECORDING),ID2P(LANG_STOP_RECORDING_AND_SHUTDOWN)), CHOICE_SETTING(F_RECSETTING, rec_split_method, LANG_SPLIT_MEASURE, 0, "rec split method", "Time,Filesize", NULL, 2, - ID2P(LANG_TIME), ID2P(LANG_REC_SIZE)), + ID2P(LANG_TIME), ID2P(LANG_FILESIZE)), {F_T_INT|F_RECSETTING, &global_settings.rec_source, LANG_RECORDING_SOURCE, INT(0), "rec source", &HAVE_MIC_REC_(",mic")