add audio channel icons, update topbar conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/displaytracks.h b/displaytracks.h
index 23076a6d..a194158b 100644
--- a/displaytracks.h
+++ b/displaytracks.h
@@ -5,11 +5,16 @@
 class cFlatDisplayTracks : public cFlatBaseRender, public cSkinDisplayTracks {
     private:
         cPixmap *tracksPixmap;
+        cPixmap *tracksLogoPixmap;
 
+        cImage *img_ac3;
+        cImage *img_stereo;
+        int ac3Width, stereoWidth;
+        
         int itemHeight, itemsHeight;
         int maxItemWidth;
         int currentIndex;
-
+        
         void SetItem(const char *Text, int Index, bool Current);
     public:
         cFlatDisplayTracks(const char *Title, int NumTracks, const char * const *Tracks);