1 files changed, 60 insertions, 62 deletions
diff --git a/gr-zeromq/lib/sub_msg_source_impl.cc b/gr-zeromq/lib/sub_msg_source_impl.cc
index 3a08499b12..3a9fb906da 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.cc
+++ b/gr-zeromq/lib/sub_msg_source_impl.cc
@@ -31,86 +31,84 @@
 #include "tag_headers.h"
 
 namespace gr {
-  namespace zeromq {
+namespace zeromq {
 
-    sub_msg_source::sptr
-    sub_msg_source::make(char *address, int timeout)
-    {
-      return gnuradio::get_initial_sptr
-        (new sub_msg_source_impl(address, timeout));
-    }
+sub_msg_source::sptr sub_msg_source::make(char* address, int timeout)
+{
+    return gnuradio::get_initial_sptr(new sub_msg_source_impl(address, timeout));
+}
 
-    sub_msg_source_impl::sub_msg_source_impl(char *address, int timeout)
-      : gr::block("sub_msg_source",
-                  gr::io_signature::make(0, 0, 0),
-                  gr::io_signature::make(0, 0, 0)),
+sub_msg_source_impl::sub_msg_source_impl(char* address, int timeout)
+    : gr::block("sub_msg_source",
+                gr::io_signature::make(0, 0, 0),
+                gr::io_signature::make(0, 0, 0)),
       d_timeout(timeout),
       d_port(pmt::mp("out"))
-    {
-      int major, minor, patch;
-      zmq::version(&major, &minor, &patch);
-
-      if (major < 3) {
-        d_timeout = timeout*1000;
-      }
-
-      d_context = new zmq::context_t(1);
-      d_socket = new zmq::socket_t(*d_context, ZMQ_SUB);
-
-      d_socket->setsockopt(ZMQ_SUBSCRIBE, "", 0);
-      d_socket->connect (address);
-
-      message_port_register_out(d_port);
-    }
+{
+    int major, minor, patch;
+    zmq::version(&major, &minor, &patch);
 
-    sub_msg_source_impl::~sub_msg_source_impl()
-    {
-      d_socket->close();
-      delete d_socket;
-      delete d_context;
+    if (major < 3) {
+        d_timeout = timeout * 1000;
     }
 
-    bool sub_msg_source_impl::start()
-    {
-      d_finished = false;
-      d_thread = new boost::thread(boost::bind(&sub_msg_source_impl::readloop, this));
-      return true;
-    }
-
-    bool sub_msg_source_impl::stop()
-    {
-      d_finished = true;
-      d_thread->join();
-      return true;
-    }
-
-    void sub_msg_source_impl::readloop()
-    {
-      while(!d_finished){
-
-        zmq::pollitem_t items[] = { { static_cast<void *>(*d_socket), 0, ZMQ_POLLIN, 0 } };
+    d_context = new zmq::context_t(1);
+    d_socket = new zmq::socket_t(*d_context, ZMQ_SUB);
+
+    d_socket->setsockopt(ZMQ_SUBSCRIBE, "", 0);
+    d_socket->connect(address);
+
+    message_port_register_out(d_port);
+}
+
+sub_msg_source_impl::~sub_msg_source_impl()
+{
+    d_socket->close();
+    delete d_socket;
+    delete d_context;
+}
+
+bool sub_msg_source_impl::start()
+{
+    d_finished = false;
+    d_thread = new boost::thread(boost::bind(&sub_msg_source_impl::readloop, this));
+    return true;
+}
+
+bool sub_msg_source_impl::stop()
+{
+    d_finished = true;
+    d_thread->join();
+    return true;
+}
+
+void sub_msg_source_impl::readloop()
+{
+    while (!d_finished) {
+
+        zmq::pollitem_t items[] = { { static_cast<void*>(*d_socket), 0, ZMQ_POLLIN, 0 } };
         zmq::poll(&items[0], 1, d_timeout);
 
         //  If we got a reply, process
         if (items[0].revents & ZMQ_POLLIN) {
 
-          // Receive data
-          zmq::message_t msg;
+            // Receive data
+            zmq::message_t msg;
 #if USE_NEW_CPPZMQ_SEND_RECV
-          d_socket->recv(msg);
+            d_socket->recv(msg);
 #else
-          d_socket->recv(&msg);
+            d_socket->recv(&msg);
 #endif
-          std::string buf(static_cast<char*>(msg.data()), msg.size());
-          std::stringbuf sb(buf);
-          pmt::pmt_t m = pmt::deserialize(sb);
+            std::string buf(static_cast<char*>(msg.data()), msg.size());
+            std::stringbuf sb(buf);
+            pmt::pmt_t m = pmt::deserialize(sb);
 
-          message_port_pub(d_port, m);
+            message_port_pub(d_port, m);
         } else {
-          boost::this_thread::sleep(boost::posix_time::microseconds(100));
+            boost::this_thread::sleep(boost::posix_time::microseconds(100));
         }
-      }
     }
+}
 
-  } /* namespace zeromq */
+} /* namespace zeromq */
 } /* namespace gr */