diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-12-30 13:49:14 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-12-30 13:49:14 -0500 |
| commit | dd84c8dfcb30617dbac56f49a57c1e363afe643b (patch) | |
| tree | e6e4e71634dc4dc3f5e85ab5ff2c92e7ada8fa78 /gnuradio-core/src/lib/gengen | |
| parent | 0cdc6e67f575f6c86ad12734f87cf83aed72b102 (diff) | |
| parent | 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib/gengen')
| -rw-r--r-- | gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t index 9dd92c8f51..ab59922572 100644 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t +++ b/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t @@ -55,6 +55,9 @@ class GR_CORE_API @NAME@ : public gr_sync_block { void set_type (gr_noise_type_t type) { d_type = type; } void set_amplitude (float ampl) { d_ampl = ampl; } + gr_noise_type_t type () const { return d_type; } + float amplitude () const { return d_ampl; } + virtual int work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t b/gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t index 27261502d8..179dc03433 100644 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t +++ b/gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t @@ -34,4 +34,7 @@ class @NAME@ : public gr_block { public: void set_type (gr_noise_type_t type) { d_type = type; } void set_amplitude (float ampl) { d_ampl = ampl; } + + gr_noise_type_t type () const { return d_type; } + float amplitude () const { return d_ampl; } }; |