new tokens: {ActualDevice}, {SignalStrength}, {SignalQuality}, {SupportsSignalInfo}; adaptions for new parameter 'evaluate' (<variable/> in skin-support of graphlcd-base; added method cGraphLCDDisplay::GetSkin(); beauty fixes

1 files changed, 56 insertions, 0 deletions

diff --git a/skinconfig.c b/skinconfig.c
index 465a364..39b6c75 100644
--- a/skinconfig.c
+++ b/skinconfig.c
@@ -45,6 +45,14 @@ typedef enum _eTokenId
     tokChannelAlias,
     tokPrivateChannelEnd,
 
+    // current device
+    tokPrivateDeviceStart,
+    tokActualDevice,
+    tokSignalStrength,
+    tokSignalQuality,
+    tokSupportsSignalInfo,
+    tokPrivateDeviceEnd,
+
     tokPrivateRecordingStart,
     tokIsRecording,
     tokRecordings,
@@ -191,6 +199,13 @@ static const std::string Tokens[tokCountToken] =
     "ChannelAlias",
     "privateChannelEnd",
 
+    "privatePrivateDeviceStart",
+    "ActualDevice",
+    "SignalStrength",
+    "SignalQuality",
+    "SupportsSignalInfo",
+    "privateDeviceEnd",
+
     "privateRecordingStart",
     "IsRecording",
     "Recordings",
@@ -403,6 +418,47 @@ GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token)
                 break;
         }
     }
+    else if (Token.Id > tokPrivateDeviceStart && Token.Id < tokPrivateDeviceEnd)
+    {
+        cDevice * currDev = cDevice::ActualDevice();
+        if (currDev)
+        {
+            switch (Token.Id)
+            {
+                case tokActualDevice:
+                {
+                    return currDev->DeviceNumber()+1;  // DeviceNumber() starts with 0 but let output start w/ 1
+                }
+                case tokSignalStrength:
+                {
+#if VDRVERSNUM >= 10719
+                    return currDev->SignalStrength();
+#else
+                    return false;
+#endif
+                }
+                case tokSignalQuality:
+                {
+#if VDRVERSNUM >= 10719
+                    return currDev->SignalQuality();
+#else
+                    return false;
+#endif
+                }
+                case tokSupportsSignalInfo:
+                {
+#if VDRVERSNUM >= 10719
+                    return true;
+#else
+                    return false;
+#endif
+                }
+                default:
+                    break;
+            }
+        }
+        return false;
+    }
     else if (Token.Id > tokPrivateRecordingStart && Token.Id < tokPrivateRecordingEnd)
     {
         switch (Token.Id)