[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 3c8c1ab15467a07e90725fd204338ed88e52624a
Merge: 41e3327 d2ca980
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 5 18:56:18 2017 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-uhd/lib/usrp_source_impl.cc

 gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc | 357 ++--------------------------
 gr-uhd/apps/uhd_fft                         |   5 +-
 gr-uhd/lib/usrp_source_impl.cc              |   6 +-
 gr-uhd/lib/usrp_source_impl.h               |   1 -
 4 files changed, 25 insertions(+), 344 deletions(-)

diff --cc gr-uhd/lib/usrp_source_impl.cc
index 8cdaebc,23b94c6..2a16b37
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@@ -59,8 -79,9 +59,8 @@@ namespace gr 
        _id = pmt::string_to_symbol(str.str());
  
        _samp_rate = this->get_samp_rate();
-       _center_freq = this->get_center_freq(0);
+ #ifdef GR_UHD_USE_STREAM_API
        _samps_per_packet = 1;
 -#endif
        register_msg_cmd_handler(CMD_TAG_KEY, 
boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1));
      }