[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Tue, 13 Jan 2015 01:04:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 318e3f4b1495141551e94191f51bf4045507cb44
Merge: b3254e5 1581681
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 12 17:01:42 2015 -0800
Merge branch 'master' into next
gr-filter/lib/pfb_arb_resampler.cc | 18 +-
gr-filter/python/filter/qa_pfb_arb_resampler.py | 10 +-
gr-zeromq/examples/CMakeLists.txt | 2 +
gr-zeromq/examples/zmq_msg.grc | 465 +++++
gr-zeromq/examples/zmq_stream.grc | 1932 ++++++++++++++++++++
gr-zeromq/grc/CMakeLists.txt | 6 +
gr-zeromq/grc/zeromq_pub_msg_sink.xml | 28 +
gr-zeromq/grc/zeromq_pub_sink.xml | 9 +-
gr-zeromq/grc/zeromq_pull_msg_source.xml | 28 +
gr-zeromq/grc/zeromq_pull_source.xml | 9 +-
gr-zeromq/grc/zeromq_push_msg_sink.xml | 28 +
gr-zeromq/grc/zeromq_push_sink.xml | 9 +-
gr-zeromq/grc/zeromq_rep_msg_sink.xml | 28 +
gr-zeromq/grc/zeromq_rep_sink.xml | 9 +-
gr-zeromq/grc/zeromq_req_msg_source.xml | 28 +
gr-zeromq/grc/zeromq_req_source.xml | 9 +-
gr-zeromq/grc/zeromq_sub_msg_source.xml | 28 +
gr-zeromq/grc/zeromq_sub_source.xml | 9 +-
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 6 +
.../gnuradio/zeromq/{pub_sink.h => pub_msg_sink.h} | 26 +-
gr-zeromq/include/gnuradio/zeromq/pub_sink.h | 2 +-
.../zeromq/{sub_source.h => pull_msg_source.h} | 24 +-
gr-zeromq/include/gnuradio/zeromq/pull_source.h | 2 +-
.../zeromq/{sub_source.h => push_msg_sink.h} | 26 +-
gr-zeromq/include/gnuradio/zeromq/push_sink.h | 2 +-
.../zeromq/{req_source.h => rep_msg_sink.h} | 29 +-
gr-zeromq/include/gnuradio/zeromq/rep_sink.h | 2 +-
.../zeromq/{req_source.h => req_msg_source.h} | 25 +-
gr-zeromq/include/gnuradio/zeromq/req_source.h | 2 +-
.../zeromq/{sub_source.h => sub_msg_source.h} | 24 +-
gr-zeromq/include/gnuradio/zeromq/sub_source.h | 2 +-
gr-zeromq/lib/CMakeLists.txt | 7 +
.../lib/{pub_sink_impl.cc => pub_msg_sink_impl.cc} | 44 +-
.../lib/{push_sink_impl.h => pub_msg_sink_impl.h} | 20 +-
gr-zeromq/lib/pub_sink_impl.cc | 25 +-
gr-zeromq/lib/pub_sink_impl.h | 5 +-
gr-zeromq/lib/pull_msg_source_impl.cc | 111 ++
.../{pull_source_impl.h => pull_msg_source_impl.h} | 26 +-
gr-zeromq/lib/pull_source_impl.cc | 35 +-
gr-zeromq/lib/pull_source_impl.h | 3 +-
.../{pub_sink_impl.cc => push_msg_sink_impl.cc} | 48 +-
.../lib/{push_sink_impl.h => push_msg_sink_impl.h} | 20 +-
gr-zeromq/lib/push_sink_impl.cc | 36 +-
gr-zeromq/lib/push_sink_impl.h | 3 +-
gr-zeromq/lib/rep_msg_sink_impl.cc | 122 ++
.../lib/{push_sink_impl.h => rep_msg_sink_impl.h} | 27 +-
gr-zeromq/lib/rep_sink_impl.cc | 43 +-
gr-zeromq/lib/rep_sink_impl.h | 5 +-
gr-zeromq/lib/req_msg_source_impl.cc | 123 ++
.../{push_sink_impl.h => req_msg_source_impl.h} | 28 +-
gr-zeromq/lib/req_source_impl.cc | 34 +-
gr-zeromq/lib/req_source_impl.h | 5 +-
gr-zeromq/lib/sub_msg_source_impl.cc | 110 ++
.../{sub_source_impl.h => sub_msg_source_impl.h} | 27 +-
gr-zeromq/lib/sub_source_impl.cc | 39 +-
gr-zeromq/lib/sub_source_impl.h | 3 +-
gr-zeromq/lib/tag_headers.cc | 101 +
gr-zeromq/lib/{pub_sink_impl.h => tag_headers.h} | 39 +-
gr-zeromq/swig/zeromq_swig.i | 18 +
59 files changed, 3611 insertions(+), 323 deletions(-)