diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-03 21:43:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-03 21:43:39 -0500 |
| commit | d38a9796c00b0ba35ebaf0ff85c8cc62eac96e3b (patch) | |
| tree | 2338dcb6be7daa9483a8ddce5a4f08cb5ab909ef /gnuradio-core/src/lib/runtime | |
| parent | 406e881106de9ce5d09fa6f4c24e08d8ef63cb49 (diff) | |
ctrlport: gets rid of a SWIG warning.
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/runtime.i | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i index 933ea2feae..2d7ab8bd77 100644 --- a/gnuradio-core/src/lib/runtime/runtime.i +++ b/gnuradio-core/src/lib/runtime/runtime.i @@ -71,21 +71,52 @@ #ifdef ENABLE_GR_CTRLPORT +enum DisplayType { + DISPNULL, + DISPTIMESERIESF, + DISPTIMESERIESC, + DISPXYSCATTER, + DISPXYLINE +}; + +enum priv_lvl_t { + RPC_PRIVLVL_ALL = 0, + RPC_PRIVLVL_MIN = 9, + RPC_PRIVLVL_NONE = 10 +}; + +enum KnobType { + KNOBBOOL, KNOBCHAR, KNOBINT, KNOBFLOAT, + KNOBDOUBLE, KNOBSTRING, KNOBLONG, KNOBVECBOOL, + KNOBVECCHAR, KNOBVECINT, KNOBVECFLOAT, KNOBVECDOUBLE, + KNOBVECSTRING, KNOBVECLONG +}; + %template(StrVector) std::vector<std::string>; %{ -#include <rpcmanager.h> #include <rpcserver_booter_base.h> #include <rpcserver_booter_aggregator.h> #include <pycallback_object.h> -#include <rpccallbackregister_base.h> %} -%include <rpcmanager.h> %include <rpcserver_booter_base.h> %include <rpcserver_booter_aggregator.h> %include <pycallback_object.h> -%include <rpccallbackregister_base.h> + +// Declare this class here but without the nested templated class +// inside (replaces include of rpcmanager.h) +class GR_CORE_API rpcmanager : public virtual rpcmanager_base +{ + public: + rpcmanager(); + ~rpcmanager(); + + static rpcserver_booter_base* get(); + + static void register_booter(rpcserver_booter_base* booter); +}; + // Attach a new python callback method to Python function %extend pycallback_object { |