FS#11867 - Add 2 new tags to allow skins to display themed peakmeters

%pL for the left channel, %pR for the right channel... usable as a value, conditional or bar (exactly the same as %pv/%bl/etc)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29043 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 0 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 47de4638d8..d38c8fd0ce 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -42,6 +42,7 @@
 #include "playlist.h"
 #include "audio.h"
 #include "tagcache.h"
+#include "peakmeter.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "peakmeter.h"
@@ -159,6 +160,15 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb)
         length = 100;
         end = battery_level();
     }
+    else if (pb->type == SKIN_TOKEN_PEAKMETER_LEFTBAR ||
+             pb->type == SKIN_TOKEN_PEAKMETER_RIGHTBAR)
+    {
+        int left, right, val;
+        peak_meter_current_vals(&left, &right);
+        val = pb->type == SKIN_TOKEN_PEAKMETER_LEFTBAR ? left : right;
+        length = MAX_PEAK;
+        end = peak_meter_scale_value(val, length);
+    }
 #if CONFIG_TUNER
     else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF))
     {