From 0062ab7175ddfe161eb718557b155b79285fa3ea Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Fri, 17 Feb 2012 12:41:10 -0800
Subject: vocoder: fix typos in added block xml
---
gr-gsm-fr-vocoder/Makefile.am | 27 ---------------------------
gr-vocoder/grc/vocoder_block_tree.xml | 1 -
gr-vocoder/grc/vocoder_g721_decode_bs.xml | 6 +++---
gr-vocoder/grc/vocoder_g723_24_decode_bs.xml | 8 ++++----
gr-vocoder/grc/vocoder_g723_40_decode_bs.xml | 8 ++++----
gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml | 4 ++--
gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | 4 ++--
7 files changed, 15 insertions(+), 43 deletions(-)
delete mode 100644 gr-gsm-fr-vocoder/Makefile.am
diff --git a/gr-gsm-fr-vocoder/Makefile.am b/gr-gsm-fr-vocoder/Makefile.am
deleted file mode 100644
index 968ce327c..000000000
--- a/gr-gsm-fr-vocoder/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2004,2009 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc
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 @@
Vocoders
- vocoder_binary_slicer_fb
vocoder_alaw_decode_bs
vocoder_alaw_encode_sb
vocoder_codec2_decode_ps
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 @@
###################################################
-->
- g271 Audio Decoder
- vocoder_g271_decode_bs
+ g721 Audio Decoder
+ vocoder_g721_decode_bs
from gnuradio import vocoder
- vocoder.g271_decode_bs()
+ vocoder.g721_decode_bs()
in
byte
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 @@
- g273_24 Audio Decoder
- vocoder_g273_24_decode_bs
+ g723_24 Audio Decoder
+ vocoder_g723_24_decode_bs
from gnuradio import vocoder
- vocoder.g273_24_decode_bs()
+ vocoder.g723_24_decode_bs()
in
byte
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 @@
- g273_40 Audio Decoder
- vocoder_g273_40_decode_bs
+ g723_40 Audio Decoder
+ vocoder_g723_40_decode_bs
from gnuradio import vocoder
- vocoder.g273_40_decode_bs()
+ vocoder.g723_40_decode_bs()
in
byte
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 @@
-->
GSM full-rate Audio Decoder
- vocoder_gsm_fr_decode_bs
+ vocoder_gsm_fr_decode_ps
from gnuradio import vocoder
- vocoder.gsm_fr_decode_bs()
+ vocoder.gsm_fr_decode_ps()
in
byte
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 @@
-->
GSM full-rate Audio Encoder
- vocoder_gsm_fr_encode_sb
+ vocoder_gsm_fr_encode_sp
from gnuradio import vocoder
- vocoder.gsm_fr_encode_sb()
+ vocoder.gsm_fr_encode_sp()
in
short
--
cgit
From 3a3ff1b581071f154efc2c01d34db67a0ebfffab Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Fri, 17 Feb 2012 13:24:09 -0800
Subject: vocoder: add xml blocks to autotools build
---
gr-vocoder/grc/Makefile.am | 25 +++++++++++++++++++++++--
grc/blocks/Makefile.am | 2 --
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/gr-vocoder/grc/Makefile.am b/gr-vocoder/grc/Makefile.am
index b1c7b44d5..f25cb9ce6 100644
--- a/gr-vocoder/grc/Makefile.am
+++ b/gr-vocoder/grc/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,4 +21,25 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS =
+grcblocksdir = $(grc_blocksdir)
+
+dist_grcblocks_DATA = \
+ vocoder_alaw_decode_bs.xml \
+ vocoder_alaw_encode_sb.xml \
+ vocoder_block_tree.xml \
+ vocoder_codec2_decode_ps.xml \
+ vocoder_codec2_encode_sp.xml \
+ vocoder_cvsd_decode_bs.xml \
+ vocoder_cvsd_decode.xml \
+ vocoder_cvsd_encode_sb.xml \
+ vocoder_cvsd_encode.xml \
+ vocoder_g721_decode_bs.xml \
+ vocoder_g721_encode_sb.xml \
+ vocoder_g723_24_decode_bs.xml \
+ vocoder_g723_24_encode_sb.xml \
+ vocoder_g723_40_decode_bs.xml \
+ vocoder_g723_40_encode_sb.xml \
+ vocoder_gsm_fr_decode_ps.xml \
+ vocoder_gsm_fr_encode_sp.xml \
+ vocoder_ulaw_decode_bs.xml \
+ vocoder_ulaw_encode_sb.xml
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 020dcecdd..65cd8e126 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -28,8 +28,6 @@ dist_ourdata_DATA = \
band_reject_filter.xml \
blks2_am_demod_cf.xml \
blks2_analysis_filterbank.xml \
- blks2_cvsd_encode.xml \
- blks2_cvsd_decode.xml \
blks2_error_rate.xml \
blks2_fm_deemph.xml \
blks2_fm_demod_cf.xml \
--
cgit