support added for audio track selection / audio channel display (new tokens: 'AudioTrackItem', 'AudioTrackCurrent', 'IsAudioTrackCurrent', 'AudioChannel'); skins: support for new display section 'audio'; default.skin: bug fixes, enhancements

1 files changed, 38 insertions, 0 deletions

diff --git a/display.c b/display.c
index 79cb236..ba96d9c 100644
--- a/display.c
+++ b/display.c
@@ -50,6 +50,7 @@ cGraphLCDDisplay::cGraphLCDDisplay()
     LastTimeDisplayMode = 0;
 
     mShowVolume = false;
+    mShowAudio = false;
 
     nCurrentBrightness = -1;
     LastTimeBrightness = 0;
@@ -226,6 +227,35 @@ void cGraphLCDDisplay::Action(void)
                 }
             }
 
+            if (GraphLCDSetup.ShowMenu)
+            {
+                tAudioState audio;
+                audio = mGraphLCDState->GetAudioState();
+
+                if (audio.tracks.size() == 0) {
+                    mShowAudio = false;
+                } else
+                if (audio.lastChange > 0)
+                {
+                    if (!mShowAudio)
+                    {
+                        if (currTimeMs - audio.lastChange < 5000)
+                        {
+                            mShowAudio = true;
+                            mUpdate = true;
+                        }
+                    }
+                    else
+                    {
+                        if (currTimeMs - audio.lastChange > 5000)
+                        {
+                            mShowAudio = false;
+                            mUpdate = true;
+                        }
+                    }
+                }
+            }
+
             /* display mode (normal or interactive): reset after 10 secs if not normal */
             if ( (mDisplayMode != DisplayModeNormal) && ( (uint32_t)(currTimeMs - LastTimeDisplayMode) > (uint32_t)(10000)) ) {
                 mDisplayMode = DisplayModeNormal;
@@ -259,6 +289,7 @@ void cGraphLCDDisplay::Action(void)
             bool bActive = bBrightnessActive
                    || (mState != StateNormal)
                    || (GraphLCDSetup.ShowVolume && mShowVolume)
+                   || (GraphLCDSetup.ShowMenu && mShowAudio)
                    || (GraphLCDSetup.ShowMessages && mGraphLCDState->ShowMessage())
                    || (GraphLCDSetup.BrightnessDelay == 900);
 
@@ -324,6 +355,12 @@ void cGraphLCDDisplay::Action(void)
                     if (display)
                         display->Render(mScreen);
                 }
+                if (mShowAudio)
+                {
+                    display = mSkin->GetDisplay("audio");
+                    if (display)
+                        display->Render(mScreen);
+                }
                 if (GraphLCDSetup.ShowMessages && mGraphLCDState->ShowMessage())
                 {
                     display = mSkin->GetDisplay("message");
@@ -455,6 +492,7 @@ void cGraphLCDDisplay::SetBrightness()
     bool bActive = bBrightnessActive
                    || (mState != StateNormal)
                    || (GraphLCDSetup.ShowVolume && mShowVolume)
+                   || (GraphLCDSetup.ShowMenu && mShowAudio)
                    || (GraphLCDSetup.ShowMessages && mGraphLCDState->ShowMessage())
                    || (GraphLCDSetup.BrightnessDelay == 900);
     if (bActive)