summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib/hier_block2.cc
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2015-04-05 16:24:41 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2015-04-05 16:24:41 -0700
commita8f603f23fcb2fce7eaa21cec0753d8393748afb (patch)
tree57ce0d3d0800f45ec353846067bd4811b89617e2 /gnuradio-runtime/lib/hier_block2.cc
parent61c4e2f62d18b3b2f0663b8c0a54a105d3896883 (diff)
parent4ed2622bf4f2a566dbcd22d78ac2e3ab528ceb33 (diff)
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/lib/hier_block2.cc')
-rw-r--r--gnuradio-runtime/lib/hier_block2.cc78
1 files changed, 35 insertions, 43 deletions
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
index 4d2c460c12..eeb5669da5 100644
--- a/gnuradio-runtime/lib/hier_block2.cc
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -182,97 +182,89 @@ namespace gr {
return dot_graph_fg(hierblock2->flatten());
}
- size_t
- hier_block2::max_output_buffer(size_t i)
+ int
+ hier_block2::max_output_buffer(size_t port)
{
- if(i >= d_detail->d_max_output_buffer.size())
- throw std::invalid_argument("hier_block2::max_output_buffer: port out of range.");
- return d_detail->d_max_output_buffer[i];
+ if(port >= d_detail->d_max_output_buffer.size())
+ throw std::invalid_argument("hier_block2::max_output_buffer(int): port out of range.");
+ return d_detail->d_max_output_buffer[port];
}
-
+
void
- hier_block2::set_max_output_buffer(size_t max_output_buffer)
+ hier_block2::set_max_output_buffer(int max_output_buffer)
{
if(output_signature()->max_streams()>0)
{
if(d_detail->d_max_output_buffer.size() == 0)
- throw std::length_error("hier_block2::max_output_buffer: out_sig greater than zero, buff_vect isn't");
- for(size_t idx = 0; idx < output_signature()->max_streams(); idx++){
+ throw std::length_error("hier_block2::set_max_output_buffer(int): out_sig greater than zero, buff_vect isn't");
+ for(int idx = 0; idx < output_signature()->max_streams(); idx++){
d_detail->d_max_output_buffer[idx] = max_output_buffer;
}
}
}
-
+
void
- hier_block2::set_max_output_buffer(int port, size_t max_output_buffer)
+ hier_block2::set_max_output_buffer(size_t port, int max_output_buffer)
{
- if((size_t)port >= d_detail->d_max_output_buffer.size())
- throw std::invalid_argument("hier_block2::max_output_buffer: port out of range.");
+ if(port >= d_detail->d_max_output_buffer.size())
+ throw std::invalid_argument("hier_block2::set_max_output_buffer(size_t,int): port out of range.");
else{
d_detail->d_max_output_buffer[port] = max_output_buffer;
}
}
- size_t
- hier_block2::min_output_buffer(size_t i)
+ int
+ hier_block2::min_output_buffer(size_t port)
{
- if(i >= d_detail->d_min_output_buffer.size())
- throw std::invalid_argument("hier_block2::min_output_buffer: port out of range.");
- return d_detail->d_min_output_buffer[i];
+ if(port >= d_detail->d_min_output_buffer.size())
+ throw std::invalid_argument("hier_block2::min_output_buffer(size_t): port out of range.");
+ return d_detail->d_min_output_buffer[port];
}
void
- hier_block2::set_min_output_buffer(size_t min_output_buffer)
+ hier_block2::set_min_output_buffer(int min_output_buffer)
{
if(output_signature()->max_streams()>0)
{
if(d_detail->d_min_output_buffer.size() == 0)
- throw std::length_error("hier_block2::min_output_buffer: out_sig greater than zero, buff_vect isn't");
- for(size_t idx = 0; idx < output_signature()->max_streams(); idx++){
+ throw std::length_error("hier_block2::set_min_output_buffer(int): out_sig greater than zero, buff_vect isn't");
+ for(int idx = 0; idx < output_signature()->max_streams(); idx++){
d_detail->d_min_output_buffer[idx] = min_output_buffer;
}
}
}
void
- hier_block2::set_min_output_buffer(int port, size_t min_output_buffer)
+ hier_block2::set_min_output_buffer(size_t port, int min_output_buffer)
{
- if((size_t)port >= d_detail->d_min_output_buffer.size())
- throw std::invalid_argument("hier_block2::min_output_buffer: port out of range.");
+ if(port >= d_detail->d_min_output_buffer.size())
+ throw std::invalid_argument("hier_block2::set_min_output_buffer(size_t,int): port out of range.");
else{
d_detail->d_min_output_buffer[port] = min_output_buffer;
}
}
-
+
bool
hier_block2::all_min_output_buffer_p(void)
{
- if(d_detail->d_min_output_buffer.size() > 0){
- bool all_equal = true;
- for(int idx = 1; (idx < d_detail->d_min_output_buffer.size()) && all_equal; idx++){
- if(d_detail->d_min_output_buffer[0] != d_detail->d_min_output_buffer[idx])
- all_equal = false;
- }
- return all_equal;
- }
- else{
+ if(!d_detail->d_min_output_buffer.size())
return false;
+ for(size_t idx = 1; idx < d_detail->d_min_output_buffer.size(); idx++){
+ if(d_detail->d_min_output_buffer[0] != d_detail->d_min_output_buffer[idx])
+ return false;
}
+ return true;
}
bool
hier_block2::all_max_output_buffer_p(void)
{
- if(d_detail->d_max_output_buffer.size() > 0){
- bool all_equal = true;
- for(int idx = 1; (idx < d_detail->d_max_output_buffer.size()) && all_equal; idx++){
- if(d_detail->d_max_output_buffer[0] != d_detail->d_max_output_buffer[idx])
- all_equal = false;
- }
- return all_equal;
- }
- else{
+ if(!d_detail->d_max_output_buffer.size())
return false;
+ for(size_t idx = 1; idx < d_detail->d_max_output_buffer.size(); idx++){
+ if(d_detail->d_max_output_buffer[0] != d_detail->d_max_output_buffer[idx])
+ return false;
}
+ return true;
}
} /* namespace gr */
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 09:47:20 +0000