summaryrefslogtreecommitdiffstats
path: root/src/kmplayerprocess.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kmplayerprocess.cpp')
-rw-r--r--src/kmplayerprocess.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index 230bc73..1439b84 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -208,16 +208,12 @@ bool Process::play (Source * src, NodePtr _mrl) {
TQString url = m ? m->absolutePath () : TQString ();
bool changed = m_url != url;
m_url = url;
-#if KDE_IS_VERSION(3,3,91)
if (!changed || KURL (m_url).isLocalFile ())
return deMediafiedPlay ();
m_url = url;
m_job = TDEIO::stat (m_url, false);
connect(m_job, TQ_SIGNAL (result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *)));
return true;
-#else
- return deMediafiedPlay ();
-#endif
}
bool Process::deMediafiedPlay () {
@@ -225,7 +221,6 @@ bool Process::deMediafiedPlay () {
}
void Process::result (TDEIO::Job * job) {
-#if KDE_IS_VERSION(3,3,91)
TDEIO::UDSEntry entry = static_cast <TDEIO::StatJob *> (job)->statResult ();
TDEIO::UDSEntry::iterator e = entry.end ();
for (TDEIO::UDSEntry::iterator it = entry.begin (); it != e; ++it)
@@ -235,7 +230,6 @@ void Process::result (TDEIO::Job * job) {
}
m_job = 0L;
deMediafiedPlay ();
-#endif
}
void Process::terminateJobs () {
@@ -316,15 +310,7 @@ TDE_NO_EXPORT bool MPlayerBase::quit () {
::kill (-1 * ::getpid (), SIGTERM);
signal(SIGTERM, oldhandler);
}
-#if KDE_IS_VERSION(3, 1, 90)
m_process->wait(2);
-#else
- TQTime t;
- t.start ();
- do {
- TDEProcessController::theTDEProcessController->waitForProcessExit (2);
- } while (t.elapsed () < 2000 && m_process->isRunning ());
-#endif
if (m_process->isRunning ())
Process::quit ();
processStopped (0L);
@@ -1343,15 +1329,7 @@ bool CallbackProcess::quit () {
m_backend->quit ();
else if (viewer ())
viewer ()->sendKeyEvent ('q');
-#if KDE_IS_VERSION(3, 1, 90)
m_process->wait(1);
-#else
- TQTime t;
- t.start ();
- do {
- TDEProcessController::theTDEProcessController->waitForProcessExit (2);
- } while (t.elapsed () < 1000 && m_process->isRunning ());
-#endif
}
return Process::quit ();
}