aboutsummaryrefslogtreecommitdiffstats
path: root/src/MuxElements.cpp
diff options
context:
space:
mode:
authorKuntzeM <github@kuntze.email>2020-03-28 17:51:19 +0100
committerKuntzeM <github@kuntze.email>2020-03-28 17:51:19 +0100
commitac074ac552a6e9b0698cadfdb5174787800ecd4c (patch)
treec803621f7713c39646f9f263aac387073e6f174b /src/MuxElements.cpp
parentf97de5d4b6b6d77dfbe7e50432a8b3057e9361f8 (diff)
downloaddabmux-ac074ac552a6e9b0698cadfdb5174787800ecd4c.tar.gz
dabmux-ac074ac552a6e9b0698cadfdb5174787800ecd4c.tar.bz2
dabmux-ac074ac552a6e9b0698cadfdb5174787800ecd4c.zip
Revert "add linkage set activator flag to remote controllable"
This reverts commit fc1f1640278e7eb228ec1a6290d30b95f1b6a476.
Diffstat (limited to 'src/MuxElements.cpp')
-rw-r--r--src/MuxElements.cpp49
1 files changed, 12 insertions, 37 deletions
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<mutex> 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<mutex> 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();
-}