X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f0eb06742afb77ddf4ea856493ff47bf836be0a2..cec3dad6685882338879ba7b143f4c61068efed7:/lib/base/console.h diff --git a/lib/base/console.h b/lib/base/console.h index ddfd82a9..7c807699 100644 --- a/lib/base/console.h +++ b/lib/base/console.h @@ -1,6 +1,7 @@ #ifndef __LIB_BASE_CONSOLE_H__ #define __LIB_BASE_CONSOLE_H__ +#include "Python.h" #include #include #include @@ -24,6 +25,7 @@ class eConsoleAppContainer: public Object int fd[3]; int pid; int killstate; + std::string m_cwd; std::queue outbuf; eSocketNotifier *in, *out, *err; void readyRead(int what); @@ -33,12 +35,16 @@ class eConsoleAppContainer: public Object #endif public: eConsoleAppContainer(); - int execute( const std::string &str ); + 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 write( const char *data, int len ); + void write( PyObject *data ); bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); } PSignal1 dataAvail; PSignal1 dataSent;