summaryrefslogtreecommitdiff
path: root/gr-blocks
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-08-27 11:32:20 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-08-27 11:32:20 -0700
commitb014fb6e26d9a363870b477dccc9dfafd890eac0 (patch)
tree48272b792070243bd7c441523561952c3723b309 /gr-blocks
parent765040724dfe02b9f6533c60de1a6d67a975f388 (diff)
parent1375fe38dd7ff6bcaffc25aed9b990a64cdb9c03 (diff)
Merge branch 'next' into python3
Conflicts: volk
Diffstat (limited to 'gr-blocks')
-rw-r--r--gr-blocks/examples/ctrlport/comparing_resamplers.grc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-blocks/examples/ctrlport/comparing_resamplers.grc b/gr-blocks/examples/ctrlport/comparing_resamplers.grc
index eea9ab6ccd..e5cc973de0 100644
--- a/gr-blocks/examples/ctrlport/comparing_resamplers.grc
+++ b/gr-blocks/examples/ctrlport/comparing_resamplers.grc
@@ -290,10 +290,10 @@
</param>
</block>
<block>
- <key>fractional_resampler_xx</key>
+ <key>mmse_resampler_xx</key>
<param>
<key>id</key>
- <value>fractional_resampler_xx_0</value>
+ <value>mmse_resampler_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -332,7 +332,7 @@
</param>
<param>
<key>name</key>
- <value>fractional_resamp</value>
+ <value>mmse_resamp</value>
</param>
<param>
<key>desc</key>
@@ -371,7 +371,7 @@
</connection>
<connection>
<source_block_id>channels_channel_model_0</source_block_id>
- <sink_block_id>fractional_resampler_xx_0</sink_block_id>
+ <sink_block_id>mmse_resampler_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -382,7 +382,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>fractional_resampler_xx_0</source_block_id>
+ <source_block_id>mmse_resampler_xx_0</source_block_id>
<sink_block_id>probe_frac_resamp</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>