Index: trunk/apps/onplay.c
===================================================================
--- trunk.orig/apps/onplay.c
+++ trunk/apps/onplay.c
@@ -68,6 +68,7 @@
 #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
 #endif
+#include "metadata.h"
 
 static int context;
 static char* selected_file = NULL;
@@ -283,6 +284,241 @@ static int cat_playlist_callback(int act
     return action;
 }
 
+/* Format time in seconds to string like 00:00:00.  This version takes
+   seconds instead of ms so that a bigger max value fits the data
+   type. */
+void format_time_secs(char* buf, int buf_size, long time)
+{
+    if ( time < 3600 ) {
+        snprintf(buf, buf_size, "%d:%02d",
+                 (int) (time / 60), (int) (time % 60));
+    } else {
+        snprintf(buf, buf_size, "%d:%02d:%02d",
+                 (int) (time / 3600), (int) (time % 3600 / 60),
+                 (int) (time % 60));
+    }
+}
+
+/* playing_time screen context */
+struct playing_time_info {
+    int curr_playing; /* index of currently playing track in playlist */
+    int nb_tracks; /* how many tracks in playlist */
+    /* seconds before and after current position, and total.  Datatype
+       allows for values up to 68years.  If I had kept it in ms
+       though, it would have overflowed at 24days, which takes
+       something like 8.5GB at 32kbps, and so we could conceivably
+       have playlists lasting longer than that. */
+    long secs_bef, secs_aft, secs_ttl;
+    /* kilobytes played before and after current pos, and total.
+       Kilobytes because bytes would overflow. Data type range is up
+       to 2TB. */
+    long kbs_bef, kbs_aft, kbs_ttl;
+};
+
+/* list callback for playing_time screen */
+char * playing_time_get_or_speak_info(int selected_item, void * data,
+                                      char *buf, bool say_it)
+{
+    struct playing_time_info *pti = (struct playing_time_info *)data;
+    const unsigned char *kbyte_units[] = {
+        ID2P(LANG_KILOBYTE),
+        ID2P(LANG_MEGABYTE),
+        ID2P(LANG_GIGABYTE)
+    };
+    switch(selected_item) {
+    case 0: { /* elapsed and total time */
+        char timestr1[15], timestr2[15];
+        format_time_secs(timestr1, sizeof(timestr1), pti->secs_bef);
+        format_time_secs(timestr2, sizeof(timestr2), pti->secs_ttl);
+        long elapsed_perc; /* percentage of duration elapsed */
+        if(pti->secs_ttl == 0)
+            elapsed_perc = 0;
+        else if(pti->secs_ttl <= 0xFFFFFF)
+            elapsed_perc = pti->secs_bef *100 / pti->secs_ttl;
+        else /* sacrifice some precision to avoid overflow */
+            elapsed_perc = (pti->secs_bef>>7) *100 /(pti->secs_ttl>>7);
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_ELAPSED),
+                 timestr1, timestr2, elapsed_perc);
+        if(say_it)
+            talk_ids(false, LANG_PLAYTIME_ELAPSED,
+                     TALK_ID(pti->secs_bef, UNIT_TIME),
+                     VOICE_OF,
+                     TALK_ID(pti->secs_ttl, UNIT_TIME),
+                     VOICE_PAUSE,
+                     TALK_ID(elapsed_perc, UNIT_PERCENT));
+        break;
+    }
+    case 1: { /* remaining time */
+        char timestr[15];
+        format_time_secs(timestr, sizeof(timestr), pti->secs_aft);
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_REMAINING),
+                 timestr);
+        if(say_it)
+          talk_ids(false, LANG_PLAYTIME_REMAINING,
+                     TALK_ID(pti->secs_aft, UNIT_TIME));
+        break;
+    }
+    case 2: { /* track index */
+        int track_perc = (pti->curr_playing+1) *100 / pti->nb_tracks;
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_TRACK),
+                 pti->curr_playing, pti->nb_tracks, track_perc);
+        if(say_it)
+          talk_ids(false, LANG_PLAYTIME_TRACK,
+                     TALK_ID(pti->curr_playing+1, UNIT_INT),
+                     VOICE_OF,
+                     TALK_ID(pti->nb_tracks, UNIT_INT),
+                     VOICE_PAUSE,
+                     TALK_ID(track_perc, UNIT_PERCENT));
+        break;
+    }
+    case 3: { /* storage size */
+        char str1[10], str2[10], str3[10];
+        output_dyn_value(str1, sizeof(str1), pti->kbs_ttl, kbyte_units, true);
+        output_dyn_value(str2, sizeof(str2), pti->kbs_bef, kbyte_units, true);
+        output_dyn_value(str3, sizeof(str3), pti->kbs_aft, kbyte_units, true);
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_STORAGE),
+                 str1,str2,str3);
+        if(say_it) {
+            talk_id(LANG_PLAYTIME_STORAGE, false);
+            output_dyn_value(NULL, 0, pti->kbs_ttl, kbyte_units, true);
+            talk_id(VOICE_PAUSE, true);
+            talk_id(VOICE_PLAYTIME_DONE, true);
+            output_dyn_value(NULL, 0, pti->kbs_bef, kbyte_units, true);
+            talk_id(LANG_PLAYTIME_REMAINING, true);
+            output_dyn_value(NULL, 0, pti->kbs_aft, kbyte_units, true);
+        }
+        break;
+    }
+    case 4: { /* Average track file size */
+        char str[10];
+        long avg_track_size = pti->kbs_ttl /pti->nb_tracks;
+        output_dyn_value(str, sizeof(str), avg_track_size, kbyte_units, true);
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_AVG_TRACK_SIZE),
+                 str);
+        if(say_it) {
+            talk_id(LANG_PLAYTIME_AVG_TRACK_SIZE, false);
+            output_dyn_value(NULL, 0, avg_track_size, kbyte_units, true);
+        }
+        break;
+    }
+    case 5: { /* Average bitrate */
+        /* Convert power of 2 kilobytes to power of 10 kilobits */
+        long avg_bitrate = pti->kbs_ttl / pti->secs_ttl *1024 *8 /1000;
+        snprintf(buf, MAX_PATH, str(LANG_PLAYTIME_AVG_BITRATE),
+                 avg_bitrate);
+        if(say_it)
+          talk_ids(false, LANG_PLAYTIME_AVG_BITRATE,
+                   TALK_ID(avg_bitrate, UNIT_KBIT));
+        break;
+    }
+    }
+    return buf;
+}
+
+char * playing_time_get_info(int selected_item, void * data,
+                             char *buffer)
+{
+    return playing_time_get_or_speak_info(selected_item, data,
+                                          buffer, false);
+}
+
+int playing_time_speak_info(int selected_item, void * data)
+{
+    char buffer[MAX_PATH];
+    playing_time_get_or_speak_info(selected_item, data, buffer, true);
+    return 0;
+}
+
+/* playing time screen: shows total and elapsed playlist duration and
+   other stats */
+bool playing_time(void)
+{
+    unsigned long talked_tick = current_tick;
+    struct playing_time_info pti;
+    struct playlist_track_info pltrack;
+    struct mp3entry id3;
+    int i, fd, ret;
+
+    pti.secs_bef = pti.secs_aft = 0;
+    pti.kbs_bef = pti.kbs_aft = 0;
+
+    pti.nb_tracks = playlist_amount();
+    playlist_get_resume_info(&pti.curr_playing);
+    struct mp3entry *curr_id3 = audio_current_track();
+    if(pti.curr_playing == -1 || !curr_id3)
+        return false;
+    pti.secs_bef += curr_id3->elapsed/1000;
+    pti.secs_aft += (curr_id3->length -curr_id3->elapsed)/1000;
+    pti.kbs_bef += curr_id3->offset/1024;
+    pti.kbs_aft += (curr_id3->filesize -curr_id3->offset)/1024;
+
+    gui_syncsplash(0, ID2P(LANG_WAIT));
+
+    /* Go through each file in the playlist and get its stats. For
+       huge playlists this can take a while... The reference position
+       is the position at the moment this function was invoked,
+       although playback continues forward. */
+    for(i=0; i<pti.nb_tracks;i++) {
+        /* Show a splash while we are loading. */
+        gui_syncsplash(0, str(LANG_LOADING_PERCENT),
+                       i*100/pti.nb_tracks, LANG_OFF_ABORT);
+        /* Voice equivalent */
+        if(TIME_AFTER(current_tick, talked_tick+5*HZ)) {
+            talked_tick = current_tick;
+            talk_ids(false, LANG_LOADING_PERCENT,
+                     TALK_ID(i*100/pti.nb_tracks, UNIT_PERCENT));
+        }
+        if (action_userabort(TIMEOUT_NOBLOCK))
+            goto exit;
+
+        if(i == pti.curr_playing)
+            continue;
+
+        if(playlist_get_track_info(NULL, i, &pltrack) <0)
+            goto error;
+        if((fd = open(pltrack.filename, O_RDONLY)) <0)
+            goto error;
+        ret = get_metadata(&id3, fd, pltrack.filename, false);
+        close(fd);
+        if (!ret)
+            goto error;
+
+        if(i < pti.curr_playing) {
+            pti.secs_bef += id3.length/1000;
+            pti.kbs_bef += id3.filesize/1024;
+        }else{
+            pti.secs_aft += id3.length/1000;
+            pti.kbs_aft += id3.filesize/1024;
+        }
+    }
+
+    pti.secs_ttl = pti.secs_bef +pti.secs_aft;
+    pti.kbs_ttl = pti.kbs_bef +pti.kbs_aft;
+
+    struct gui_synclist pt_lists;
+    int key;
+
+    gui_synclist_init(&pt_lists, &playing_time_get_info, &pti, true, 1);
+    if (global_settings.talk_menu)
+        gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info);
+    gui_synclist_set_nb_items(&pt_lists, 6);
+    gui_synclist_draw(&pt_lists);
+    gui_syncstatusbar_draw(&statusbars, true);
+    gui_synclist_speak_item(&pt_lists);
+    while (true) {
+        gui_syncstatusbar_draw(&statusbars, false);
+        if(list_do_action(CONTEXT_LIST, HZ/2,
+                          &pt_lists, LIST_WRAP_UNLESS_HELD,
+                          &key) == 0
+           && key!=ACTION_NONE && key!=ACTION_UNKNOWN)
+            return(default_event_handler(key) == SYS_USB_CONNECTED);
+    }
+ error:
+    gui_syncsplash(HZ, ID2P(LANG_PLAYTIME_ERROR));
+ exit:
+    return false;
+}
+
 
 /* CONTEXT_WPS playlist options */
 MENUITEM_FUNCTION(playlist_viewer_item, 0, 
@@ -295,10 +531,12 @@ MENUITEM_FUNCTION(playlist_save_item, 0,
                   save_playlist, NULL, NULL, Icon_Playlist);
 MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST),
                   shuffle_playlist, NULL, NULL, Icon_Playlist);
+MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME),
+                  playing_time, NULL, NULL, Icon_Playlist);
 MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), 
                  NULL, Icon_Playlist, 
                  &playlist_viewer_item, &search_playlist_item,
-                 &playlist_save_item, &reshuffle_item
+                 &playlist_save_item, &reshuffle_item, &playing_time_item
                );
                
 /* CONTEXT_[TREE|ID3DB] playlist options */
Index: trunk/apps/lang/english.lang
===================================================================
--- trunk.orig/apps/lang/english.lang
+++ trunk/apps/lang/english.lang
@@ -203,25 +203,25 @@
 </phrase>
 <phrase>
   id: LANG_LOADING_PERCENT
   desc: splash number of percents loaded
   user:
   <source>
     *: "Loading... %d%% done (%s)"
   </source>
   <dest>
     *: "Loading... %d%% done (%s)"
   </dest>
   <voice>
-    *: ""
+    *: "Loading"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SCANNING_DISK
   desc: when booting up and rebuilding the cache and calculating free space
   user:
   <source>
     *: "Scanning disk..."
   </source>
   <dest>
     *: "Scanning disk..."
   </dest>
@@ -11390,12 +11390,138 @@
     *: none
     radio: "Preset"
   </source>
   <dest>
     *: none
     radio: "Preset"
   </dest>
   <voice>
     *: none
     radio: "Preset mode"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_PLAYTIME_ELAPSED
