|
|
@ -588,7 +588,6 @@ void Recording::stopEncoder(SoundStreamID id)
|
|
|
|
//logDebug("stopEncoder thread = " + TQString::number((long long)thread, 16));
|
|
|
|
//logDebug("stopEncoder thread = " + TQString::number((long long)thread, 16));
|
|
|
|
//logDebug("stopEncoder thread error = " + TQString::number(thread->error(), 16));
|
|
|
|
//logDebug("stopEncoder thread error = " + TQString::number(thread->error(), 16));
|
|
|
|
|
|
|
|
|
|
|
|
#if (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 1)
|
|
|
|
|
|
|
|
// FIXME: set a timer and do waiting "in background"
|
|
|
|
// FIXME: set a timer and do waiting "in background"
|
|
|
|
if (!thread->wait(5000)) {
|
|
|
|
if (!thread->wait(5000)) {
|
|
|
|
//m_context.setError();
|
|
|
|
//m_context.setError();
|
|
|
@ -596,10 +595,6 @@ void Recording::stopEncoder(SoundStreamID id)
|
|
|
|
thread->terminate();
|
|
|
|
thread->terminate();
|
|
|
|
thread->wait();
|
|
|
|
thread->wait();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
#else
|
|
|
|
|
|
|
|
logError(i18n("Waiting for encoding thread to terminate."));
|
|
|
|
|
|
|
|
thread->wait();
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (thread->error()) {
|
|
|
|
if (thread->error()) {
|
|
|
|
//m_context.setError();
|
|
|
|
//m_context.setError();
|
|
|
|
logError(thread->errorString());
|
|
|
|
logError(thread->errorString());
|
|
|
|