diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-25 19:54:00 +0200 | 
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-06-25 19:54:15 +0200 | 
| commit | 5e5d45c6afe3f6cae696320acfdf6875324c994c (patch) | |
| tree | 3f49969e2b24834e2050271a3efe0abe4bb6a74c /src | |
| parent | 74192c72bf675a5cbd6f4f52df042992b10c31f5 (diff) | |
| parent | 01505ec9fba630e039b1f25d65cf2dfc69d6088c (diff) | |
| download | dabmod-5e5d45c6afe3f6cae696320acfdf6875324c994c.tar.gz dabmod-5e5d45c6afe3f6cae696320acfdf6875324c994c.tar.bz2 dabmod-5e5d45c6afe3f6cae696320acfdf6875324c994c.zip  | |
Merge 'raspine/master' with ZMQ RC fixes into next
Diffstat (limited to 'src')
| -rw-r--r-- | src/RemoteControl.cpp | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp index 666f891..21a6c81 100644 --- a/src/RemoteControl.cpp +++ b/src/RemoteControl.cpp @@ -310,7 +310,7 @@ void RemoteControllerZmq::process()  {      // create zmq reply socket for receiving ctrl parameters      zmq::socket_t repSocket(m_zmqContext, ZMQ_REP); -    std::cout << "Starting zmq remote control thread" << std::endl; +    std::cerr << "Starting zmq remote control thread" << std::endl;      try      {          // connect the socket @@ -344,10 +344,9 @@ void RemoteControllerZmq::process()                      try                      {                          std::string value = get_param_(module, parameter); -                        zmq::message_t *pMsg = new zmq::message_t(value.size()); -                        memcpy ((void*) pMsg->data(), value.data(), value.size()); -                        repSocket.send(*pMsg, 0); -                        delete pMsg; +                        zmq::message_t msg(value.size()); +                        memcpy ((void*) msg.data(), value.data(), value.size()); +                        repSocket.send(&msg, 0);                      }                      catch (ParameterError &err)                      {  | 