+  desc: playing time screen
+  user:
+  <source>
+    *: "Elapsed: %s / %s %ld%%"
+  </source>
+  <dest>
+    *: "Elapsed: %s / %s %ld%%"
+  </dest>
+  <voice>
+    *: "Elapsed"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_REMAINING
+  desc: playing time screen
+  user:
+  <source>
+    *: "Remaining: %s"
+  </source>
+  <dest>
+    *: "Remaining: %s"
+  </dest>
+  <voice>
+    *: "Remaining"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRACK
+  desc: playing time screen
+  user:
+  <source>
+    *: "Track %d / %d %d%%"
+  </source>
+  <dest>
+    *: "Track %d / %d %d%%"
+  </dest>
+  <voice>
+    *: "Track"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_STORAGE
+  desc: playing time screen
+  user:
+  <source>
+    *: "Storage: %s (done %s, remaining %s)"
+  </source>
+  <dest>
+    *: "Storage: %s (done %s, remaining %s)"
+  </dest>
+  <voice>
+    *: "Storage"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYTIME_DONE
+  desc: playing time screen
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Done"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_TRACK_SIZE
+  desc: playing time screen
+  user:
+  <source>
+    *: "Average track size: %s"
+  </source>
+  <dest>
+    *: "Average track size: %s"
+  </dest>
+  <voice>
+    *: "Average track size"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_BITRATE
+  desc: playing time screen
+  user:
+  <source>
+    *: "Average bitrate: %ld kbps"
+  </source>
+  <dest>
+    *: "Average bitrate: %ld kbps"
+  </dest>
+  <voice>
+    *: "Average bit rate"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ERROR
+  desc: playing time screen
+  user:
+  <source>
+    *: "Error while gathering info"
+  </source>
+  <dest>
+    *: "Error while gathering info"
+  </dest>
+  <voice>
+    *: "Error while gathering info"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_TIME
+  desc: onplay menu
+  user:
+  <source>
+    *: "Playing time"
+  </source>
+  <dest>
+    *: "Playing time"
+  </dest>
+  <voice>
+    *: "Playing time"
+  </voice>
+</phrase>