6 files changed, 96 insertions, 31 deletions

diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 4d36302ddf..99d9e033fc 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -33,8 +33,13 @@
 #include "lib/osd.h"
 
 #ifndef HAVE_LCD_COLOR
+#if defined(SIMULATOR)
+// Use the one in pluginlib/osd
+extern GREY_INFO_STRUCT
+#else
 GREY_INFO_STRUCT
 #endif
+#endif
 
 #include "lib/pluginlib_actions.h"
 
diff --git a/apps/plugins/lua/rockaux.c b/apps/plugins/lua/rockaux.c
index c4af2b3e96..c9066e5610 100644
--- a/apps/plugins/lua/rockaux.c
+++ b/apps/plugins/lua/rockaux.c
@@ -202,11 +202,13 @@ int strcoll(const char * str1, const char * str2)
     return rb->strcmp(str1, str2);
 }
 
+#ifndef _WIN32
 struct tm * gmtime(const time_t *timep)
 {
     static struct tm time;
     return rb->gmtime_r(timep, &time);
 }
+#endif
 
 int get_current_path(lua_State *L, int level)
 {
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c
index 30f8c2f079..6b08fa258b 100644
--- a/apps/plugins/mikmod/mikmod.c
+++ b/apps/plugins/mikmod/mikmod.c
@@ -378,7 +378,7 @@ static void showinstruments(void)
     rb->lcd_clear_display();
     for( i=0; i<MAX_LINES && i+vscroll<module->numins; i++ )
     {
-        sprintf(statustext, "%02d %s", i+vscroll+1, module->instruments[i+vscroll].insname);
+        sprintf(statustext, "%02d %s", i+vscroll+1, module->instruments[i+vscroll].insname ? module->instruments[i+vscroll].insname : "[n/a]");
         rb->lcd_putsxy(1, 1+(8*i), statustext);
     }
     rb->lcd_update();
diff --git a/apps/plugins/mikmod/mikmod.make b/apps/plugins/mikmod/mikmod.make
index f93a10ca27..bff7b82099 100644
--- a/apps/plugins/mikmod/mikmod.make
+++ b/apps/plugins/mikmod/mikmod.make
@@ -18,7 +18,7 @@ MIKMOD_OBJ := $(call c2obj, $(MIKMOD_SRC))
 # add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(MIKMOD_SRC)
 
-MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2
+MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2 -DMIKMOD_STATIC
 
 # Disable stringop-truncation warnings on GCC 8 or greater
 ifeq ($(shell expr $(GCCNUM) \> 800),1)
diff --git a/apps/plugins/playing_time.c b/apps/plugins/playing_time.c
index 354c5a3e06..e465c35a18 100644
--- a/apps/plugins/playing_time.c
+++ b/apps/plugins/playing_time.c
@@ -31,6 +31,17 @@ const unsigned char * const byte_units[] =
     ID2P(LANG_GIBIBYTE)
 };
 
