summaryrefslogtreecommitdiffstats
path: root/src/RemoteControl.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-04-20 12:56:09 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-04-20 12:56:09 +0200
commit6b68f5862eadbe0bd37254435619ba92ee834635 (patch)
treeb6e4a8efd0e258e1c90616aa79de091c89899151 /src/RemoteControl.h
parent4de1e587d973c9bfcc52155f778a33fa9c969c83 (diff)
downloaddabmux-6b68f5862eadbe0bd37254435619ba92ee834635.tar.gz
dabmux-6b68f5862eadbe0bd37254435619ba92ee834635.tar.bz2
dabmux-6b68f5862eadbe0bd37254435619ba92ee834635.zip
Update RemoteControl, taking changes from ODR-DabMod
Diffstat (limited to 'src/RemoteControl.h')
-rw-r--r--src/RemoteControl.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/RemoteControl.h b/src/RemoteControl.h
index d8b3b6b..62299b0 100644
--- a/src/RemoteControl.h
+++ b/src/RemoteControl.h
@@ -94,7 +94,7 @@ class BaseRemoteController {
class RemoteControllable {
public:
RemoteControllable(const std::string& name) :
- m_name(name) {}
+ m_rc_name(name) {}
RemoteControllable(const RemoteControllable& other) = delete;
RemoteControllable& operator=(const RemoteControllable& other) = delete;
@@ -105,7 +105,7 @@ class RemoteControllable {
* It might be used in the commands the user has to type, so keep
* it short
*/
- virtual std::string get_rc_name() const { return m_name; }
+ virtual std::string get_rc_name() const { return m_rc_name; }
/* Return a list of possible parameters that can be set */
virtual std::list<std::string> get_supported_parameters() const;
@@ -126,7 +126,7 @@ class RemoteControllable {
virtual const std::string get_parameter(const std::string& parameter) const = 0;
protected:
- std::string m_name;
+ std::string m_rc_name;
std::list< std::vector<std::string> > m_parameters;
};
@@ -254,9 +254,9 @@ class RemoteControllerTelnet : public BaseRemoteController {
/* This is set to true if a fault occurred */
std::atomic<bool> m_fault;
- boost::thread m_restarter_thread;
+ std::thread m_restarter_thread;
- boost::thread m_child_thread;
+ std::thread m_child_thread;
int m_port;
};
@@ -299,12 +299,12 @@ class RemoteControllerZmq : public BaseRemoteController {
/* This is set to true if a fault occurred */
std::atomic<bool> m_fault;
- boost::thread m_restarter_thread;
+ std::thread m_restarter_thread;
zmq::context_t m_zmqContext;
std::string m_endpoint;
- boost::thread m_child_thread;
+ std::thread m_child_thread;
};
#endif