From 37d17c45c841a2d73bc5c6520d27291a89162d02 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 18 Nov 2023 15:15:07 +0900 Subject: [PATCH] Removed patch files from source code. fast-slow-dcop.patch, generic_tr.patch and scandialog.patch have already been applied in the code. terminate.patch has not been applied but contains no explanation on what problem it was trying to fix. Signed-off-by: Michele Calgaro --- kaffeine/fast-slow-dcop.patch | 54 ------- kaffeine/generic_tr.patch | 13 -- kaffeine/scandialog.patch | 53 ------- kaffeine/terminate.patch | 269 ---------------------------------- 4 files changed, 389 deletions(-) delete mode 100644 kaffeine/fast-slow-dcop.patch delete mode 100644 kaffeine/generic_tr.patch delete mode 100644 kaffeine/scandialog.patch delete mode 100644 kaffeine/terminate.patch diff --git a/kaffeine/fast-slow-dcop.patch b/kaffeine/fast-slow-dcop.patch deleted file mode 100644 index 07a0d54..0000000 --- a/kaffeine/fast-slow-dcop.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 @@ - TQString screenShot(); - void nextAudioChannel(); - void nextSubtitleChannel(); -+ void speedFaster(); -+ void speedSlower(); - - public slots: - /* -Index: src/player-parts/xine-part/xine_part_iface.h -=================================================================== ---- src/player-parts/xine-part/xine_part_iface.h (revision 746328) -+++ src/player-parts/xine-part/xine_part_iface.h (working copy) -@@ -128,6 +128,8 @@ - - virtual void nextAudioChannel() = 0; - virtual void nextSubtitleChannel() = 0; -+ virtual void speedFaster() = 0; -+ virtual void speedSlower() = 0; - }; - - #endif /* XINE_PART_IFACE_H */ -Index: src/player-parts/xine-part/xine_part.cpp -=================================================================== ---- src/player-parts/xine-part/xine_part.cpp (revision 746328) -+++ src/player-parts/xine-part/xine_part.cpp (working copy) -@@ -449,6 +449,11 @@ - } - } - -+void XinePart::speedFaster() -+{ -+ slotFastForward(); -+} -+ - void XinePart::slotFastForward() - { - if (m_xine->getSpeed() == KXineWidget::Pause) -@@ -459,6 +464,11 @@ - m_xine->slotSpeedFaster(); - } - -+void XinePart::speedSlower() -+{ -+ slotSlowMotion(); -+} -+ - void XinePart::slotSlowMotion() - { - if (m_xine->getSpeed() == KXineWidget::Pause) diff --git a/kaffeine/generic_tr.patch b/kaffeine/generic_tr.patch deleted file mode 100644 index 0864ed0..0000000 --- a/kaffeine/generic_tr.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kaffeine/src/kaffeine.desktop -=================================================================== ---- kaffeine/src/kaffeine.desktop (revision 708328) -+++ kaffeine/src/kaffeine.desktop (working copy) -@@ -57,7 +57,7 @@ - GenericName[sv]=Mediaspelare - GenericName[tg]=Навозишгари Медиа - GenericName[th]=โปรแกรมเล่นสื่อ --GenericName[tr]=Oynatıcı -+GenericName[tr]=Çokluortam Oynatıcısı - GenericName[uk]=Програвач медіа-матеріалів - GenericName[xx]=xxMedia Playerxx - GenericName[zh_CN]=媒体播放器 diff --git a/kaffeine/scandialog.patch b/kaffeine/scandialog.patch deleted file mode 100644 index 58208da..0000000 --- a/kaffeine/scandialog.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- scandialog.cpp 2007-12-21 21:21:22.000000000 +0000 -+++ newscandialog.cpp 2007-12-21 21:23:26.000000000 +0000 -@@ -109,13 +109,15 @@ - foundList->clear(); - foundList->setAllColumnsShowFocus( true ); - foundList->setSelectionMode( QListView::Extended ); -- channelsList->setSorting( 0 ); -+ channelsList->setSorting( 1 ); // sort by source 1st than channel name -+ channelsList->setAllColumnsShowFocus( true ); -+ channelsList->setSelectionMode( QListView::Extended ); - - ChannelDesc *chan; - QListViewItem *it; - for ( int i=0; i<(int)chandesc->count(); i++ ) { - chan = chandesc->at(i); -- it = new QListViewItem( channelsList, chan->name ); -+ it = new QListViewItem( channelsList, chan->name, chan->tp.source ); - if ( !chan->pix.isNull() ) - it->setPixmap( 0, chan->pix ); - else { - ---- scandialogui.ui 2007-12-21 21:21:22.000000000 +0000 -+++ newscandialogui.ui 2007-12-12 18:59:16.000000000 +0000 -@@ -66,9 +66,28 @@ - true - - -+ -+ -+ Source -+ -+ -+ true -+ -+ -+ true -+ -+ - - channelsList - -+ -+ -+ 7 -+ 3 -+ 0 -+ 0 -+ -+ - - false - - diff --git a/kaffeine/terminate.patch b/kaffeine/terminate.patch deleted file mode 100644 index 24a632a..0000000 --- a/kaffeine/terminate.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp kaffeine-0.8.4.cvs/kaffeine/src/input/dvb/dvbout.cpp ---- kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.cpp 2007-11-25 12:57:46.000000000 +0200 -+++ kaffeine-0.8.4.cvs/kaffeine/src/input/dvb/dvbout.cpp 2007-11-26 00:35:52.000000000 +0200 -@@ -19,6 +19,7 @@ - */ - - #include -+#include - - #include - -@@ -47,7 +48,6 @@ - plugHandle = plug->init( chan.sid, anum, tnum, chan.fta ); - } - -- fdPipe=0; - channel = chan; - thWrite = 0; - rtp = 0; -@@ -58,7 +58,7 @@ - for ( i=0; iprocess( plugHandle, thBuf, TS_SIZE*NTS ); - mutex.lock(); -- if ( haveLive && fdPipe ) { -- if ( beginLive ) { -- beginLive = !beginLive; -- start(); -- } -+ if ( haveLive ) { - if ( wDist<95 ) { - memcpy( wBuf+(wWrite*TS_SIZE*NTS), thBuf, TS_SIZE*NTS ); - wpatpmt = patpmt; -@@ -525,40 +506,67 @@ - } - } - -- -+bool DVBout::writeBytes(int fd, const unsigned char *buf, int bytes) { -+ int w=0; -+ mutex.lock(); -+ while (haveLive && w=0) w+=r; -+ else { -+ if ( errno != EAGAIN ) { -+ perror("DVBout: pipe writeBytes"); -+ return false; -+ } -+ usleep( 100 ); -+ } -+ mutex.lock(); -+ } -+ mutex.unlock(); -+ return haveLive; -+} - - void DVBout::run() - { -- if ( haveLive && fdPipe ) { -- while ( haveLive && fdPipe ) { -- if ( wDist>0 ) { -- if ( wpatpmt ) { -- write( fdPipe, tspat, TS_SIZE ); -- write( fdPipe, tspmt, TS_SIZE ); -- wpatpmt = false; -- } -- write( fdPipe, wBuf+(wRead*TS_SIZE*NTS), TS_SIZE*NTS ); -- --wDist; -- ++wRead; -- if ( wRead>99 ) -- wRead = 0; -- } -- else -- usleep( 100 ); -+ int fd=-1; -+ fprintf(stderr,"DVBout::run started\n"); -+ -+ while (haveLive && (fd=open( pipeName.ascii(), O_WRONLY | O_NONBLOCK )) == -1 ) { -+ if (errno!=ENXIO) { -+ perror("DVBout::run open pipe"); -+ return; - } -- return; -+ usleep ( 100 ); - } -+ fprintf(stderr,"DVBout::run write pipe %s opened\n",pipeName.ascii()); -+ emit playDvb(); -+ fprintf(stderr,"DVBout::run signal emitted\n"); - -- if ( (fdPipe=open( pipeName.ascii(), O_WRONLY))<0 ) { -- perror("PIPE FILE: "); -- return; -+ mutex.lock(); -+ while (haveLive) { -+ mutex.unlock(); -+ if (wpatpmt) { -+ if (writeBytes(fd, tspat, TS_SIZE) && writeBytes(fd, tspmt, TS_SIZE) ) { -+ wpatpmt = false; -+ } else goto fail; -+ } -+ if (wDist>0) { -+ if ( writeBytes (fd, wBuf+(wRead*TS_SIZE*NTS), TS_SIZE*NTS ) ) { -+ mutex.lock(); -+ --wDist; -+ ++wRead; -+ if (wRead>99) wRead=0; -+ mutex.unlock(); -+ } else goto fail; -+ } else usleep ( 100 ); -+ mutex.lock(); - } -- fprintf(stderr,"pipe opened\n"); -- emit playDvb(); -+ mutex.unlock(); -+fail: -+ if(fd>=0) close(fd); -+ fprintf(stderr,"DVBout::run finished\n"); - } - -- -- - DVBout::~DVBout() - { - if ( plug ) -diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.h kaffeine-0.8.4.cvs/kaffeine/src/input/dvb/dvbout.h ---- kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.h 2007-11-25 12:57:46.000000000 +0200 -+++ kaffeine-0.8.4.cvs/kaffeine/src/input/dvb/dvbout.h 2007-11-25 23:09:58.000000000 +0200 -@@ -35,7 +35,7 @@ - - class KaffeineDvbPlugin; - --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( TQString &name, const TQString &ext ); -+ bool writeBytes(int fd, const unsigned char *buf, int bytes); - - int pmtpid; - bool patpmt, wpatpmt; - bool timeShifting; - TQString pipeName; - QFile outFile, liveFile; -- int fdPipe; - Ts2Rtp *rtp; - unsigned char thBuf[188*100]; - unsigned char *wBuf; -@@ -92,7 +92,6 @@ - unsigned char tspmt[188]; - unsigned int CRC32[256]; - int thWrite; -- bool beginLive; - bool haveRec, haveLive, instantRec, haveBroadcast; - QTimer stopRecTimer, timerPatPmt; - QMutex mutex;