git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use reloadBouquets instead of loadBouquets
[enigma2.git]
/
lib
/
base
/
console.h
diff --git
a/lib/base/console.h
b/lib/base/console.h
index bfa0240704533477b345eddc44acbbb6c0e1a0de..7c8076998041932f5fa02cbec2f9efa87846417b 100644
(file)
--- a/
lib/base/console.h
+++ b/
lib/base/console.h
@@
-1,6
+1,7
@@
#ifndef __LIB_BASE_CONSOLE_H__
#define __LIB_BASE_CONSOLE_H__
#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 <string>
#include <lib/base/ebase.h>
#include <lib/python/connections.h>
@@
-24,6
+25,7
@@
class eConsoleAppContainer: public Object
int fd[3];
int pid;
int killstate;
int fd[3];
int pid;
int killstate;
+ std::string m_cwd;
std::queue<struct queue_data> outbuf;
eSocketNotifier *in, *out, *err;
void readyRead(int what);
std::queue<struct queue_data> outbuf;
eSocketNotifier *in, *out, *err;
void readyRead(int what);
@@
-33,14
+35,18
@@
class eConsoleAppContainer: public Object
#endif
public:
eConsoleAppContainer();
#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 );
~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); }
bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
- PSignal1
Str
<void, const char*> dataAvail;
+ PSignal1<void, const char*> dataAvail;
PSignal1<void,int> dataSent;
PSignal1<void,int> appClosed;
};
PSignal1<void,int> dataSent;
PSignal1<void,int> appClosed;
};