diff options
| -rw-r--r-- | doc/en/index.docbook | 8 | ||||
| -rw-r--r-- | kaffeine/fast-slow-dcop.patch | 2 | ||||
| -rw-r--r-- | kaffeine/src/kaffeine.profile.xml | 6 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/xine-part/README | 4 | ||||
| -rw-r--r-- | kaffeine/terminate.patch | 12 |
5 files changed, 16 insertions, 16 deletions
diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 79a8152..69c307c 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -513,11 +513,11 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song <tbody> <row> -<entry><para><function>void openURL(QString URL)</function></para></entry> +<entry><para><function>void openURL(TQString URL)</function></para></entry> <entry><para>Opens and plays the given URL.</para></entry> </row> <row> -<entry><para><function>void appendURL(QString URL)</function></para></entry> +<entry><para><function>void appendURL(TQString URL)</function></para></entry> <entry><para>Appends the URL to current playlist.</para></entry> </row> <row> @@ -550,10 +550,10 @@ or from command line with <command>dcop kaffeine KaffeineIface openURL best_song <row><entry><para><function>void stop()</function></para></entry> <entry><para>Stops playback.</para></entry> </row> -<row><entry><para><function>QString title()</function></para></entry> +<row><entry><para><function>TQString title()</function></para></entry> <entry><para>Returns the title of the current track.</para></entry> </row> -<row><entry><para><function>QString getFileName()</function></para></entry> +<row><entry><para><function>TQString getFileName()</function></para></entry> <entry><para>Returns filename of current track.</para></entry> </row> <row><entry><para><function>int getLength()</function></para></entry> diff --git a/kaffeine/fast-slow-dcop.patch b/kaffeine/fast-slow-dcop.patch index 4bced05..07a0d54 100644 --- a/kaffeine/fast-slow-dcop.patch +++ b/kaffeine/fast-slow-dcop.patch @@ -3,7 +3,7 @@ Index: src/player-parts/xine-part/xine_part.h --- src/player-parts/xine-part/xine_part.h (revision 746328) +++ src/player-parts/xine-part/xine_part.h (working copy) @@ -108,6 +108,8 @@ - QString screenShot(); + TQString screenShot(); void nextAudioChannel(); void nextSubtitleChannel(); + void speedFaster(); diff --git a/kaffeine/src/kaffeine.profile.xml b/kaffeine/src/kaffeine.profile.xml index bf1d3b2..4c1e702 100644 --- a/kaffeine/src/kaffeine.profile.xml +++ b/kaffeine/src/kaffeine.profile.xml @@ -5,10 +5,10 @@ <name>Kaffeine</name> <author>Gav Wood,Jürgen Kofler</author> - <action objid="KaffeineIface" prototype="void openURL(QString)"> + <action objid="KaffeineIface" prototype="void openURL(TQString)"> <name>Play URL</name> <comment>Starts playback of a specific URL.</comment> - <argument type="QString"> + <argument type="TQString"> <comment>The URL to be played.</comment> </argument> </action> @@ -36,7 +36,7 @@ <name>Change Playlist</name> <comment>Change to the next kaffeine playlist.</comment> </action> - <action objid="KaffeineIface" prototype="QString title()"> + <action objid="KaffeineIface" prototype="TQString title()"> <name>Get Title</name> <comment>Returns the title of current track.</comment> </action> diff --git a/kaffeine/src/player-parts/xine-part/README b/kaffeine/src/player-parts/xine-part/README index 6b8e280..cf61f16 100644 --- a/kaffeine/src/player-parts/xine-part/README +++ b/kaffeine/src/player-parts/xine-part/README @@ -25,7 +25,7 @@ class MyPlayer : public MainWindow MyPlayer(); ~MyPlayer(); - void loadURL(const QString&); + void loadURL(const TQString&); //... private: @@ -50,7 +50,7 @@ MyPlayer::MyPlayer() : TDEMainWindow(0) //.. } -void MyPlayer::loadURL(const QString& url) +void MyPlayer::loadURL(const TQString& url) { m_player->openURL(url); } diff --git a/kaffeine/terminate.patch b/kaffeine/terminate.patch index 28ed232..24a632a 100644 --- a/kaffeine/terminate.patch +++ b/kaffeine/terminate.patch @@ -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 @@ - 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"); 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; @@ -288,11 +279,10 @@ - bool DVBout::goLive( const QString &name ) + bool DVBout::goLive( const TQString &name ) { - 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 DVBout : public QObject, public QThread -+class DVBout : public QObject, private QThread +-class DVBout : public TQObject, public QThread ++class DVBout : public TQObject, private QThread { TQ_OBJECT @@ -77,13 +77,13 @@ void writePat(); 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); int pmtpid; bool patpmt, wpatpmt; bool timeShifting; - QString pipeName; + TQString pipeName; QFile outFile, liveFile; - int fdPipe; Ts2Rtp *rtp; |