git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont start timers as recurring timers... this is better for blocking syscalls
[enigma2.git]
/
lib
/
base
/
console.h
diff --git
a/lib/base/console.h
b/lib/base/console.h
index 7c8076998041932f5fa02cbec2f9efa87846417b..f7cd469ca19de6918be232e4d1dd902805fd5af1 100644
(file)
--- a/
lib/base/console.h
+++ b/
lib/base/console.h
@@
-11,11
+11,12
@@
struct queue_data
{
queue_data( char *data, int len )
struct queue_data
{
queue_data( char *data, int len )
- :data(data), len(len)
+ :data(data), len(len)
, dataSent(0)
{
}
char *data;
int len;
{
}
char *data;
int len;
+ int dataSent;
};
#endif
};
#endif
@@
-23,6
+24,7
@@
class eConsoleAppContainer: public Object
{
#ifndef SWIG
int fd[3];
{
#ifndef SWIG
int fd[3];
+ int filefd[3];
int pid;
int killstate;
std::string m_cwd;
int pid;
int killstate;
std::string m_cwd;
@@
-45,8
+47,12
@@
public:
void sendCtrlC();
void write( const char *data, int len );
void write( PyObject *data );
void sendCtrlC();
void write( const char *data, int len );
void write( PyObject *data );
+ void readFromFile( PyObject *py_filename );
+ void dumpToFile( PyObject *py_filename );
bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
PSignal1<void, const char*> dataAvail;
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;
};
PSignal1<void,int> dataSent;
PSignal1<void,int> appClosed;
};