|
|
@ -37,7 +37,7 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp kaffeine-0.8.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -248,6 +248,7 @@
|
|
|
|
@@ -248,6 +248,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
bool DVBout::doPause( const QString &name ) // called from dvbstream::run()
|
|
|
|
bool DVBout::doPause( const TQString &name ) // called from dvbstream::run()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
+ fprintf(stderr,"DVBout::doPause\n");
|
|
|
|
+ fprintf(stderr,"DVBout::doPause\n");
|
|
|
|
if ( !haveLive )
|
|
|
|
if ( !haveLive )
|
|
|
@ -73,7 +73,7 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp kaffeine-0.8.
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
@@ -288,11 +279,10 @@
|
|
|
|
@@ -288,11 +279,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
bool DVBout::goLive( const QString &name )
|
|
|
|
bool DVBout::goLive( const TQString &name )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
- if ( fdPipe ) return false;
|
|
|
|
- if ( fdPipe ) return false;
|
|
|
|
-
|
|
|
|
-
|
|
|
@ -239,21 +239,21 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.h kaffeine-0.8.4.
|
|
|
|
|
|
|
|
|
|
|
|
class KaffeineDvbPlugin;
|
|
|
|
class KaffeineDvbPlugin;
|
|
|
|
|
|
|
|
|
|
|
|
-class DVBout : public QObject, public QThread
|
|
|
|
-class DVBout : public TQObject, public QThread
|
|
|
|
+class DVBout : public QObject, private QThread
|
|
|
|
+class DVBout : public TQObject, private QThread
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TQ_OBJECT
|
|
|
|
TQ_OBJECT
|
|
|
|
|
|
|
|
|
|
|
|
@@ -77,13 +77,13 @@
|
|
|
|
@@ -77,13 +77,13 @@
|
|
|
|
void writePat();
|
|
|
|
void writePat();
|
|
|
|
void calculateCRC( unsigned char *p_begin, unsigned char *p_end );
|
|
|
|
void calculateCRC( unsigned char *p_begin, unsigned char *p_end );
|
|
|
|
void renameFile( QString &name, const QString &ext );
|
|
|
|
void renameFile( TQString &name, const TQString &ext );
|
|
|
|
+ bool writeBytes(int fd, const unsigned char *buf, int bytes);
|
|
|
|
+ bool writeBytes(int fd, const unsigned char *buf, int bytes);
|
|
|
|
|
|
|
|
|
|
|
|
int pmtpid;
|
|
|
|
int pmtpid;
|
|
|
|
bool patpmt, wpatpmt;
|
|
|
|
bool patpmt, wpatpmt;
|
|
|
|
bool timeShifting;
|
|
|
|
bool timeShifting;
|
|
|
|
QString pipeName;
|
|
|
|
TQString pipeName;
|
|
|
|
QFile outFile, liveFile;
|
|
|
|
QFile outFile, liveFile;
|
|
|
|
- int fdPipe;
|
|
|
|
- int fdPipe;
|
|
|
|
Ts2Rtp *rtp;
|
|
|
|
Ts2Rtp *rtp;
|
|
|
|