[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'drmpeg/catv-64qam-tx'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 161147d5e4d0e5951c6b6e3389353298a3eae05a
Merge: 473810a 2d7d0e6
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 27 14:08:41 2016 -0800

    Merge remote-tracking branch 'drmpeg/catv-64qam-tx'

 gr-dtv/examples/CMakeLists.txt                     |    2 +
 gr-dtv/examples/README.catv                        |   31 +
 gr-dtv/examples/catv_tx_64qam.grc                  | 2079 ++++++++++++++++++++
 gr-dtv/grc/CMakeLists.txt                          |    7 +-
 gr-dtv/grc/dtv_block_tree.xml                      |   10 +-
 gr-dtv/grc/dtv_catv_frame_sync_enc_bb.xml          |   26 +
 gr-dtv/grc/dtv_catv_randomizer_bb.xml              |   20 +
 gr-dtv/grc/dtv_catv_reed_solomon_enc_bb.xml        |   20 +
 gr-dtv/grc/dtv_catv_transport_framing_enc_bb.xml   |   20 +
 gr-dtv/grc/dtv_catv_trellis_enc_bb.xml             |   20 +
 gr-dtv/grc/dtv_dvbs2_modulator_bc.xml              |    5 +
 gr-dtv/include/gnuradio/dtv/CMakeLists.txt         |    7 +-
 ...bs2_modulator_bc.h => catv_frame_sync_enc_bb.h} |   28 +-
 .../{dvbs2_modulator_bc.h => catv_randomizer_bb.h} |   29 +-
 ...2_modulator_bc.h => catv_reed_solomon_enc_bb.h} |   27 +-
 ...ulator_bc.h => catv_transport_framing_enc_bb.h} |   29 +-
 ...{dvbs2_modulator_bc.h => catv_trellis_enc_bb.h} |   27 +-
 gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h   |    3 +-
 gr-dtv/lib/CMakeLists.txt                          |    7 +-
 gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc     |   96 +
 gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.h      |   50 +
 gr-dtv/lib/catv/catv_randomizer_bb_impl.cc         |  104 +
 gr-dtv/lib/catv/catv_randomizer_bb_impl.h          |   49 +
 gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc   |  153 ++
 gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.h    |   56 +
 .../lib/catv/catv_transport_framing_enc_bb_impl.cc |  131 ++
 .../lib/catv/catv_transport_framing_enc_bb_impl.h  |   84 +
 gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc        |  193 ++
 gr-dtv/lib/catv/catv_trellis_enc_bb_impl.h         |   60 +
 gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc        |   70 +-
 gr-dtv/swig/dtv_swig.i                             |   17 +-
 31 files changed, 3371 insertions(+), 89 deletions(-)