[Commit-gnuradio] [gnuradio] 13/46: zeromq: renamed sink_pushpull push_sink

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 687b81073d4997a73183cd69b2c467ea728a5ef1
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 21 10:48:29 2014 -0700

    zeromq: renamed sink_pushpull push_sink
---
 gr-zeromq/examples/client.py                                 |  2 +-
 gr-zeromq/examples/loop.py                                   |  4 ++--
 gr-zeromq/examples/server.py                                 |  4 ++--
 gr-zeromq/grc/CMakeLists.txt                                 |  2 +-
 .../grc/{zeromq_sink_pushpull.xml => zeromq_push_sink.xml}   |  6 +++---
 gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt             |  2 +-
 .../include/gnuradio/zeromq/{sink_pushpull.h => push_sink.h} | 12 ++++++------
 gr-zeromq/lib/CMakeLists.txt                                 |  2 +-
 gr-zeromq/lib/{sink_pushpull_impl.cc => push_sink_impl.cc}   |  0
 gr-zeromq/lib/{sink_pushpull_impl.h => push_sink_impl.h}     |  0
 gr-zeromq/swig/zeromq_swig.i                                 |  6 +++---
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gr-zeromq/examples/client.py b/gr-zeromq/examples/client.py
index 5c1a8e2..2abb7dc 100755
--- a/gr-zeromq/examples/client.py
+++ b/gr-zeromq/examples/client.py
@@ -55,7 +55,7 @@ class top_block(gr.top_block):
         #self.zmq_source = 
zeromq.source_reqrep_nopoll(gr.sizeof_float,source_adr)
         self.zmq_source = zeromq.source_reqrep(gr.sizeof_float,source_adr)
         #self.zmq_source = zeromq.source_pushpull(gr.sizeof_float,source_adr)
-        #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float,probe_adr)
+        #self.zmq_probe = zeromq.push_sink(gr.sizeof_float,probe_adr)
         self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float,probe_adr)
 
         # connects
diff --git a/gr-zeromq/examples/loop.py b/gr-zeromq/examples/loop.py
index 2d6d750..1f76b47 100755
--- a/gr-zeromq/examples/loop.py
+++ b/gr-zeromq/examples/loop.py
@@ -77,8 +77,8 @@ class top_block(gr.top_block):
         self.add = blocks.add_ff(1)
         #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr)
         #self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr)
-        self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr)
-        self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr_fg)
+        self.zmq_sink = zeromq.push_sink(gr.sizeof_float, sink_adr)
+        self.zmq_probe = zeromq.push_sink(gr.sizeof_float, probe_adr_fg)
         #self.null_sink = blocks.null_sink(gr.sizeof_float)
 
         # connects
diff --git a/gr-zeromq/examples/server.py b/gr-zeromq/examples/server.py
index 34823ea..70fe3a5 100755
--- a/gr-zeromq/examples/server.py
+++ b/gr-zeromq/examples/server.py
@@ -60,8 +60,8 @@ class top_block(gr.top_block):
         self.mult = blocks.multiply_const_ff(1)
         #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr)
         self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr)
-        #self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr)
-        #self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr)
+        #self.zmq_sink = zeromq.push_sink(gr.sizeof_float, sink_adr)
+        #self.zmq_probe = zeromq.push_sink(gr.sizeof_float, probe_adr)
         self.zmq_probe = zeromq.sink_pubsub(gr.sizeof_float, probe_adr)
         #self.null_sink = blocks.null_sink(gr.sizeof_float)
 
