diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-25 09:33:35 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-25 09:33:35 -0700 |
| commit | 523a53ac387a699cef4d8e784561cdcaffad39cf (patch) | |
| tree | 61b75c0af0e90f1ca61add4519b3f9c35548494d | |
| parent | 03dbb5c3ab5b4cfa1a8f9a14cdf3a343ffd80042 (diff) | |
| parent | 222628c74d2a0186fa369bb36f424c843101b0f6 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 7 | ||||
| -rw-r--r-- | gr-fft/grc/fft_logpwrfft_x.xml | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6a56f5167..c9690d69a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,7 +165,7 @@ add_custom_target(uninstall ######################################################################## # Enable python component ######################################################################## -find_package(PythonLibs) +find_package(PythonLibs 2) find_package(SWIG) if(SWIG_FOUND) diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 85b848101c..ebfaa6fa69 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -436,8 +436,11 @@ namespace gr { { d_fg->clear(); d_blocks.clear(); - d_inputs.clear(); - d_outputs.clear(); + + int max_inputs = d_owner->input_signature()->max_streams(); + int max_outputs = d_owner->output_signature()->max_streams(); + d_inputs = std::vector<endpoint_vector_t>(max_inputs); + d_outputs = endpoint_vector_t(max_outputs); } endpoint_vector_t diff --git a/gr-fft/grc/fft_logpwrfft_x.xml b/gr-fft/grc/fft_logpwrfft_x.xml index 936be1cc71..ee45b577d8 100644 --- a/gr-fft/grc/fft_logpwrfft_x.xml +++ b/gr-fft/grc/fft_logpwrfft_x.xml @@ -7,8 +7,8 @@ <block> <name>Log Power FFT</name> <key>logpwrfft_x</key> - <import>from gnuradio import fft</import> - <make>fft.logpwrfft_$(type.fcn)( + <import>from gnuradio.fft import logpwrfft</import> + <make>logpwrfft.logpwrfft_$(type.fcn)( sample_rate=$sample_rate, fft_size=$fft_size, ref_scale=$ref_scale, |