cExtData is now a singleton class, thus its content survives a DISCONN/CONNECT of a display; trans() now works as expected; three new tokens: 'IsMenuList', 'MenuText', 'MenuTextScroll'; support added for ':clean' and ':rest' for tokens 'MenuTitle', 'MenuCurrent', and 'MenuText'

1 files changed, 0 insertions, 51 deletions

diff --git a/display.c b/display.c
index e92cf05..8823ccf 100644
--- a/display.c
+++ b/display.c
@@ -56,8 +56,6 @@ cGraphLCDDisplay::cGraphLCDDisplay()
     bBrightnessActive = true;
 
     mService = NULL; /* cannot be initialised here (mGraphLCDState not yet available) */
-    
-    mExtData = new cExtData();
 }
 
 cGraphLCDDisplay::~cGraphLCDDisplay()
@@ -70,8 +68,6 @@ cGraphLCDDisplay::~cGraphLCDDisplay()
     delete mGraphLCDState;
 
     delete mService;
-    
-    delete mExtData;
 }
 
 bool cGraphLCDDisplay::Initialise(GLCD::cDriver * Lcd, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName)
@@ -502,50 +498,3 @@ void cGraphLCDDisplay::Clear() {
 #endif
   mLcd->Refresh(false);
 }
-
-
-
-bool cExtData::Set(std::string key, std::string value, uint32_t expire) {
-    data[key] = value;
-    
-    if (expire > 0) {
-        expData[key] = cTimeMs::Now() + (expire * 1000);
-    } else {
-        expData.erase(key); // just in case of an old expiration entry for key         
-    }
-    return true;
-}
-
-
-bool cExtData::Unset(std::string key) {
-    expData.erase(key); // ignore result;
-    return ( (data.erase(key) > 0) ? true : false );
-}
-
-
-bool cExtData::IsSet(std::string key) {
-    std::string ret = Get(key);
-    return ( (ret != "") ? true : false );
-}
-
-
-std::string cExtData::Get(std::string key) {
-    it = data.find(key);
-    if ( it != data.end() ) {
-        expDataIt = expData.find(key);
-        if ( expDataIt != expData.end() ) {
-            uint64_t expts = (*expDataIt).second;
-            if ( cTimeMs::Now() > expts ) {
-                expData.erase(key);
-                data.erase(key);
-                return "";
-            } else {
-                return (*it).second;
-            }
-        } else {
-            return (*it).second;
-        }
-    } else {
-        return "";
-    }
-}