diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2014-03-14 23:17:58 +0100 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2014-03-15 07:18:20 +0100 |
| commit | 6a78af5919133fdc339b09bb1622e876365a4d19 (patch) | |
| tree | 84911bcf90be76ea212c2f25e2f752b1a442be60 | |
| parent | 69dcaa75b629af4ebc465a073f54af84b7c75a11 (diff) | |
gr-qtgui: Use dummy void* return value for pywidget if !ENABLE_PYTHON
This has two benefits:
- If ENABLE_PYTHON is disabled during build, the method will still be
there and just return NULL
- During build of external projects / apps that don't necessarely want
to have python included in the build, the exposed vtable is the same
as the one from GR (whether or not python was enabled during GR build)
Without this, using those block from outside without the exact same option
as during GR build would result in crash.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
36 files changed, 120 insertions, 0 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index 6b305f6e0d..7a2296aed3 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -67,6 +67,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index d0a4a3dba0..41d4bc18fb 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -74,6 +74,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index 25a4c80b49..dcdfd8e0f9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -74,6 +74,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 07ad124c3b..eeea39b119 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -88,6 +88,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif public: diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index d1c35ebda9..5a451b3ac0 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -80,6 +80,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index 7d56a7a499..e0d58a5f33 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -80,6 +80,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_fft_size(const int fftsize) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index 5304dd4f84..6ffe21b14a 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -79,6 +79,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index 2c13265ae5..4e7ddfef39 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -76,6 +76,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_update_time(double t) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index f02226cb8e..aa2e19bc9e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -72,6 +72,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 64e347bf83..c82c22b392 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -70,6 +70,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void set_y_axis(double min, double max) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index e1e27a4cc8..180e2b80c9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -81,6 +81,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void clear_data() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 006f592bb5..3f278f2ad7 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -80,6 +80,8 @@ namespace gr { #ifdef ENABLE_PYTHON virtual PyObject* pyqwidget() = 0; +#else + virtual void* pyqwidget() = 0; #endif virtual void clear_data() = 0; diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index bc4b411958..fb0cdade6a 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -148,6 +148,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + const_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index e2faa72eb0..3b1de226ff 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -70,6 +70,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 0f37fe80a4..ff40ff3f43 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -174,6 +174,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + freq_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index f068e657f5..15b513715c 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -87,6 +87,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index b77e52347c..4f5ba5a386 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -174,6 +174,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + freq_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index c7e9fe83dc..68cb8c66b4 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -87,6 +87,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 4b3aa29693..dc3e63cb01 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -150,6 +150,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + histogram_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index e2558890b9..58d43e49d1 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -72,6 +72,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index 12720bde2f..992512a999 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -180,6 +180,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 56c90f3f80..18508d30aa 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index a3567aec94..0a0e119181 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -172,6 +172,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 801a200bb8..68331cc4e6 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -83,6 +83,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_fft_size(const int fftsize); diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index 5e5a9f505d..a1189f4413 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -169,6 +169,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_raster_sink_b_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 680056822c..bd568e91c0 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -78,6 +78,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_update_time(double t); diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index a68a503c7a..c8b865d55d 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -167,6 +167,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_raster_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index f7caf75842..1e0dcf8370 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -77,6 +77,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_update_time(double t); diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 0f723f8b3d..e86ffca227 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -153,6 +153,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 03dcbe2fc0..6a75789059 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -88,6 +88,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index f547185415..e571654615 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -155,6 +155,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + time_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index bbad48dc48..7505642389 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -88,6 +88,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void set_y_axis(double min, double max); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index ded93d19d3..2c436db789 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -173,6 +173,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + waterfall_sink_c_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 95781c564d..aad4a4debb 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void clear_data(); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index bb6c3e050d..fc6d9fab67 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -172,6 +172,12 @@ namespace gr { PyObject *retarg = Py_BuildValue("N", w); return retarg; } +#else + void * + waterfall_sink_f_impl::pyqwidget() + { + return NULL; + } #endif void diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 97c6aa2def..172f873a7f 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -85,6 +85,8 @@ namespace gr { #ifdef ENABLE_PYTHON PyObject* pyqwidget(); +#else + void* pyqwidget(); #endif void clear_data(); |