[Commit-gnuradio] [gnuradio] 02/05: Merge branch 'gr_uhd_issue_stream_cmd_on_start' into next-gruhd-stream-cmd

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit a3949e5f81ad8ee50dcf16c1207599dc885f3458
Merge: d3cbf64 338cfae
Author: Martin Braun <address@hidden>
Date:   Tue Dec 29 13:44:43 2015 -0800

    Merge branch 'gr_uhd_issue_stream_cmd_on_start' into next-gruhd-stream-cmd

 gr-uhd/include/gnuradio/uhd/usrp_source.h |  5 +++-
 gr-uhd/lib/usrp_sink_impl.cc              |  6 +++--
 gr-uhd/lib/usrp_source_impl.cc            | 45 +++++++++++++++++++------------
 gr-uhd/lib/usrp_source_impl.h             |  4 ++-
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --cc gr-uhd/lib/usrp_source_impl.cc
index fbeb992,7ad2280..7ce8633
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@@ -61,12 -62,14 +62,14 @@@ namespace gr 
      }
  
      usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t 
&device_addr,
-                                        const ::uhd::stream_args_t 
&stream_args):
+                                        const ::uhd::stream_args_t 
&stream_args,
+                                        const bool issue_stream_cmd_on_start):
 -      usrp_block("gr uhd usrp source",
 -                    io_signature::make(0, 0, 0),
 -                    args_to_io_sig(stream_args)),
 +      usrp_block("usrp_source",
 +                 io_signature::make(0, 0, 0),
 +                 args_to_io_sig(stream_args)),
        usrp_block_impl(device_addr, stream_args, ""),
-       _tag_now(false)
+       _tag_now(false),
+       _issue_stream_cmd_on_start(issue_stream_cmd_on_start)
      {
        std::stringstream str;
        str << name() << unique_id();