Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10678 221aa14e-8319-0410-a670-987f0aec2ac5

4 files changed, 54 insertions, 54 deletions

diff --git a/grc/examples/audio/dial_tone.grc b/grc/examples/audio/dial_tone.grc
index 6f96d9748..ac8cbef27 100644
--- a/grc/examples/audio/dial_tone.grc
+++ b/grc/examples/audio/dial_tone.grc
@@ -45,10 +45,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_vxx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_vxx</value>
+      <value>gr_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -350,26 +350,26 @@
   </block>
   <connection>
     <source_block_id>gr_sig_source_x0</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sig_source_x</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>2</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx</source_block_id>
+    <source_block_id>gr_add_xx</source_block_id>
     <sink_block_id>audio_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>
diff --git a/grc/examples/simple/ber_simulation.grc b/grc/examples/simple/ber_simulation.grc
index 8d7d74565..618add29c 100644
--- a/grc/examples/simple/ber_simulation.grc
+++ b/grc/examples/simple/ber_simulation.grc
@@ -422,10 +422,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_vxx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_vxx</value>
+      <value>gr_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -526,20 +526,20 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx</source_block_id>
+    <source_block_id>gr_add_xx</source_block_id>
     <sink_block_id>gr_constellation_decoder_cb</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_chunks_to_symbols_xx</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -556,7 +556,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx</source_block_id>
+    <source_block_id>gr_add_xx</source_block_id>
     <sink_block_id>wxgui_scopesink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
diff --git a/grc/examples/trellis/interference_cancellation.grc b/grc/examples/trellis/interference_cancellation.grc
index 32e09f7f0..e93babd78 100644
--- a/grc/examples/trellis/interference_cancellation.grc
+++ b/grc/examples/trellis/interference_cancellation.grc
@@ -384,10 +384,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_vxx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_vxx_0</value>
+      <value>gr_add_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -481,10 +481,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_vxx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_vxx_0</value>
+      <value>gr_multiply_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -562,10 +562,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_vxx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_vxx_1</value>
+      <value>gr_multiply_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -740,10 +740,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_vxx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_vxx_2</value>
+      <value>gr_multiply_xx_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -918,10 +918,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_vxx</key>
+    <key>gr_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_vxx_2_0</value>
+      <value>gr_multiply_xx_2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1607,10 +1607,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_vxx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_vxx_1</value>
+      <value>gr_add_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1801,19 +1801,19 @@
   </connection>
   <connection>
     <source_block_id>gr_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>gr_add_vxx_0</sink_block_id>
+    <sink_block_id>gr_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_0</source_block_id>
-    <sink_block_id>gr_add_vxx_1</sink_block_id>
+    <source_block_id>gr_add_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_noise_source_x_0</source_block_id>
-    <sink_block_id>gr_add_vxx_1</sink_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -1825,24 +1825,24 @@
   </connection>
   <connection>
     <source_block_id>gr_multiply_const_vxx_1</source_block_id>
-    <sink_block_id>gr_add_vxx_0</sink_block_id>
+    <sink_block_id>gr_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_0</source_block_id>
-    <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+    <sink_block_id>gr_multiply_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_0</source_block_id>
-    <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+    <sink_block_id>gr_multiply_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_vxx_0</source_block_id>
+    <source_block_id>gr_multiply_xx_0</source_block_id>
     <sink_block_id>gr_short_to_float_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1854,7 +1854,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_vxx_2</source_block_id>
+    <source_block_id>gr_multiply_xx_2</source_block_id>
     <sink_block_id>gr_short_to_float_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1866,7 +1866,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_1</source_block_id>
+    <source_block_id>gr_add_xx_1</source_block_id>
     <sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1897,13 +1897,13 @@
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_1</source_block_id>
-    <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+    <sink_block_id>gr_multiply_xx_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_1</source_block_id>
-    <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+    <sink_block_id>gr_multiply_xx_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -1914,7 +1914,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_1</source_block_id>
+    <source_block_id>gr_add_xx_1</source_block_id>
     <sink_block_id>gr_sub_xx_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1944,7 +1944,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_vxx_1</source_block_id>
+    <source_block_id>gr_multiply_xx_1</source_block_id>
     <sink_block_id>gr_short_to_float_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1963,18 +1963,18 @@
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_3</source_block_id>
-    <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+    <sink_block_id>gr_multiply_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_3</source_block_id>
-    <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+    <sink_block_id>gr_multiply_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_1</source_block_id>
+    <source_block_id>gr_add_xx_1</source_block_id>
     <sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -2010,7 +2010,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_vxx_2_0</source_block_id>
+    <source_block_id>gr_multiply_xx_2_0</source_block_id>
     <sink_block_id>gr_short_to_float_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -2023,13 +2023,13 @@
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_1_0</source_block_id>
-    <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sub_xx_1_0</source_block_id>
-    <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
@@ -2046,7 +2046,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_1</source_block_id>
+    <source_block_id>gr_add_xx_1</source_block_id>
     <sink_block_id>gr_sub_xx_2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -2064,7 +2064,7 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx_1</source_block_id>
+    <source_block_id>gr_add_xx_1</source_block_id>
     <sink_block_id>wxgui_scopesink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
diff --git a/grc/examples/usrp/usrp_two_tone_loopback.grc b/grc/examples/usrp/usrp_two_tone_loopback.grc
index 30f5409b3..e3c635d46 100644
--- a/grc/examples/usrp/usrp_two_tone_loopback.grc
+++ b/grc/examples/usrp/usrp_two_tone_loopback.grc
@@ -479,10 +479,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_vxx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_vxx</value>
+      <value>gr_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -613,19 +613,19 @@
   </block>
   <connection>
     <source_block_id>gr_sig_source_x</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_sig_source_x0</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_vxx</sink_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>2</sink_key>
   </connection>
@@ -636,9 +636,9 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_vxx</source_block_id>
+    <source_block_id>gr_add_xx</source_block_id>
     <sink_block_id>usrp_simple_sink_x</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>