diff options
| author | Johnathan Corgan | 2012-02-17 13:51:00 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-17 13:51:00 -0800 |
| commit | 8a4a83a768d205a28b8deced03a0ed4289e6f60f (patch) | |
| tree | 68a840838b5c59b0e3be4e1908157c3c9c00e8e9 | |
| parent | 748e3e84fe921cf03adbd9f411105af6202df763 (diff) | |
| parent | 34508cd9001ecd8eef2fcfb3a087c573072b83ef (diff) | |
| download | gnuradio-8a4a83a768d205a28b8deced03a0ed4289e6f60f.tar.gz gnuradio-8a4a83a768d205a28b8deced03a0ed4289e6f60f.tar.bz2 gnuradio-8a4a83a768d205a28b8deced03a0ed4289e6f60f.zip | |
Merge branch 'master' into next
Conflicts:
gr-vocoder/grc/Makefile.am
grc/blocks/Makefile.am
| -rw-r--r-- | gr-vocoder/grc/vocoder_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_g721_decode_bs.xml | 6 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_g723_24_decode_bs.xml | 8 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_g723_40_decode_bs.xml | 8 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml | 4 | ||||
| -rw-r--r-- | gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | 4 |
6 files changed, 15 insertions, 16 deletions
diff --git a/gr-vocoder/grc/vocoder_block_tree.xml b/gr-vocoder/grc/vocoder_block_tree.xml index 0c0fdd4a0..1766b4e26 100644 --- a/gr-vocoder/grc/vocoder_block_tree.xml +++ b/gr-vocoder/grc/vocoder_block_tree.xml @@ -30,7 +30,6 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>Vocoders</name> - <block>vocoder_binary_slicer_fb</block> <block>vocoder_alaw_decode_bs</block> <block>vocoder_alaw_encode_sb</block> <block>vocoder_codec2_decode_ps</block> diff --git a/gr-vocoder/grc/vocoder_g721_decode_bs.xml b/gr-vocoder/grc/vocoder_g721_decode_bs.xml index e8a64f404..d5c0291b7 100644 --- a/gr-vocoder/grc/vocoder_g721_decode_bs.xml +++ b/gr-vocoder/grc/vocoder_g721_decode_bs.xml @@ -5,10 +5,10 @@ ################################################### --> <block> - <name>g271 Audio Decoder</name> - <key>vocoder_g271_decode_bs</key> + <name>g721 Audio Decoder</name> + <key>vocoder_g721_decode_bs</key> <import>from gnuradio import vocoder</import> - <make>vocoder.g271_decode_bs()</make> + <make>vocoder.g721_decode_bs()</make> <sink> <name>in</name> <type>byte</type> diff --git a/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml b/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml index 768f82d8b..939a7f91b 100644 --- a/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml +++ b/gr-vocoder/grc/vocoder_g723_24_decode_bs.xml @@ -1,14 +1,14 @@ <?xml version="1.0"?> <!-- ################################################### -## g273_24 audio decoder +## g723_24 audio decoder ################################################### --> <block> - <name>g273_24 Audio Decoder</name> - <key>vocoder_g273_24_decode_bs</key> + <name>g723_24 Audio Decoder</name> + <key>vocoder_g723_24_decode_bs</key> <import>from gnuradio import vocoder</import> - <make>vocoder.g273_24_decode_bs()</make> + <make>vocoder.g723_24_decode_bs()</make> <sink> <name>in</name> <type>byte</type> diff --git a/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml b/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml index 09e31be4c..f3ba56e5b 100644 --- a/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml +++ b/gr-vocoder/grc/vocoder_g723_40_decode_bs.xml @@ -1,14 +1,14 @@ <?xml version="1.0"?> <!-- ################################################### -## g273_40 audio decoder +## g723_40 audio decoder ################################################### --> <block> - <name>g273_40 Audio Decoder</name> - <key>vocoder_g273_40_decode_bs</key> + <name>g723_40 Audio Decoder</name> + <key>vocoder_g723_40_decode_bs</key> <import>from gnuradio import vocoder</import> - <make>vocoder.g273_40_decode_bs()</make> + <make>vocoder.g723_40_decode_bs()</make> <sink> <name>in</name> <type>byte</type> diff --git a/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml b/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml index f90890032..44290f891 100644 --- a/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml +++ b/gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml @@ -6,9 +6,9 @@ --> <block> <name>GSM full-rate Audio Decoder</name> - <key>vocoder_gsm_fr_decode_bs</key> + <key>vocoder_gsm_fr_decode_ps</key> <import>from gnuradio import vocoder</import> - <make>vocoder.gsm_fr_decode_bs()</make> + <make>vocoder.gsm_fr_decode_ps()</make> <sink> <name>in</name> <type>byte</type> diff --git a/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml index d39994b6b..13f6f3f2d 100644 --- a/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml +++ b/gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml @@ -6,9 +6,9 @@ --> <block> <name>GSM full-rate Audio Encoder</name> - <key>vocoder_gsm_fr_encode_sb</key> + <key>vocoder_gsm_fr_encode_sp</key> <import>from gnuradio import vocoder</import> - <make>vocoder.gsm_fr_encode_sb()</make> + <make>vocoder.gsm_fr_encode_sp()</make> <sink> <name>in</name> <type>short</type> |