Interim Update

[pierogi] / keysets / nokia.cpp

diff --git a/keysets/nokia.cpp b/keysets/nokia.cpp
index 83aa5c9..56a0fad 100644 (file)
--- a/keysets/nokia.cpp
+++ b/keysets/nokia.cpp
@@ -1,26 +1,37 @@
 #include "nokia.h"
-#include "necprotocol.h"
+#include "protocols/lircprotocol.h"
 
 NokiaGenericVCR::NokiaGenericVCR(
-  QObject *guiObject,
   unsigned int index)
   : PIRKeysetMetaData(
       "Generic VCR",
       Nokia_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
+}
+
+
+void NokiaGenericVCR::populateProtocol(
+  QObject *guiObject)
+{
+  if (threadableProtocol)
+  {
+    // If the pointer is not null, the keyset must already be populated.
+    return;
+  }
+
+  LIRCProtocol *lp = new LIRCProtocol(
     guiObject,
     index,
     272, 737,
     272, 1711,
     42100, false);
 
-  threadableProtocol = np;
+  threadableProtocol = lp;
 
-  np->setTrailerPulse(272);
+  lp->setTrailerPulse(272);
 
-//  np->setMinimumRepetitions(3);
+//  lp->setMinimumRepetitions(3);
 
   setPreData(0x6, 3);
 
@@ -35,7 +46,7 @@ NokiaGenericVCR::NokiaGenericVCR(
   addKey("8", Eight_Key, 0x042, 12);
   addKey("9", Nine_Key, 0x242, 12);
   addKey("0", Zero_Key, 0x142, 12);
-  addKey("Timer", Unmapped_Key, 0x262, 12);
+  addKey("Timer", Timer_Key, 0x262, 12);
   addKey("Clear", Clear_Key, 0x012, 12);
   addKey("P+", ChannelUp_Key, 0x222, 12);
   addKey("P-", ChannelDown_Key, 0x122, 12);
@@ -50,7 +61,7 @@ NokiaGenericVCR::NokiaGenericVCR(
   addKey("Yellow", Yellow_Key, 0x032, 12);
   addKey("Blue", Blue_Key, 0x3D2, 12);
   addKey("Rec", Record_Key, 0x052, 12);
-  addKey("Clock", Unmapped_Key, 0x1C2, 12);
-  addKey("Prog", Unmapped_Key, 0x066, 12);
+  addKey("Clock", Clock_Key, 0x1C2, 12);
+  addKey("Prog", Program_Key, 0x066, 12);
   addKey("PIP", PIP_Key, 0x0C6, 12);
 }