diff --git a/gr-zeromq/grc/CMakeLists.txt b/gr-zeromq/grc/CMakeLists.txt
index 42ccfa5..4bb5140 100644
--- a/gr-zeromq/grc/CMakeLists.txt
+++ b/gr-zeromq/grc/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 install(FILES
     zeromq_sink_pubsub.xml
-    zeromq_sink_pushpull.xml
+    zeromq_push_sink.xml
     zeromq_source_pushpull.xml
 
     DESTINATION share/gnuradio/grc/blocks
diff --git a/gr-zeromq/grc/zeromq_sink_pushpull.xml 
b/gr-zeromq/grc/zeromq_push_sink.xml
similarity index 88%
rename from gr-zeromq/grc/zeromq_sink_pushpull.xml
rename to gr-zeromq/grc/zeromq_push_sink.xml
index 173f4a5..15069c7 100644
--- a/gr-zeromq/grc/zeromq_sink_pushpull.xml
+++ b/gr-zeromq/grc/zeromq_push_sink.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
-  <name>ZMQ PUSH/PULL Sink</name>
-  <key>zeromq_sink_pushpull</key>
+  <name>ZMQ PUSH Sink</name>
+  <key>zeromq_push_sink</key>
   <category>ZeroMQ Interfaces</category>
   <import>from gnuradio import zeromq</import>
-  <make>zeromq.sink_pushpull($type.itemsize, $address, $blocking)</make>
+  <make>zeromq.push_sink($type.itemsize, $address, $blocking)</make>
 
   <param>
     <name>IO Type</name>
diff --git a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt 
b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
index c23b9d6..767a547 100644
--- a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
+++ b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
@@ -23,7 +23,7 @@
 install(FILES
   api.h
   sink_pubsub.h
-  sink_pushpull.h
+  push_sink.h
   sink_reqrep.h
   sink_reqrep_nopoll.h
   source_pushpull_feedback.h
diff --git a/gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h 
b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
similarity index 87%
rename from gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h
rename to gr-zeromq/include/gnuradio/zeromq/push_sink.h
index 1ca8a15..cffe2d3 100644
--- a/gr-zeromq/include/gnuradio/zeromq/sink_pushpull.h
+++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_ZEROMQ_SINK_PUSHPULL_H
-#define INCLUDED_ZEROMQ_SINK_PUSHPULL_H
+#ifndef INCLUDED_ZEROMQ_PUSH_SINK_H
+#define INCLUDED_ZEROMQ_PUSH_SINK_H
 
 #include <gnuradio/zeromq/api.h>
 #include <gnuradio/sync_block.h>
@@ -41,13 +41,13 @@ namespace gr {
      * non-GNU Radio ZMQ socket.
      *
      */
-    class ZEROMQ_API sink_pushpull : virtual public gr::sync_block
+    class ZEROMQ_API push_sink : virtual public gr::sync_block
     {
     public:
-      typedef boost::shared_ptr<sink_pushpull> sptr;
+      typedef boost::shared_ptr<push_sink> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of 
gr::zeromq::sink_pushpull
+       * \brief Return a shared_ptr to a new instance of gr::zeromq::push_sink
        *
        * \param itemsize Size of a stream item in bytes
        * \param address  ZMQ socket address specifier
@@ -60,4 +60,4 @@ namespace gr {
   } // namespace zeromq
 } // namespace gr
 
-#endif /* INCLUDED_ZEROMQ_SINK_PUSHPULL_H */
+#endif /* INCLUDED_ZEROMQ_PUSH_SINK_H */
diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt
index 54c87c6..a285bea 100644
--- a/gr-zeromq/lib/CMakeLists.txt
+++ b/gr-zeromq/lib/CMakeLists.txt
@@ -39,7 +39,7 @@ endif(ENABLE_GR_CTRLPORT)
 ########################################################################
 list(APPEND zeromq_sources
   sink_pubsub_impl.cc
-  sink_pushpull_impl.cc
+  push_sink_impl.cc
   sink_reqrep_impl.cc
   sink_reqrep_nopoll_impl.cc
   source_pushpull_feedback_impl.cc
diff --git a/gr-zeromq/lib/sink_pushpull_impl.cc 
b/gr-zeromq/lib/push_sink_impl.cc
similarity index 100%
rename from gr-zeromq/lib/sink_pushpull_impl.cc
rename to gr-zeromq/lib/push_sink_impl.cc
diff --git a/gr-zeromq/lib/sink_pushpull_impl.h b/gr-zeromq/lib/push_sink_impl.h
similarity index 100%
rename from gr-zeromq/lib/sink_pushpull_impl.h
rename to gr-zeromq/lib/push_sink_impl.h
diff --git a/gr-zeromq/swig/zeromq_swig.i b/gr-zeromq/swig/zeromq_swig.i
index 780f9d9..1c4d925 100644
--- a/gr-zeromq/swig/zeromq_swig.i
+++ b/gr-zeromq/swig/zeromq_swig.i
@@ -29,7 +29,7 @@
 
 %{
 #include "gnuradio/zeromq/sink_pubsub.h"
-#include "gnuradio/zeromq/sink_pushpull.h"
+#include "gnuradio/zeromq/push_sink.h"
 #include "gnuradio/zeromq/sink_reqrep.h"
 #include "gnuradio/zeromq/sink_reqrep_nopoll.h"
 #include "gnuradio/zeromq/source_pushpull_feedback.h"
@@ -39,7 +39,7 @@
 %}
 
 %include "gnuradio/zeromq/sink_pubsub.h"
-%include "gnuradio/zeromq/sink_pushpull.h"
+%include "gnuradio/zeromq/push_sink.h"
 %include "gnuradio/zeromq/sink_reqrep.h"
 %include "gnuradio/zeromq/sink_reqrep_nopoll.h"
 %include "gnuradio/zeromq/source_pushpull_feedback.h"
@@ -48,7 +48,7 @@
 %include "gnuradio/zeromq/source_reqrep_nopoll.h"
 
 GR_SWIG_BLOCK_MAGIC2(zeromq, sink_pubsub);
-GR_SWIG_BLOCK_MAGIC2(zeromq, sink_pushpull);
+GR_SWIG_BLOCK_MAGIC2(zeromq, push_sink);
 GR_SWIG_BLOCK_MAGIC2(zeromq, sink_reqrep);
 GR_SWIG_BLOCK_MAGIC2(zeromq, sink_reqrep_nopoll);
 GR_SWIG_BLOCK_MAGIC2(zeromq, source_pushpull_feedback);