X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fbase%2Fconsole.h;h=60540da04c26d1908f04f48165b4fd7a6a0a1101;hb=e9291026aa012236567bc52efbda9884f8efdbf2;hp=07ad6a90f5f5a99de81c16535f6d3827cdd4f541;hpb=1c4d458b5df83facce7cf71b39ab247eb1447491;p=vuplus_dvbapp

diff --git a/lib/base/console.h b/lib/base/console.h
index 07ad6a9..60540da 100644
--- a/lib/base/console.h
+++ b/lib/base/console.h
@@ -1,50 +1,52 @@
 #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 )
-		:data(data), len(len)
+		:data(data), len(len), dataSent(0)
 	{
 	}
 	char *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;
 };