summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2023-12-05 21:14:11 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-06 19:37:14 +0900
commitb3d9058d96f5f2939360fde1b6c28062f4db827b (patch)
treed8baf144b4d6828710e4c0706632241ee9d8f6bd
parent6701bdba555126443873b31eb1c2b288fae61d77 (diff)
downloadkstreamripper-b3d9058d.tar.gz
kstreamripper-b3d9058d.zip
Added event processing if the process has finished its work
Signed-off-by: ormorph <roma251078@mail.ru> (cherry picked from commit 7bd4251db36952dce6c17d477f4671199d5c9971)
-rw-r--r--src/kstreamripper.cpp11
-rw-r--r--src/kstreamripper.h4
-rw-r--r--src/processcontroller.cpp8
-rw-r--r--src/processcontroller.h4
4 files changed, 27 insertions, 0 deletions
diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp
index a4fef54..7a5d7cb 100644
--- a/src/kstreamripper.cpp
+++ b/src/kstreamripper.cpp
@@ -227,12 +227,23 @@ void KStreamRipper::ripButtonClicked()
ProcItem->getProcessController()->startRip(m_destEdit->text(), m_timeEdit->text());
m_ripButton->setEnabled( false );
m_stopRipButton->setEnabled( true );
+ connect(ProcItem->getProcessController(), TQT_SIGNAL(stopRipSignal(ProcessController*)), this, TQT_SLOT(ripStopped(ProcessController*)));
} else {
KMessageBox::error(this, "The streamripper executable wasn't found. Make sure "
"it's in your path.", "streamripper not found");
}
}
+void KStreamRipper::ripStopped(ProcessController *curProc)
+{
+ const ProcessController *proc = ((ProcessListViewItem*)m_streamsListView->currentItem())->getProcessController();
+ if (curProc == proc)
+ {
+ m_ripButton->setEnabled( true );
+ m_stopRipButton->setEnabled( false );
+ }
+}
+
void KStreamRipper::stopRipButtonClicked()
{
ProcessListViewItem * ProcItem = (ProcessListViewItem*)m_streamsListView->currentItem();
diff --git a/src/kstreamripper.h b/src/kstreamripper.h
index 5a16a99..7677e6f 100644
--- a/src/kstreamripper.h
+++ b/src/kstreamripper.h
@@ -22,7 +22,10 @@
#define KSTREAMRIPPER_H
#include <tdeversion.h>
+
#include "kstreamripperbase.h"
+#include "processcontroller.h"
+
#if KDE_IS_VERSION(3,3,90)
#include <dnssd/servicebrowser.h>
#include <dnssd/remoteservice.h>
@@ -57,6 +60,7 @@ protected slots:
void deleteStreamButtonClicked();
void tuneInButtonClicked();
void ripButtonClicked();
+ void ripStopped(ProcessController*);
void stopRipButtonClicked();
void browseButtonClicked();
void helpButtonClicked();
diff --git a/src/processcontroller.cpp b/src/processcontroller.cpp
index f39a4c6..35558b2 100644
--- a/src/processcontroller.cpp
+++ b/src/processcontroller.cpp
@@ -26,6 +26,7 @@ ProcessController::ProcessController(ProcessListViewItem * parent)
: TQObject((TQObject *)parent), myParent(parent), myStatus(false), myAutomatic(false), myProcess(new TQProcess(this))
{
connect (myProcess, TQT_SIGNAL( readyReadStdout() ), (ProcessController *) this, TQT_SLOT( readStdout()) );
+ connect (myProcess, TQT_SIGNAL(processExited() ), (ProcessController *) this, TQT_SLOT( processExited()) );
// connect (myProcess, TQT_SIGNAL( destroyed() ), myProcess, TQT_SLOT( kill()) );
// this should work, according to http://doc.trolltech.com/3.2/qobject.html#~TQObject but it doesn't
}
@@ -68,6 +69,13 @@ void ProcessController::readStdout()
}
}
+void ProcessController::processExited()
+{
+ myStatus = false;
+ myParent->setText( 1, "" );
+ myParent->setText( 2, "" );
+ emit stopRipSignal(this);
+}
void ProcessController::startRip(TQString destination, TQString time)
{
diff --git a/src/processcontroller.h b/src/processcontroller.h
index 88deff7..9405471 100644
--- a/src/processcontroller.h
+++ b/src/processcontroller.h
@@ -54,8 +54,12 @@ public:
void startRip(TQString destination, TQString time);
void stopRip();
+signals:
+ void stopRipSignal(ProcessController*);
+
protected slots:
void readStdout();
+ void processExited();
private:
ProcessListViewItem * myParent;