Lots of Keysets

[pierogi] / pirkeysetmetadata.cpp

diff --git a/pirkeysetmetadata.cpp b/pirkeysetmetadata.cpp
index 32c46bb..e71ddcf 100644 (file)
--- a/pirkeysetmetadata.cpp
+++ b/pirkeysetmetadata.cpp
@@ -1,7 +1,10 @@
 #include "pirkeysetmetadata.h"
+#include "pirkeysetwidgetitem.h"
+#include "protocols/pirprotocol.h"
 
 #include <iostream>
 
+
 PIRKeysetMetaData::PIRKeysetMetaData(
   const char *r,
   PIRMakeName m,
@@ -13,21 +16,21 @@ PIRKeysetMetaData::PIRKeysetMetaData(
 }
 
 bool PIRKeysetMetaData::hasKey(
-  PIRKeyName name)
+  PIRKeyName name) const
 {
   return (keys.find(name) != keys.end());
 }
 
 
 void PIRKeysetMetaData::moveProtocolToThread(
-  QThread &thread)
+  QThread *thread)
 {
-  threadableProtocol->moveToThread(&thread);
+  threadableProtocol->moveToThread(thread);
 }
 
 
 void PIRKeysetMetaData::populateDeviceTypes(
-  PIRKeysetWidgetItem *kwi)
+  PIRKeysetWidgetItem *kwi) const
 {
   PIRDeviceTypeCollection::const_iterator i = deviceTypes.begin();
   while (i != deviceTypes.end())
@@ -38,12 +41,23 @@ void PIRKeysetMetaData::populateDeviceTypes(
 }
 
 
-unsigned int PIRKeysetMetaData::getID()
+unsigned int PIRKeysetMetaData::getID() const
 {
   return id;
 }
 
 
+PIRMakeName PIRKeysetMetaData::getMake() const
+{
+  return make;
+}
+
+const char *PIRKeysetMetaData::getKeysetName() const
+{
+  return keysetName;
+}
+
+
 void PIRKeysetMetaData::addControlledDevice(
   PIRMakeName make,
   const char *model,
@@ -59,15 +73,150 @@ void PIRKeysetMetaData::addKey(
   const char *name,
   PIRKeyName key,
   unsigned long data,
-  unsigned int bits)
+  unsigned int size)
 {
   // Don't have a system for the unmapped keys yet!
   if (key != Unmapped_Key)
   {
     keys[key] = name;
+
+    threadableProtocol->addKey(key, data, size);
+  }
+}
+
+
+void PIRKeysetMetaData::addSIRC12Key(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+
+    threadableProtocol->addSIRCKey(key, addressData, 5, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addSIRC15Key(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addSIRCKey(key, addressData, 8, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addSIRC20Key(
+  const char *name,
+  PIRKeyName key,
+  unsigned int secondaryAddressData,
+  unsigned int primaryAddressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addSIRC20Key(
+      key, secondaryAddressData, primaryAddressData, commandData);
   }
+}
 
-  threadableProtocol->addKey(key, data, bits);
+
+void PIRKeysetMetaData::addSharpKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addSharpKey(key, addressData, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addNECKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addNECKey(key, addressData, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addPioneerKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressOne,
+  unsigned int commandOne,
+  unsigned int addressTwo,
+  unsigned int commandTwo)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addPioneerKey(
+      key, addressOne, commandOne, addressTwo, commandTwo);
+  }
+}
+
+
+/*
+void PIRKeysetMetaData::addRCAKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addPioneerKey(
+      key, addressData, commandData);
+  }
+}
+*/
+
+
+void PIRKeysetMetaData::addKaseikyoKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int addressData,
+  unsigned int commandData)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addKaseikyoKey(key, addressData, commandData);
+  }
+}
+
+
+void PIRKeysetMetaData::addDishKey(
+  const char *name,
+  PIRKeyName key,
+  unsigned int firstCommand,
+  unsigned int secondCommand)
+{
+  if (key != Unmapped_Key)
+  {
+    keys[key] = name;
+    threadableProtocol->addDishKey(key, firstCommand, secondCommand);
+  }
 }
 
 
@@ -87,17 +236,6 @@ void PIRKeysetMetaData::setPostData(
 }
 
 
-PIRMakeName PIRKeysetMetaData::getMake()
-{
-  return make;
-}
-
-const char *PIRKeysetMetaData::getKeysetName()
-{
-  return keysetName;
-}
-
-
 void PIRKeysetMetaData::setKeysetName(
   const char *n)
 {