From ac074ac552a6e9b0698cadfdb5174787800ecd4c Mon Sep 17 00:00:00 2001 From: KuntzeM Date: Sat, 28 Mar 2020 17:51:19 +0100 Subject: Revert "add linkage set activator flag to remote controllable" This reverts commit fc1f1640278e7eb228ec1a6290d30b95f1b6a476. --- src/MuxElements.cpp | 49 ++++++++++++------------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) (limited to 'src/MuxElements.cpp') diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index 70930cb..cb2d545 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -805,11 +805,22 @@ size_t DabSubchannel::readFrame(uint8_t *buffer, size_t size, std::time_t second throw logic_error("Unhandled case"); } +LinkageSet::LinkageSet(const std::string& name, + uint16_t lsn, + bool active, + bool hard, + bool international) : + lsn(lsn), + active(active), + hard(hard), + international(international), + m_name(name) +{} LinkageSet LinkageSet::filter_type(const ServiceLinkType type) { - LinkageSet lsd(m_rc_name, lsn, active, hard, international); + LinkageSet lsd(m_name, lsn, active, hard, international); lsd.active = active; lsd.keyservice = keyservice; @@ -822,39 +833,3 @@ LinkageSet LinkageSet::filter_type(const ServiceLinkType type) return lsd; } - - -void LinkageSet::set_parameter(const string& parameter, - const string& value) -{ - if (parameter == "active") { - stringstream ss; - ss << value; - - lock_guard lock(m_active_mutex); - ss >> active; - } - else { - stringstream ss; - ss << "Parameter '" << parameter << - "' is not exported by controllable " << get_rc_name(); - throw ParameterError(ss.str()); - } -} - -const string LinkageSet::get_parameter(const string& parameter) const -{ - using namespace std::chrono; - - stringstream ss; - if (parameter == "active") { - lock_guard lock(m_active_mutex); - ss << active; - } - else { - ss << "Parameter '" << parameter << - "' is not exported by controllable " << get_rc_name(); - throw ParameterError(ss.str()); - } - return ss.str(); -} -- cgit v1.2.3