some more work on plugin manager

[enigma2.git] / lib / base / message.h

diff --git a/lib/base/message.h b/lib/base/message.h
index de14db0fd61cda4c70587685e5f76e3b6bb88444..6e9eb07c3629c48b024da8539267a7882ade7bd0 100644 (file)
--- a/lib/base/message.h
+++ b/lib/base/message.h
@@ -2,15 +2,19 @@
 #define __lib_base_message_h
 
 #include <lib/base/ebase.h>
+#include <lib/python/connections.h>
+#include <lib/python/swig.h>
 #include <unistd.h>
 #include <lib/base/elock.h>
 
+
 /**
  * \brief A generic messagepump.
  *
  * You can send and receive messages with this class. Internally a fifo is used,
  * so you can use them together with a \c eMainloop.
  */
+#ifndef SWIG
 class eMessagePump
 {
        int fd[2];
@@ -19,6 +23,7 @@ class eMessagePump
 public:
        eMessagePump(int mt=0);
        virtual ~eMessagePump();
+protected:
        int send(const void *data, int len);
        int recv(void *data, int len); // blockierend
        int getInputFD() const;
@@ -34,7 +39,7 @@ public:
 template<class T>
 class eFixedMessagePump: private eMessagePump, public Object
 {
-       eSocketNotifier *sn;
+       ePtr<eSocketNotifier> sn;
        void do_recv(int)
        {
                T msg;
@@ -49,14 +54,36 @@ public:
        }
        eFixedMessagePump(eMainloop *context, int mt): eMessagePump(mt)
        {
-               sn=new eSocketNotifier(context, getOutputFD(), eSocketNotifier::Read);
+               sn=eSocketNotifier::create(context, getOutputFD(), eSocketNotifier::Read);
                CONNECT(sn->activated, eFixedMessagePump<T>::do_recv);
                sn->start();
        }
-       ~eFixedMessagePump()
+       void start() { if (sn) sn->start(); }
+       void stop() { if (sn) sn->stop(); }
+};
+#endif
+
+class ePythonMessagePump: public eMessagePump, public Object
+{
+       ePtr<eSocketNotifier> sn;
+       void do_recv(int)
        {
-               delete sn;
-               sn=0;
+               int msg;
+               recv(&msg, sizeof(msg));
+               /*emit*/ recv_msg(msg);
+       }
+public:
+       PSignal1<void,int> recv_msg;
+       void send(int msg)
+       {
+               eMessagePump::send(&msg, sizeof(msg));
+       }
+       ePythonMessagePump()
+               :eMessagePump(1)
+       {
+               sn=eSocketNotifier::create(eApp, getOutputFD(), eSocketNotifier::Read);
+               CONNECT(sn->activated, ePythonMessagePump::do_recv);
+               sn->start();
        }
        void start() { if (sn) sn->start(); }
        void stop() { if (sn) sn->stop(); }