diff --git a/acn/appliance.cpp b/acn/appliance.cpp index 85d5a14..c1e47f4 100644 --- a/acn/appliance.cpp +++ b/acn/appliance.cpp @@ -39,7 +39,7 @@ namespace ACN { Appliance::Appliance(UUID::uuid cid) : Component(cid) { - assignUserName("libESTA ACN Appliance"); + fctn_ = "libESTA ACN Appliance"; RlpRegisterVectorHandler(SDT::SDT_PROTOCOL_ID, std::bind(&Appliance::SdtReceiver, this, diff --git a/acn/component.h b/acn/component.h index 09d8d99..328d463 100644 --- a/acn/component.h +++ b/acn/component.h @@ -50,26 +50,27 @@ public: void assignUserName(const std::string s) { uacn_ = s; } +protected: + // EPI 19: ACN Discovery on IP Networks + // 3. Component Name Strings + // Each component shall maintain two text identifier strings intended to + // indicate the function of the component in human readable terms for browsing + // purposes. + + /** + * @brief 3.1. Fixed Component Type Name (FCTN) + * shall be a UTF-8 string that is assigned during manufacture. + */ + std::string fctn_; + + /** + * @brief 3.2. User Assigned Component Name (UACN) + * shall be a UTF-8 string that may be assigned by the user. + */ + std::string uacn_; + private: const UUID::uuid cid_; - -// EPI 19: ACN Discovery on IP Networks -// 3. Component Name Strings -// Each component shall maintain two text identifier strings intended to -// indicate the function of the component in human readable terms for browsing -// purposes. - - /** - * @brief 3.1. Fixed Component Type Name (FCTN) - * shall be a UTF-8 string that is assigned during manufacture. - */ - const std::string fctn_; - - /** - * @brief 3.2. User Assigned Component Name (UACN) - * shall be a UTF-8 string that may be assigned by the user. - */ - std::string uacn_; }; }; // ACN diff --git a/sacn/node.cpp b/sacn/node.cpp index f73325d..e672ed4 100644 --- a/sacn/node.cpp +++ b/sacn/node.cpp @@ -5,7 +5,7 @@ namespace SACN { Node::Node(UUID::uuid cid) : Appliance(cid) { - assignUserName("libESTA sACN Node"); + fctn_ = "libESTA sACN Node"; } } // SACN diff --git a/sacn/receiver.cpp b/sacn/receiver.cpp index 85885a4..4de4517 100644 --- a/sacn/receiver.cpp +++ b/sacn/receiver.cpp @@ -35,7 +35,7 @@ namespace SACN { Receiver::Receiver(UUID::uuid cid) : Appliance(cid) { - assignUserName("libESTA sACN Receiver"); + fctn_ = "libESTA sACN Receiver"; RlpRegisterVectorHandler(VECTOR_ROOT_E131_DATA, std::bind(&Receiver::dataReceiver, this, std::placeholders::_1)); diff --git a/sacn/source.cpp b/sacn/source.cpp index d723a3c..b1b9d85 100644 --- a/sacn/source.cpp +++ b/sacn/source.cpp @@ -32,7 +32,7 @@ namespace SACN { Source::Source(UUID::uuid cid) : Appliance(cid) { - assignUserName("libESTA sACN Source"); + fctn_ = "libESTA sACN Source"; }