summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-07 16:08:36 -0800
committerJosh Blum <josh@joshknows.com>2011-03-07 16:08:36 -0800
commit8eeba059728257812924ed5b70b9e1e97d98886f (patch)
tree33bf9dd3a466dff6529122f6859044dabc1279cf /gnuradio-core/src/lib
parent7e2bd5adbf9828e6ca671ff5a176bff7ab48c557 (diff)
reverted accidental change to keep 1 in n block
Diffstat (limited to 'gnuradio-core/src/lib')
-rw-r--r--gnuradio-core/src/lib/general/gr_keep_one_in_n.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
index e38240a3f6..85495e2775 100644
--- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
+++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -31,15 +31,16 @@
gr_keep_one_in_n_sptr
gr_make_keep_one_in_n (size_t item_size, int n)
{
- return gr_keep_one_in_n_sptr (new gr_keep_one_in_n (item_size, n));
+ return gnuradio::get_initial_sptr(new gr_keep_one_in_n (item_size, n));
}
gr_keep_one_in_n::gr_keep_one_in_n (size_t item_size, int n)
: gr_block ("keep_one_in_n",
gr_make_io_signature (1, 1, item_size),
gr_make_io_signature (1, 1, item_size)),
- d_n (n), d_count(n)
+ d_count(n)
{
+ set_n(n);
}
void
@@ -50,6 +51,8 @@ gr_keep_one_in_n::set_n(int n)
d_n = n;
d_count = n;
+
+ set_relative_rate(1.0 / (float)n);
}
int