[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/43: gnuradio-runtime: updated hier_block
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/43: gnuradio-runtime: updated hier_block2 and hier_block_detail to allow for propagation of min/max output buffer to all blocks within the hier |
Date: |
Thu, 2 Apr 2015 19:15:49 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 29e86c4401343d875ea21a2913221d04cc9a7f6f
Author: Bill Clark <address@hidden>
Date: Mon Mar 30 21:15:01 2015 -0400
gnuradio-runtime: updated hier_block2 and hier_block_detail to allow for
propagation of min/max output buffer to all blocks within the hier
---
gnuradio-runtime/lib/hier_block2_detail.cc | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc
b/gnuradio-runtime/lib/hier_block2_detail.cc
index f58c24a..8f7f6db 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -530,13 +530,27 @@ namespace gr {
}
}
if(min_buff != -1){
- if((boost::static_pointer_cast<block>(b) != nullptr) ||
(boost::static_pointer_cast<hier_block2>(b) != nullptr)){
- b->set_min_output_buffer(min_buff);
+ block_sptr bb = boost::dynamic_pointer_cast<block>(b);
+ if(bb != 0){
+ bb->set_min_output_buffer(min_buff);
+ }
+ else{
+ hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b);
+ if(hh != 0){
+ hh->set_min_output_buffer(min_buff);
+ }
}
}
if(max_buff != -1){
- if((boost::static_pointer_cast<block>(b) != nullptr) ||
(boost::static_pointer_cast<hier_block2>(b) != nullptr)){
- b->set_max_output_buffer(max_buff);
+ block_sptr bb = boost::dynamic_pointer_cast<block>(b);
+ if(bb != 0){
+ bb->set_max_output_buffer(max_buff);
+ }
+ else{
+ hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b);
+ if(hh != 0){
+ hh->set_max_output_buffer(max_buff);
+ }
}
}
- [Commit-gnuradio] [gnuradio] 29/43: grc: move context def into Bars.py and add submenu, (continued)
- [Commit-gnuradio] [gnuradio] 29/43: grc: move context def into Bars.py and add submenu, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 14/43: gnuradio-runtime: modified buffer length types to size_t, moved buffer length vectors into detail, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 22/43: grc: close unsaved pages first (for cancel save option), git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 13/43: fec: ldpc GRC compat cleanup, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 36/43: Merge remote-tracking branch 'fengzhe/chunks_to_symbols_update', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 25/43: grc: set permissions for generated files, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 08/43: fec: adding ldpc encoder and decoder, initial compile working, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 23/43: grc: make use of GRC_HIER_PATH at runtime, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 33/43: Merge remote-tracking branch 'saikwolf/hier_buff_tweak', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 24/43: grc: use 'import' for grc-generated hier_blocks (#763), git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 02/43: gnuradio-runtime: updated hier_block2 and hier_block_detail to allow for propagation of min/max output buffer to all blocks within the hier,
git <=
- [Commit-gnuradio] [gnuradio] 21/43: grc: Default button in save dialog is now 'save' instead of 'close without saving', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 37/43: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 05/43: digital: bug fixed in chunks_to_symbols that the callback functiion set_symbol_table didn't work with additonal qa_tests, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 32/43: Merge branch 'maint', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 09/43: fec: adding objects needed to run LDPC along with example ALIST file, now imports and instantiates happily, git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 41/43: qtgui: use QPen::setWidthF for non-integer values., git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 39/43: dtv: move "static const" variables from header / class into the main code. The original code is not necessary to have in the class, and causes issues when compiling using c++11 compliance., git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 43/43: Merge remote-tracking branch 'michaelld/fixes_for_std_complex', git, 2015/04/02
- [Commit-gnuradio] [gnuradio] 38/43: dtv: redo c++0x complaint std::complex to be c++11 compliant; works on OSX with GCC (4.2 and 4.8, using listdc++) and Clang (LLVM 3.4 and 3.6, using libc++), with and without -std=c++11., git, 2015/04/02