+const int menu_items[] = {
+        LANG_PLAYTIME_ELAPSED,
+        LANG_PLAYTIME_REMAINING,
+        LANG_PLAYTIME_TRK_ELAPSED,
+        LANG_PLAYTIME_TRK_REMAINING,
+        LANG_PLAYTIME_TRACK,
+        LANG_PLAYTIME_STORAGE,
+        LANG_PLAYTIME_AVG_TRACK_SIZE,
+        LANG_PLAYTIME_AVG_BITRATE,
+};
+
 const unsigned char * const * const kibyte_units = &byte_units[1];
 
 enum ePT_SECS {
@@ -53,7 +64,7 @@ struct playing_time_info {
     int curr_index;         /* index of currently playing track in playlist */
     int curr_display_index; /* display index of currently playing track in playlist */
     int nb_tracks;          /* how many tracks in playlist */
-    
+
     /* seconds total, before, and after current position.  Datatype
        allows for values up to 68years.  If I had kept it in ms
        though, it would have overflowed at 24days, which takes
@@ -68,6 +79,27 @@ struct playing_time_info {
     long kbs[ePT_KBS_COUNT];
 };
 
+static char* get_percent_str(long percents)
+{
+    static char val[10];
+    rb->snprintf(val, 10, rb->str(LANG_PERCENT_FORMAT), percents);
+    return val;
+}
+
+static inline void prepare_time_string(char *buf, size_t buffer_len, long elapsed_pct, const char *timestr1, const char *timestr2)
+{
+    if (rb->lang_is_rtl())
+    {
+        rb->snprintf(buf, buffer_len, "%s %s / %s",
+                get_percent_str(elapsed_pct), timestr2, timestr1);
+    }
+    else
+    {
+        rb->snprintf(buf, buffer_len, "%s / %s %s",
+                timestr1, timestr2, get_percent_str(elapsed_pct));
+    }
+}
+
 /* list callback for playing_time screen */
 static const char * playing_time_get_or_speak_info(int selected_item, void * data,
                                                    char *buf, size_t buffer_len,
@@ -75,14 +107,22 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
 {
     long elapsed_pct; /* percentage of duration elapsed */
     struct playing_time_info *pti = (struct playing_time_info *)data;
-    switch(selected_item) {
+    int info_no = selected_item/2;
+    const int menu_name_id = menu_items[info_no];
+
+    if (!(selected_item%2))
+    {/* header */
+        return rb->str(menu_name_id);
+    }
+
+    switch(info_no) {
     case 0: { /* elapsed and total time */
         char timestr1[25], timestr2[25];
         rb->format_time_auto(timestr1, sizeof(timestr1),
-                         pti->secs[ePT_SECS_BEF], UNIT_SEC, false);
+                         pti->secs[ePT_SECS_BEF], UNIT_SEC, true);
 
         rb->format_time_auto(timestr2, sizeof(timestr2),
-                         pti->secs[ePT_SECS_TTL], UNIT_SEC, false);
+                         pti->secs[ePT_SECS_TTL], UNIT_SEC, true);
 
         if (pti->secs[ePT_SECS_TTL] == 0)
             elapsed_pct = 0;
@@ -96,11 +136,10 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
             elapsed_pct = (pti->secs[ePT_SECS_BEF] >> 7) * 100
                            / (pti->secs[ePT_SECS_TTL] >> 7);
         }
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_ELAPSED),
-                 timestr1, timestr2, elapsed_pct);
+        prepare_time_string(buf, buffer_len, elapsed_pct, timestr1, timestr2);
 
         if (say_it)
-            rb_talk_ids(false, LANG_PLAYTIME_ELAPSED,
+            rb_talk_ids(false, menu_name_id,
                      TALK_ID(pti->secs[ePT_SECS_BEF], UNIT_TIME),
                      VOICE_OF,
                      TALK_ID(pti->secs[ePT_SECS_TTL], UNIT_TIME),
@@ -112,10 +151,10 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
         char timestr[25];
         rb->format_time_auto(timestr, sizeof(timestr), pti->secs[ePT_SECS_AFT],
             UNIT_SEC, false);
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_REMAINING), timestr);
+        rb->snprintf(buf, buffer_len, "%s", timestr);
 
         if (say_it)
-          rb_talk_ids(false, LANG_PLAYTIME_REMAINING,
+          rb_talk_ids(false, menu_name_id,
                      TALK_ID(pti->secs[ePT_SECS_AFT], UNIT_TIME));
         break;
     }
@@ -123,9 +162,9 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
         char timestr1[25], timestr2[25];
 
         rb->format_time_auto(timestr1, sizeof(timestr1), pti->trk_secs[ePT_SECS_BEF],
-            UNIT_SEC, false);
+            UNIT_SEC, true);
         rb->format_time_auto(timestr2, sizeof(timestr2), pti->trk_secs[ePT_SECS_TTL],
-            UNIT_SEC, false);
+            UNIT_SEC, true);
 
         if (pti->trk_secs[ePT_SECS_TTL] == 0)
             elapsed_pct = 0;
@@ -139,11 +178,10 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
             elapsed_pct = (pti->trk_secs[ePT_SECS_BEF] >> 7) * 100
                             / (pti->trk_secs[ePT_SECS_TTL] >> 7);
         }
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_TRK_ELAPSED),
-                 timestr1, timestr2, elapsed_pct);
+        prepare_time_string(buf, buffer_len, elapsed_pct, timestr1, timestr2);
 
         if (say_it)
-            rb_talk_ids(false, LANG_PLAYTIME_TRK_ELAPSED,
+            rb_talk_ids(false, menu_name_id,
                      TALK_ID(pti->trk_secs[ePT_SECS_BEF], UNIT_TIME),
                      VOICE_OF,
                      TALK_ID(pti->trk_secs[ePT_SECS_TTL], UNIT_TIME),
@@ -155,21 +193,29 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
         char timestr[25];
         rb->format_time_auto(timestr, sizeof(timestr), pti->trk_secs[ePT_SECS_AFT],
             UNIT_SEC, false);
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_TRK_REMAINING), timestr);
+        rb->snprintf(buf, buffer_len, "%s", timestr);
 
         if (say_it)
-          rb_talk_ids(false, LANG_PLAYTIME_TRK_REMAINING,
+          rb_talk_ids(false, menu_name_id,
                      TALK_ID(pti->trk_secs[ePT_SECS_AFT], UNIT_TIME));
         break;
     }
     case 4: { /* track index */
         int track_pct = pti->curr_display_index * 100 / pti->nb_tracks;
 
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_TRACK),
-                 pti->curr_display_index, pti->nb_tracks, track_pct);
+        if (rb->lang_is_rtl())
+        {
+            rb->snprintf(buf, buffer_len, "%s %d / %d",
+                    get_percent_str(track_pct), pti->nb_tracks, pti->curr_display_index);
+        }
+        else
+        {
+            rb->snprintf(buf, buffer_len, "%d / %d %s",
+                    pti->curr_display_index, pti->nb_tracks, get_percent_str(track_pct));
+        }
 
         if (say_it)
