[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mbr0wn/uhd/refactor-blocks'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 06a7a77efc49fdc9b301e84f9e34c454f5ddbadf
Merge: efd2116 0e60616
Author: Johnathan Corgan <address@hidden>
Date:   Thu Apr 30 15:51:38 2015 -0700

    Merge remote-tracking branch 'mbr0wn/uhd/refactor-blocks'

 gr-uhd/doc/uhd.dox                                 |  13 +-
 gr-uhd/examples/grc/uhd_msg_tune.grc               | 451 ++++++++++++-----
 gr-uhd/include/gnuradio/uhd/CMakeLists.txt         |   1 +
 .../gnuradio/uhd/{usrp_sink.h => usrp_block.h}     | 283 ++++-------
 gr-uhd/include/gnuradio/uhd/usrp_sink.h            | 540 +++------------------
 gr-uhd/include/gnuradio/uhd/usrp_source.h          | 467 ++----------------
 gr-uhd/lib/CMakeLists.txt                          |   1 +
 gr-uhd/lib/usrp_block_impl.cc                      | 428 ++++++++++++++++
 gr-uhd/lib/usrp_block_impl.h                       | 199 ++++++++
 gr-uhd/lib/usrp_common.h                           | 211 --------
 gr-uhd/lib/usrp_sink_impl.cc                       | 293 +----------
 gr-uhd/lib/usrp_sink_impl.h                        |  48 +-
 gr-uhd/lib/usrp_source_impl.cc                     | 270 +----------
 gr-uhd/lib/usrp_source_impl.h                      |  47 +-
 gr-uhd/swig/uhd_swig.i                             |   2 +
 15 files changed, 1185 insertions(+), 2069 deletions(-)