Allow the RDMInflator to be used with both native E1.33 and LLRP RDM messages

Author: peternewman

libs/acn/RDMInflator.cpp

@@ -32,20 +32,31 @@ using std::string;
 /**
  * Create a new RDM inflator
  */
-RDMInflator::RDMInflator()
-    : BaseInflator(PDU::ONE_BYTE) {
+RDMInflator::RDMInflator(unsigned int vector)
+    : BaseInflator(PDU::ONE_BYTE),
+      m_vector(vector) {
 }
 
 /**
- * Set a RDMHandler to run when receiving a RDM message.
- * @param handler the callback to invoke when there is rdm data for this
+ * Set an RDMMessageHandler to run when receiving a RDM message.
+ * @param handler the callback to invoke when there is RDM data for this
  * universe.
  */
 void RDMInflator::SetRDMHandler(RDMMessageHandler *handler) {
   m_rdm_handler.reset(handler);
 }
 
 
+/**
+ * Set a GenericRDMHandler to run when receiving a RDM message.
+ * @param handler the callback to invoke when there is RDM data for this
+ * universe.
+ */
+void RDMInflator::SetGenericRDMHandler(GenericRDMMessageHandler *handler) {
+  m_generic_rdm_handler.reset(handler);
+}
+
+
 /*
  * Decode the RDM 'header', which is 0 bytes in length.
  * @param headers the HeaderSet to add to
@@ -76,11 +87,13 @@ bool RDMInflator::HandlePDUData(uint32_t vector,
 
   string rdm_message(reinterpret_cast<const char*>(&data[0]), pdu_len);
 
-  E133Header e133_header = headers.GetE133Header();
-
   if (m_rdm_handler.get()) {
+    E133Header e133_header = headers.GetE133Header();
+
     m_rdm_handler->Run(&headers.GetTransportHeader(), &e133_header,
                        rdm_message);
+  } else if (m_generic_rdm_handler.get()) {
+    m_generic_rdm_handler->Run(&headers, rdm_message);
   } else {
     OLA_WARN << "No RDM handler defined!";
   }

libs/acn/RDMInflator.h

@@ -41,12 +41,18 @@ class RDMInflator: public BaseInflator {
                            const std::string&  // rdm data
                           > RDMMessageHandler;
 
-    RDMInflator();
+    typedef ola::Callback2<void,
+                           const HeaderSet*,  // the HeaderSet
+                           const std::string&  // rdm data
+                          > GenericRDMMessageHandler;
+
+    RDMInflator(unsigned int vector = ola::acn::VECTOR_FRAMING_RDMNET);
     ~RDMInflator() {}
 
-    uint32_t Id() const { return ola::acn::VECTOR_FRAMING_RDMNET; }
+    uint32_t Id() const { return m_vector; }
 
     void SetRDMHandler(RDMMessageHandler *handler);
+    void SetGenericRDMHandler(GenericRDMMessageHandler *handler);
 
     static const unsigned int VECTOR_RDMNET_DATA = 0xcc;
 
@@ -65,6 +71,8 @@ class RDMInflator: public BaseInflator {
 
  private:
     std::auto_ptr<RDMMessageHandler> m_rdm_handler;
+    std::auto_ptr<GenericRDMMessageHandler> m_generic_rdm_handler;
+    unsigned int m_vector;
 };
 }  // namespace acn
 }  // namespace ola