vocoder: updated cmake build for new blocks (also fixed some tests)

14 files changed, 85 insertions, 17 deletions

diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
index 9fb110a61..194894c73 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/CMakeLists.txt
@@ -65,7 +65,7 @@ FOREACH(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-digital/python
         ${CMAKE_BINARY_DIR}/gr-digital/swig
     )
-    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui)
+    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
 ENDFOREACH(py_qa_test_file)
 ENDIF(ENABLE_TESTING)
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index 11da6c0df..9cd645fe4 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -31,7 +31,7 @@ FOREACH(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-digital/swig
         ${CMAKE_BINARY_DIR}/gr-trellis/src/lib
     )
-    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui)
+    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital gnuradio-trellis)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
 ENDFOREACH(py_qa_test_file)
 ENDIF(ENABLE_TESTING)
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index 02ebced90..577a2db72 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(ENABLE_GR_VOCODER)
 # Setup CPack components
 ########################################################################
 INCLUDE(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "The GNU Radio Vocoder Blocks")
+CPACK_SET(CPACK_COMPONENT_GROUP_vocoder_DESCRIPTION "The GNU Radio Vocoder Blocks")
 
 CPACK_COMPONENT("vocoder_runtime"
     GROUP        "Vocoder"
@@ -67,6 +67,13 @@ CPACK_COMPONENT("vocoder_python"
     DEPENDS      "core_python;vocoder_runtime"
 )
 
+CPACK_COMPONENT("vocoder_examples"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Python examples for vocoder"
+    DEPENDS      "vocoder_python"
+)
+
 CPACK_COMPONENT("vocoder_swig"
     GROUP        "Vocoder"
     DISPLAY_NAME "SWIG"
diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt
index e69de29bb..9f8172a75 100644
--- a/gr-vocoder/examples/CMakeLists.txt
+++ b/gr-vocoder/examples/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Copyright 2011 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.
+
+########################################################################
+# Install Examples
+########################################################################
+INCLUDE(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    alaw_audio_loopback.py
+    codec2_audio_loopback.py
+    cvsd_audio_loopback.py
+    g721_audio_loopback.py
+    g723_24_audio_loopback.py
+    g723_40_audio_loopback.py
+    gsm_audio_loopback.py
+    ulaw_audio_loopback.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/vocoder
+    COMPONENT "vocoder_examples"
+)
diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt
index 437074494..390a0afb5 100644
--- a/gr-vocoder/include/CMakeLists.txt
+++ b/gr-vocoder/include/CMakeLists.txt
@@ -28,6 +28,12 @@ INSTALL(FILES
     vocoder_codec2_encode_sp.h
     vocoder_cvsd_decode_bs.h
     vocoder_cvsd_encode_sb.h
+    vocoder_g721_decode_bs.h
+    vocoder_g721_encode_sb.h
+    vocoder_g723_24_decode_bs.h
+    vocoder_g723_24_encode_sb.h
+    vocoder_g723_40_decode_bs.h
+    vocoder_g723_40_encode_sb.h
     vocoder_gsm_fr_decode_ps.h
     vocoder_gsm_fr_encode_sp.h
     vocoder_ulaw_decode_bs.h
diff --git a/gr-vocoder/include/vocoder_g721_decode_bs.h b/gr-vocoder/include/vocoder_g721_decode_bs.h
index 8ce3b12e5..1ac7b993a 100644
--- a/gr-vocoder/include/vocoder_g721_decode_bs.h
+++ b/gr-vocoder/include/vocoder_g721_decode_bs.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G721_DECODE_BS_H
 #define INCLUDED_VOCODER_G721_DECODE_BS_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g721_decode_bs;
 
 typedef boost::shared_ptr<vocoder_g721_decode_bs> vocoder_g721_decode_bs_sptr;
 
-vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
+VOCODER_API vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
 
 /*!
  * \brief This block performs g721 audio decoding. 
@@ -37,7 +38,7 @@ vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g721_decode_bs : virtual public gr_sync_block
+class VOCODER_API vocoder_g721_decode_bs : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/include/vocoder_g721_encode_sb.h b/gr-vocoder/include/vocoder_g721_encode_sb.h
index 5af980640..a154537d0 100644
--- a/gr-vocoder/include/vocoder_g721_encode_sb.h
+++ b/gr-vocoder/include/vocoder_g721_encode_sb.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H
 #define INCLUDED_VOCODER_G721_ENCODE_SB_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g721_encode_sb;
 
 typedef boost::shared_ptr<vocoder_g721_encode_sb> vocoder_g721_encode_sb_sptr;
 
-vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
+VOCODER_API vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
 
 /*!
  * \brief This block performs g721 audio encoding. 
@@ -37,7 +38,7 @@ vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g721_encode_sb : virtual public gr_sync_block
+class VOCODER_API vocoder_g721_encode_sb : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/include/vocoder_g723_24_decode_bs.h b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
index 8ca94f253..80cdbddd4 100644
--- a/gr-vocoder/include/vocoder_g723_24_decode_bs.h
+++ b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G723_24_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_24_DECODE_BS_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g723_24_decode_bs;
 
 typedef boost::shared_ptr<vocoder_g723_24_decode_bs> vocoder_g723_24_decode_bs_sptr;
 
-vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
+VOCODER_API vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
 
 /*!
  * \brief This block performs g723_24 audio decoding. 
@@ -37,7 +38,7 @@ vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g723_24_decode_bs : virtual public gr_sync_block
+class VOCODER_API vocoder_g723_24_decode_bs : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/include/vocoder_g723_24_encode_sb.h b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
index b55229980..d290e0971 100644
--- a/gr-vocoder/include/vocoder_g723_24_encode_sb.h
+++ b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g723_24_encode_sb;
 
 typedef boost::shared_ptr<vocoder_g723_24_encode_sb> vocoder_g723_24_encode_sb_sptr;
 
-vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
+VOCODER_API vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
 
 /*!
  * \brief This block performs g723_24 audio encoding. 
@@ -37,7 +38,7 @@ vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g723_24_encode_sb : virtual public gr_sync_block
+class VOCODER_API vocoder_g723_24_encode_sb : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/include/vocoder_g723_40_decode_bs.h b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
index 2299b8806..87a2f6892 100644
--- a/gr-vocoder/include/vocoder_g723_40_decode_bs.h
+++ b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G723_40_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_40_DECODE_BS_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g723_40_decode_bs;
 
 typedef boost::shared_ptr<vocoder_g723_40_decode_bs> vocoder_g723_40_decode_bs_sptr;
 
-vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
+VOCODER_API vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
 
 /*!
  * \brief This block performs g723_40 audio decoding. 
@@ -37,7 +38,7 @@ vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g723_40_decode_bs : virtual public gr_sync_block
+class VOCODER_API vocoder_g723_40_decode_bs : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/include/vocoder_g723_40_encode_sb.h b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
index f349cf425..6ac0f6d05 100644
--- a/gr-vocoder/include/vocoder_g723_40_encode_sb.h
+++ b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_g723_40_encode_sb;
 
 typedef boost::shared_ptr<vocoder_g723_40_encode_sb> vocoder_g723_40_encode_sb_sptr;
 
-vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
+VOCODER_API vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
 
 /*!
  * \brief This block performs g723_40 audio encoding. 
@@ -37,7 +38,7 @@ vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
  * \ingroup vocoder_blk
  */
 
-class vocoder_g723_40_encode_sb : virtual public gr_sync_block
+class VOCODER_API vocoder_g723_40_encode_sb : virtual public gr_sync_block
 {
 };
 
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index c4c6dabe5..74138b050 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -36,8 +36,14 @@ LIST(APPEND gr_vocoder_sources
     vocoder_alaw_encode_sb.cc
     vocoder_codec2_decode_ps.cc
     vocoder_codec2_encode_sp.cc
-    vocoder_cvsd_encode_sb.cc
     vocoder_cvsd_decode_bs.cc
+    vocoder_cvsd_encode_sb.cc
+    vocoder_g721_decode_bs.cc
+    vocoder_g721_encode_sb.cc
+    vocoder_g723_24_decode_bs.cc
+    vocoder_g723_24_encode_sb.cc
+    vocoder_g723_40_decode_bs.cc
+    vocoder_g723_40_encode_sb.cc
     vocoder_gsm_fr_decode_ps.cc
     vocoder_gsm_fr_encode_sp.cc
     vocoder_ulaw_decode_bs.cc
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
index 4ea8d23e1..c3702ad70 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -44,7 +44,7 @@ FOREACH(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gr-vocoder/python
         ${CMAKE_BINARY_DIR}/gr-vocoder/swig
     )
-    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui)
+    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-vocoder)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
 ENDFOREACH(py_qa_test_file)
 ENDIF(ENABLE_TESTING)
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index e07dd34be..61d123a74 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -46,6 +46,12 @@ INSTALL(
     vocoder_codec2_encode_sp.i
     vocoder_cvsd_decode_bs.i
     vocoder_cvsd_encode_sb.i
+    vocoder_g721_decode_bs.i
+    vocoder_g721_encode_sb.i
+    vocoder_g723_24_decode_bs.i
+    vocoder_g723_24_encode_sb.i
+    vocoder_g723_40_decode_bs.i
+    vocoder_g723_40_encode_sb.i
     vocoder_gsm_fr_encode_sp.i
     vocoder_gsm_fr_decode_ps.i
     vocoder_ulaw_decode_bs.i