wavelet: simplified swig generation after virtual interface class change

4 files changed, 15 insertions, 96 deletions

diff --git a/gr-wavelet/swig/wavelet_squash_ff.i b/gr-wavelet/swig/wavelet_squash_ff.i
deleted file mode 100644
index 298399d4b..000000000
--- a/gr-wavelet/swig/wavelet_squash_ff.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2012 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(wavelet,squash_ff);
-
-wavelet_squash_ff_sptr wavelet_make_squash_ff(const std::vector<float> &igrid,
-					      const std::vector<float> &ogrid);
-
-class wavelet_squash_ff : public gr_sync_block
-{
-private:
-  wavelet_squash_ff(const std::vector<float> &igrid,
-		    const std::vector<float> &ogrid);
-
-};
diff --git a/gr-wavelet/swig/wavelet_swig.i b/gr-wavelet/swig/wavelet_swig.i
index dbf5f15d9..577bd04df 100644
--- a/gr-wavelet/swig/wavelet_swig.i
+++ b/gr-wavelet/swig/wavelet_swig.i
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#define WAVELET_API
+
 %include "gnuradio.i"
 
 //load generated python docstrings
@@ -31,6 +33,16 @@
 #include "wavelet_wvps_ff.h"
 %}
 
-%include "wavelet_squash_ff.i"
-%include "wavelet_wavelet_ff.i"
-%include "wavelet_wvps_ff.i"
+%include "wavelet_squash_ff.h"
+%include "wavelet_wavelet_ff.h"
+%include "wavelet_wvps_ff.h"
+
+GR_SWIG_BLOCK_MAGIC(wavelet,squash_ff);
+wavelet_squash_ff_sptr wavelet_make_squash_ff(const std::vector<float> &igrid,
+					      const std::vector<float> &ogrid);
+
+GR_SWIG_BLOCK_MAGIC(wavelet,wavelet_ff);
+wavelet_wavelet_ff_sptr wavelet_make_wavelet_ff(int size, int order, bool forward);
+
+GR_SWIG_BLOCK_MAGIC(wavelet,wvps_ff);
+wavelet_wvps_ff_sptr wavelet_make_wvps_ff(int ilen);
diff --git a/gr-wavelet/swig/wavelet_wavelet_ff.i b/gr-wavelet/swig/wavelet_wavelet_ff.i
deleted file mode 100644
index de6ef1113..000000000
--- a/gr-wavelet/swig/wavelet_wavelet_ff.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(wavelet,wavelet_ff);
-
-wavelet_wavelet_ff_sptr wavelet_make_wavelet_ff(int size, int order, bool forward);
-
-class wavelet_wavelet_ff : public gr_sync_block
-{
-private:
-  wavelet_wavelet_ff(int size, int order, bool forward);
-};
-
diff --git a/gr-wavelet/swig/wavelet_wvps_ff.i b/gr-wavelet/swig/wavelet_wvps_ff.i
deleted file mode 100644
index 30e394d04..000000000
--- a/gr-wavelet/swig/wavelet_wvps_ff.i
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-GR_SWIG_BLOCK_MAGIC(wavelet,wvps_ff);
-
-wavelet_wvps_ff_sptr wavelet_make_wvps_ff(int ilen);
-
-class wavelet_wvps_ff : public gr_sync_block
-{
-private:
-  wavelet_wvps_ff(int ilen);
-};