-          rb_talk_ids(false, LANG_PLAYTIME_TRACK,
+          rb_talk_ids(false, menu_name_id,
                      TALK_ID(pti->curr_display_index, UNIT_INT),
                      VOICE_OF,
                      TALK_ID(pti->nb_tracks, UNIT_INT),
@@ -179,18 +225,18 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
     }
     case 5: { /* storage size */
         int i;
-        char kbstr[ePT_KBS_COUNT][10];
+        char kbstr[ePT_KBS_COUNT][20];
 
         for (i = 0; i < ePT_KBS_COUNT; i++) {
             rb->output_dyn_value(kbstr[i], sizeof(kbstr[i]),
                              pti->kbs[i], kibyte_units, 3, true);
         }
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_STORAGE),
+        rb->snprintf(buf, buffer_len, "%s (%s / %s)",
                  kbstr[ePT_KBS_TTL], kbstr[ePT_KBS_BEF],kbstr[ePT_KBS_AFT]);
 
         if (say_it) {
             int32_t voice_ids[ePT_KBS_COUNT];
-            voice_ids[ePT_KBS_TTL] = LANG_PLAYTIME_STORAGE;
+            voice_ids[ePT_KBS_TTL] = menu_name_id;
             voice_ids[ePT_KBS_BEF] = VOICE_PLAYTIME_DONE;
             voice_ids[ePT_KBS_AFT] = LANG_PLAYTIME_REMAINING;
 
@@ -202,13 +248,13 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
         break;
     }
     case 6: { /* Average track file size */
-        char str[10];
+        char str[20];
         long avg_track_size = pti->kbs[ePT_KBS_TTL] / pti->nb_tracks;
         rb->output_dyn_value(str, sizeof(str), avg_track_size, kibyte_units, 3, true);
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_AVG_TRACK_SIZE), str);
+        rb->snprintf(buf, buffer_len, "%s", str);
 
         if (say_it) {
-            rb->talk_id(LANG_PLAYTIME_AVG_TRACK_SIZE, false);
+            rb->talk_id(menu_name_id, false);
             rb->output_dyn_value(NULL, 0, avg_track_size, kibyte_units, 3, true);
         }
         break;
@@ -217,10 +263,10 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
         /* Convert power of 2 kilobytes to power of 10 kilobits */
         long avg_bitrate = (pti->kbs[ePT_KBS_TTL] / pti->secs[ePT_SECS_TTL]
                             * 1024 * 8 / 1000);
-        rb->snprintf(buf, buffer_len, rb->str(LANG_PLAYTIME_AVG_BITRATE), avg_bitrate);
+        rb->snprintf(buf, buffer_len, "%ld  kbps", avg_bitrate);
 
         if (say_it)
-          rb_talk_ids(false, LANG_PLAYTIME_AVG_BITRATE,
+          rb_talk_ids(false, menu_name_id,
                    TALK_ID(avg_bitrate, UNIT_KBIT));
         break;
     }
@@ -340,10 +386,10 @@ static bool playing_time(void)
     struct gui_synclist pt_lists;
     int key;
 
-    rb->gui_synclist_init(&pt_lists, &playing_time_get_info, &pti, true, 1, NULL);
+    rb->gui_synclist_init(&pt_lists, &playing_time_get_info, &pti, true, 2, NULL);
     if (rb->global_settings->talk_menu)
         rb->gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info);
-    rb->gui_synclist_set_nb_items(&pt_lists, 8);
+    rb->gui_synclist_set_nb_items(&pt_lists, 16);
     rb->gui_synclist_set_title(&pt_lists, rb->str(LANG_PLAYING_TIME), NOICON);
     rb->gui_synclist_draw(&pt_lists);
     rb->gui_synclist_speak_item(&pt_lists);
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index b430bd2792..4a126f812c 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -37,6 +37,12 @@ PLUGINLIB_OBJ := $(PLUGINLIB_SRC:.c=.o)
 PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o)
 PLUGINLIB_OBJ := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(PLUGINLIB_OBJ))
 
+ifdef USE_LTO
+# We do NOT want LTO on the GCC support file.
+$(BUILDDIR)/apps/plugins/lib/gcc-support.o: PLUGINFLAGS += -fno-lto
+$(BUILDDIR)/apps/plugins/plugin_crt0.o: PLUGINFLAGS += -fno-lto
+endif
+
 ### build data / rules
 ifndef APP_TYPE
 CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h
@@ -147,6 +153,12 @@ else
 endif
 PLUGINLDFLAGS += $(GLOBAL_LDOPTS)
 
+ifdef USE_LTO
+ PLUGINFLAGS += -flto -fno-builtin -ffreestanding
+ PLUGINLDFLAGS += -flto -fno-builtin -ffreestanding
+ PLUGINLDFLAGS += -e plugin_start
+endif
+
 $(BUILDDIR)/%.rock:
         $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \
                 $(filter %.o, $^) \