[Commit-gnuradio] r9889 - gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general

[brickle]

Author: brickle
Date: 2008-10-29 13:55:07 -0600 (Wed, 29 Oct 2008)
New Revision: 9889

Modified:
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/Makefile.am
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/general.i
   
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.i
Log:
waveshape blocks now in and pass make check.

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/Makefile.am
 2008-10-29 18:38:07 UTC (rev 9888)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/Makefile.am
 2008-10-29 19:55:07 UTC (rev 9889)
@@ -315,6 +315,8 @@
        gr_vector_to_stream.h           \
        gr_vector_to_streams.h          \
        gr_wavelet_ff.h                 \
+       gr_waveshape_ff.h               \
+       gr_waveshape_cc.h               \
        gr_wvps_ff.h                    \
        gri_add_const_ss.h              \
        gri_agc_cc.h                    \
@@ -468,6 +470,8 @@
        gr_vector_to_streams.i          \
        gr_unpack_k_bits_bb.i           \
        gr_wavelet_ff.i                 \
+       gr_waveshape_ff.i               \
+       gr_waveshape_cc.i               \
        gr_wvps_ff.i                    \
        gri_agc_cc.i                    \
        gri_agc_ff.i                    \

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/general.i
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/general.i
   2008-10-29 18:38:07 UTC (rev 9888)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/general.i
   2008-10-29 19:55:07 UTC (rev 9889)
@@ -137,6 +137,8 @@
 #include <gr_squash_ff.h>
 #include <gr_stretch_ff.h>
 #include <gr_wavelet_ff.h>
+#include <gr_waveshape_ff.h>
+#include <gr_waveshape_cc.h>
 #include <gr_wvps_ff.h>
 
 %}
@@ -256,4 +258,6 @@
 %include "gr_squash_ff.i"
 %include "gr_stretch_ff.i"
 %include "gr_wavelet_ff.i"
+%include "gr_waveshape_ff.i"
+%include "gr_waveshape_cc.i"
 %include "gr_wvps_ff.i"

Modified: 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.i
===================================================================
--- 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.i
   2008-10-29 18:38:07 UTC (rev 9888)
+++ 
gnuradio/branches/developers/brickle/neww/gnuradio-core/src/lib/general/gr_waveshape_cc.i
   2008-10-29 19:55:07 UTC (rev 9889)
@@ -21,7 +21,7 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,waveshape_cc);
 
-gr_waveshape_cc_sptr gr_make_waveshape_ff(const std::vector<float> 
&waveshape_real,
+gr_waveshape_cc_sptr gr_make_waveshape_cc(const std::vector<float> 
&waveshape_real,
                                           const std::vector<float> 
&waveshape_imag);
 
 class gr_waveshape_cc : public gr_sync_block