Ticket #182: lcdkeys.diff

libs/libmythtv/siscan.h

@@ -31 +31 @@
 typedef void* NIT;
 #endif // USING_DVB
 
-#define USE_OWN_SIPARSER
+//#define USE_OWN_SIPARSER
 #define DVB_QUICKSCAN
 
 #define SISCAN(args...) \

libs/libmythtv/siscan.cpp

@@ -158 +158 @@
 void *SIScan::SpawnSectionReader(void *param)
 {
     DVBSIParser *siparser = (DVBSIParser*) param;
+#ifdef USING_DVB
     siparser->StartSectionReader();
+#endif
     return NULL;
 }
 

libs/libmyth/lcddevice.cpp

@@ -416 +416 @@
 {
     int key = 0;
 
-    char mykey = key_pressed.ascii()[0];
-    switch (mykey)
-    {
-        case LCD_KEY_UP: key = Qt::Key_Up; break;
-        case LCD_KEY_DOWN: key = Qt::Key_Down; break;
-        case LCD_KEY_LEFT: key = Qt::Key_Left; break;
-        case LCD_KEY_RIGHT: key = Qt::Key_Right; break;
-        case LCD_KEY_YES: key = Qt::Key_Space; break;
-        case LCD_KEY_NO: key = Qt::Key_Escape; break;
-        default: break;
-    } 
+    QChar mykey = key_pressed.at(0);
+    if (mykey == lcd_keystring.at(0))
+        key = Qt::Key_Up;
+    else if (mykey == lcd_keystring.at(1))
+        key = Qt::Key_Down;
+    else if (mykey == lcd_keystring.at(2))
+        key = Qt::Key_Left;
+    else if (mykey == lcd_keystring.at(3))
+        key = Qt::Key_Right;
+    else if (mykey == lcd_keystring.at(4))
+        key = Qt::Key_Space;
+    else if (mykey == lcd_keystring.at(5))
+        key = Qt::Key_Escape;
 
     QApplication::postEvent(gContext->GetMainWindow(),
                             new ExternalKeycodeEvent(key));
@@ -453 +455 @@
     lcd_heartbeaton=(gContext->GetSetting("LCDHeartBeatOn", "1")=="1");
     aString = gContext->GetSetting("LCDPopupTime", "5");
     lcd_popuptime = aString.toInt() * 1000;
+    lcd_keystring = gContext->GetSetting("LCDKeyString", "ABCDEF");
 
     connected = TRUE;
 
@@ -460 +463 @@
     // indicating that "hello" was succesful
 
     sendToServer("client_set name Myth");
-    sendToServer("client_add_key ABCDEF");   
+    aString = "client_add_key " + lcd_keystring;
+    sendToServer(aString);
  
     // Create all the screens and widgets (when we change activity in the myth 
     // program, we just swap the priorities of the screens to show only the 

libs/libmyth/lcddevice.h

@@ -11 +11 @@
 
 using namespace std;
 
-#define LCD_KEY_UP    'A'
-#define LCD_KEY_LEFT  'B'
-#define LCD_KEY_DOWN  'C'
-#define LCD_KEY_RIGHT 'D'
-#define LCD_KEY_YES   'E'
-#define LCD_KEY_NO    'F'
-
 enum CHECKED_STATE {CHECKED = 0, UNCHECKED, NOTCHECKABLE };
 
 class LCDMenuItem
@@ -308 +301 @@
     bool lcd_heartbeaton;
     int  lcd_popuptime;    
     QString lcd_showmusic_items;
-
+    QString lcd_keystring;
+    
     int (*GetLEDMask)(void);
 };
 

programs/mythfrontend/globalsettings.cpp

@@ -2553 +2553 @@
     return gc;
 }
 
+static HostLineEdit *LCDKeyString()
+{
+    HostLineEdit *ge = new HostLineEdit("LCDKeyString");
+    ge->setLabel(QObject::tr("LCD Key order"));
+    ge->setValue("ABCDEF");
+    ge->setHelpText(QObject::tr("Enter the 6 Keypad Return Codes for your "
+            "LCD keypad in the order in which you want the functions "
+            "up/down/left/right/yes/no to operate. "
+            "(See lcdproc/server/drivers/hd44780.c/keyMapMatrix[] "
+            "or the matrix for your display)"));
+    return ge;
+}
+
 static HostCheckBox *LCDEnable()
 {
     HostCheckBox *gc = new HostCheckBox("LCDEnable");
@@ -2590 +2603 @@
          setRight->addChild(LCDShowGeneric());
          setRight->addChild(LCDBacklightOn());
          setRight->addChild(LCDHeartBeatOn());
+         setRight->addChild(LCDKeyString());
          setHoriz->addChild(setLeft);
          setHoriz->addChild(setRight);
          settings->addChild(setHoriz);