Ticket #1586: trunk_9499_lcd.patch

libs/libmyth/lcddevice.cpp

@@ -72 +72 @@
     connect(LEDTimer,   SIGNAL(timeout()),   this, SLOT(outputLEDs()));
 }
 
+bool LCD::m_enabled = false;
 bool LCD::m_server_unavailable = false;
 class LCD * LCD::m_lcd = NULL;
 
 class LCD * LCD::Get(void)
 {
-    if (m_lcd == NULL && m_server_unavailable == false)
+    if (m_enabled && m_lcd == NULL && m_server_unavailable == false)
         m_lcd = new LCD;
     return m_lcd;
 }
@@ -96 +97 @@
 
     lcd_host = gContext->GetSetting("LCDServerHost", "localhost");
     lcd_port = gContext->GetNumSetting("LCDServerPort", 6545);
+    m_enabled  = gContext->GetNumSetting("LCDEnable", 0) != 0;
 
-    if (lcd_host.length() > 0 && lcd_port > 1024)
+    if (m_enabled && lcd_host.length() > 0 && lcd_port > 1024)
     {
         class LCD * lcd = LCD::Get();
         if (lcd->connectToHost(lcd_host, lcd_port) == false) 
@@ -127 +129 @@
     port = lport;
     
     // Don't even try to connect if we're currently disabled.
-    if (!gContext->GetNumSetting("LCDEnable", 0))
+    if (!(m_enabled = gContext->GetNumSetting("LCDEnable", 0)))
     {
         connected = false;
         m_server_unavailable = true;

libs/libmyth/lcddevice.h

@@ -104 +104 @@
   protected:
     LCD();
 
+    static bool m_enabled;
     static bool m_server_unavailable;
     static class LCD * m_lcd;