[Commit-gnuradio] [gnuradio] 12/13: Merge remote-tracking branch 'tom/ctrlport_extending0'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e1290cc82397c0cd01b309d21aad2dcd0beb0f3f
Merge: b51f27b 1563fa4
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 17 10:06:26 2015 -0700

    Merge remote-tracking branch 'tom/ctrlport_extending0'

 .../include/gnuradio/rpccallbackregister_base.h    |    3 +
 .../include/gnuradio/rpcregisterhelpers.h          |  120 +-
 .../include/gnuradio/rpcserver_aggregator.h        |   29 +
 gnuradio-runtime/include/gnuradio/rpcserver_base.h |    5 +
 .../include/gnuradio/rpcserver_thrift.h            |   71 +-
 .../include/gnuradio/thrift_server_template.h      |    1 -
 .../lib/controlport/rpcserver_aggregator.cc        |   19 +
 .../lib/controlport/thrift/gnuradio.thrift         |    1 +
 .../lib/controlport/thrift/rpcserver_thrift.cc     |   74 +
 .../python/gnuradio/ctrlport/RPCConnection.py      |    3 +
 .../gnuradio/ctrlport/RPCConnectionThrift.py       |   17 +
 gr-blocks/examples/ctrlport/CMakeLists.txt         |   16 +-
 gr-blocks/examples/ctrlport/simple_copy.grc        |  772 ++++++++
 .../examples/ctrlport/simple_copy_controller.py    |   25 +
 .../examples/ctrlport/usrp_source_control.grc      | 1837 ++++++++++++++++++++
 .../examples/ctrlport/usrp_source_controller.py    |   29 +
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |    6 +-
 .../blocks/{add_const_XX.h.t => add_const_bb.h}    |   24 +-
 .../blocks/{add_const_XX.h.t => add_const_cc.h}    |   24 +-
 .../blocks/{add_const_XX.h.t => add_const_ff.h}    |   24 +-
 .../blocks/{add_const_XX.h.t => add_const_ii.h}    |   24 +-
 .../blocks/{add_const_XX.h.t => add_const_ss.h}    |   24 +-
 gr-blocks/lib/CMakeLists.txt                       |    6 +-
 gr-blocks/lib/add_const_XX_impl.cc.t               |   77 -
 gr-blocks/lib/add_const_bb_impl.cc                 |  107 ++
 .../{add_const_XX_impl.h.t => add_const_bb_impl.h} |   26 +-
 gr-blocks/lib/add_const_cc_impl.cc                 |  103 ++
 .../{add_const_XX_impl.h.t => add_const_cc_impl.h} |   25 +-
 gr-blocks/lib/add_const_ff_impl.cc                 |  103 ++
 ...ultiply_const_ff_impl.h => add_const_ff_impl.h} |   20 +-
 gr-blocks/lib/add_const_ii_impl.cc                 |  103 ++
 .../{add_const_XX_impl.h.t => add_const_ii_impl.h} |   25 +-
 gr-blocks/lib/add_const_ss_impl.cc                 |  107 ++
 .../{add_const_XX_impl.h.t => add_const_ss_impl.h} |   26 +-
 gr-blocks/lib/copy_impl.cc                         |   13 +
 gr-blocks/lib/copy_impl.h                          |    2 +
 gr-blocks/lib/multiply_const_cc_impl.cc            |   10 +-
 gr-blocks/lib/multiply_const_ff_impl.cc            |   24 +-
 gr-blocks/lib/multiply_const_ff_impl.h             |    2 +
 gr-blocks/lib/multiply_const_vcc_impl.cc           |   30 +-
 gr-blocks/lib/multiply_const_vcc_impl.h            |    2 +
 gr-blocks/lib/multiply_const_vff_impl.cc           |   26 +-
 gr-blocks/lib/multiply_const_vff_impl.h            |    2 +
 gr-uhd/lib/CMakeLists.txt                          |   10 -
 gr-uhd/lib/usrp_source_impl.cc                     |   12 +
 gr-uhd/lib/usrp_source_impl.h                      |    2 +
 46 files changed, 3780 insertions(+), 231 deletions(-)