rename ACN::RLP::Appliance -> ACN::RLP::Component

platform/qt/qsacnnode.cpp

@@ -11,7 +11,7 @@
  * @param cid
  */
 QSacnNode::QSacnNode(QObject *parent, QUuid cid)
-    : Appliance(UUID::uuid(cid.toString().toStdString()))
+    : Component(UUID::uuid(cid.toString().toStdString()))
     , QUdpSocket(parent)
 {
     fctn_ = "OpenLCP QSacnNode";

protocols/llrp/manager.cpp

@@ -31,7 +31,7 @@ namespace RDMnet::LLRP {
  * @brief Manager::Manager
  */
 Manager::Manager(UUID::uuid cid)
-  : ACN::RLP::Appliance(cid)
+  : ACN::RLP::Component(cid)
 {
   fctn_ = "OpenLCP LLRP Manager";
 

protocols/llrp/manager.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "llrp.h"
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 
 namespace RDMnet::LLRP {
 
@@ -35,7 +35,7 @@ namespace RDMnet::LLRP {
  * configuration tool equipment.
  */
 class Manager
-    : public ACN::RLP::Appliance
+    : public ACN::RLP::Component
 {
 public:
   Manager(UUID::uuid = UUID::uuid());

protocols/rdmnet/implementation.cpp

@@ -31,7 +31,7 @@ namespace RDMnet {
  * @param cid
  */
 Implementation::Implementation(UUID::uuid cid, RDM::UID uid)
-  : ACN::RLP::Appliance(cid)
+  : ACN::RLP::Component(cid)
   , RDM::Responder(uid)
   , LLRP::Target()
 {

protocols/rdmnet/implementation.h

@@ -23,14 +23,14 @@
 */
 #pragma once
 
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 #include "rdm/responder.h"
 #include "llrp/target.h"
 
 namespace RDMnet {
 
 class Implementation
-    : public ACN::RLP::Appliance
+    : public ACN::RLP::Component
     , public RDM::Responder
     , public LLRP::Target
 {

protocols/rlp/CMakeLists.txt

@@ -1,8 +1,8 @@
 target_sources(${PROJECT_NAME}
     PUBLIC
-        rlp/appliance.h
+        rlp/component.h
     PRIVATE
-        rlp/appliance.cpp
+        rlp/component.cpp
         rlp/rlp.cpp
         rlp/rlp.h
         rlp/tcp.cpp

protocols/rlp/component.cpp

@@ -1,5 +1,5 @@
 /*
-  rlp/appliance.h
+  rlp/component.h
 
   Copyright (c) 2021 Kevin Matz (kevin.matz@gmail.com)
 
@@ -22,31 +22,30 @@
   SOFTWARE.
 */
 
-#include "appliance.h"
-
-#include "udp.h"
+#include "component.h"
 #include "tcp.h"
+#include "udp.h"
 
 namespace ACN::RLP {
 
 /**
- * @brief Appliance::Appliance
+ * @brief Component::Component
  * @param cid
  */
-Appliance::Appliance(UUID::uuid cid)
+Component::Component(UUID::uuid cid)
   : ACN::Component(cid)
 {
-  fctn_ = "OpenLCP ACN Appliance";
+  fctn_ = "OpenLCP RLP Component";
 };
 
 
 /**
- * @brief Appliance::UdpPayloadReceiver
+ * @brief Component::UdpPayloadReceiver
  * @param stream
  *
  * EPI 17
  */
-void Appliance::UdpPayloadReceiver(PDU::Stream stream)
+void Component::UdpPayloadReceiver(PDU::Stream stream)
 {
   auto transport = RLP::UDP::transport();
   transport.iStream(stream);
@@ -58,12 +57,12 @@ void Appliance::UdpPayloadReceiver(PDU::Stream stream)
 
 
 /**
- * @brief Appliance::TcpPacketReceiver
+ * @brief Component::TcpPacketReceiver
  * @param stream
  *
  * EPI 33
  */
-void Appliance::TcpPacketReceiver(PDU::Stream stream)
+void Component::TcpPacketReceiver(PDU::Stream stream)
 {
   auto transport = RLP::TCP::transport();
   transport.iStream(stream);
@@ -75,12 +74,12 @@ void Appliance::TcpPacketReceiver(PDU::Stream stream)
 
 
 /**
- * @brief Appliance::RlpReceiver
+ * @brief Component::RlpReceiver
  * @param root
  *
  * Dispatch a recieved RLP PDU to the appropriate vector handlers.
  */
-void Appliance::RlpReceiver(PDU::Message<RLP::Pdu> root)
+void Component::RlpReceiver(PDU::Message<RLP::Pdu> root)
 {
   /// To this point, the data segment of the RLP PDU will not have been read.
   /// The root PDU must have not failed, and still have bytes available to read.
@@ -94,13 +93,13 @@ void Appliance::RlpReceiver(PDU::Message<RLP::Pdu> root)
 
 
 /**
- * @brief Appliance::RlpRegisterVectorHandler
+ * @brief Component::RlpRegisterVectorHandler
  * @param vect
  * @param handle
  *
  * Add callback handler for a given RLP vector.
  */
-void Appliance::RlpRegisterVector(uint32_t vect, PDU::Handler<RLP::Pdu> handle)
+void Component::RlpRegisterVector(uint32_t vect, PDU::Handler<RLP::Pdu> handle)
 {
   rlp_vectors_[vect].push_back(handle);
 }

protocols/rlp/component.h

@@ -1,5 +1,5 @@
 /*
-  rlp/appliance.h
+  rlp/component.h
 
   Copyright (c) 2021 Kevin Matz (kevin.matz@gmail.com)
 
@@ -31,20 +31,21 @@
 #include <memory>
 #include <vector>
 
-// root device: An instance of a device described in DDL that has no parent
-//   device. See also appliance.
-
 
 namespace ACN::RLP {
 
 /**
- * @brief The Appliance class
+ * @brief The RLP::Component class
+ *
+ * The process, program or application corresponding to a single ACN endpoint.
+ * All messages in ACN are sent and received by a component which is identified
+ * by a CID.
  */
-class Appliance
+class Component
   : public ACN::Component
 {
 public:
-  Appliance(UUID::uuid = UUID::uuid());
+  Component(UUID::uuid = UUID::uuid());
 
   // EPI 17 - ACN RLP on UDP
   virtual void UdpPayloadReceiver(PDU::Stream);

protocols/sacn/node.cpp

@@ -3,7 +3,7 @@
 namespace SACN {
 
 Node::Node(UUID::uuid cid)
-    : Appliance(cid)
+    : Component(cid)
 {
   fctn_ = "OpenLCP sACN Node";
 }

protocols/sacn/receiver.cpp

@@ -35,7 +35,7 @@ namespace SACN {
  * Constructor.  Register RLP vector callbacks.
  */
 Receiver::Receiver(UUID::uuid cid)
-  : Appliance(cid)
+  : Component(cid)
 {
   fctn_ = "OpenLCP sACN Receiver";
 

protocols/sacn/receiver.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 #include "data.h"
 #include "extended.h"
 #include "sacn.h"
@@ -35,7 +35,7 @@
 namespace SACN {
 
 class Receiver
-  : public virtual ACN::RLP::Appliance
+  : public virtual ACN::RLP::Component
 {
 public:
   Receiver(UUID::uuid = UUID::uuid());

protocols/sacn/source.cpp

@@ -30,7 +30,7 @@ namespace SACN {
  * @param cid
  */
 Source::Source(UUID::uuid cid)
-    : Appliance(cid)
+    : Component(cid)
 {
   fctn_ = "OpenLCP sACN Source";
 }

protocols/sacn/source.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 #include "sacn.h"
 #include "universe.h"
 
@@ -33,7 +33,7 @@ namespace SACN {
 
 
 class Source
-    : public virtual ACN::RLP::Appliance
+    : public virtual ACN::RLP::Component
 {
 public:
     Source(UUID::uuid = UUID::uuid());

protocols/sdt/leader.cpp

@@ -31,7 +31,7 @@ namespace ACN::SDT {
  * @param cid
  */
 Leader::Leader(UUID::uuid cid)
-  : ACN::RLP::Appliance(cid)
+  : ACN::RLP::Component(cid)
 {
   fctn_ = "OpenLCP SDT Leader";
 

protocols/sdt/leader.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "session.h"
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 
 #include <vector>
 #include <memory>
@@ -32,7 +32,7 @@
 namespace ACN::SDT {
 
 class Leader
-    : public ACN::RLP::Appliance
+    : public ACN::RLP::Component
 {
 public:
   Leader(UUID::uuid = UUID::uuid());

protocols/sdt/member.cpp

@@ -32,7 +32,7 @@ namespace ACN::SDT {
  * @param cid
  */
 Member::Member(UUID::uuid cid)
-  : ACN::RLP::Appliance(cid)
+  : ACN::RLP::Component(cid)
 {
   fctn_ = "OpenLCP SDT Member";
 

protocols/sdt/member.h

@@ -23,12 +23,12 @@
 */
 #pragma once
 
-#include "rlp/appliance.h"
+#include "rlp/component.h"
 
 namespace ACN::SDT {
 
 class Member
-    : public ACN::RLP::Appliance
+    : public ACN::RLP::Component
 {
 public:
   Member(UUID::uuid = UUID::uuid());