Merge remote branch 'remotes/origin/acid-burn/bug_622_swupgrade_networkcheck'

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

diff --git a/lib/base/console.h b/lib/base/console.h
index 3aa180e41675628fa5ccc8bfb1d32b2aa12e7ca7..60540da04c26d1908f04f48165b4fd7a6a0a1101 100644 (file)
--- a/lib/base/console.h
+++ b/lib/base/console.h
@@ -1,13 +1,11 @@
 #ifndef __LIB_BASE_CONSOLE_H__
 #define __LIB_BASE_CONSOLE_H__
 
-#include "Python.h"
 #include <string>
 #include <lib/base/ebase.h>
 #include <lib/python/connections.h>
 #include <queue>
 
-#ifndef SWIG
 struct queue_data
 {
        queue_data( char *data, int len )
@@ -18,36 +16,37 @@ struct queue_data
        int len;
        int dataSent;
 };
-#endif
 
-class eConsoleAppContainer: public Object
+class eConsoleAppContainer: public Object, public iObject
 {
-#ifndef SWIG
+       DECLARE_REF(eConsoleAppContainer);
        int fd[3];
+       int filefd[3];
        int pid;
        int killstate;
        std::string m_cwd;
        std::queue<struct queue_data> outbuf;
-       eSocketNotifier *in, *out, *err;
+       ePtr<eSocketNotifier> in, out, err;
        void readyRead(int what);
        void readyErrRead(int what);
        void readyWrite(int what);
        void closePipes();
-#endif
 public:
        eConsoleAppContainer();
+       ~eConsoleAppContainer();
        int setCWD( const char *path );
        int execute( const char *str );
        int execute( const char *cmdline, const char *const argv[] );
-       int execute( PyObject *cmdline, PyObject *args );
-       ~eConsoleAppContainer();
        int getPID() { return pid; }
        void kill();
        void sendCtrlC();
+       void sendEOF();
        void write( const char *data, int len );
-       void write( PyObject *data );
+       void setFileFD(int num, int fd) { if (num >= 0 && num <= 2) filefd[num] = fd; }
        bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
        PSignal1<void, const char*> dataAvail;
+       PSignal1<void, const char*> stdoutAvail;
+       PSignal1<void, const char*> stderrAvail;
        PSignal1<void,int> dataSent;
        PSignal1<void,int> appClosed;
 };