diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-12 17:24:13 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-12 17:24:13 +0000 |
| commit | 76510e6e6f62690ef6fdd6506f4d0ed8f79529b9 (patch) | |
| tree | eb8d2533d8887c311ad0f2bcd31a5ed3d9754a8a | |
| parent | 822362d5485aa8b165f6d37598399d3bdd7e7d84 (diff) | |
| download | qmmp-76510e6e6f62690ef6fdd6506f4d0ed8f79529b9.tar.gz qmmp-76510e6e6f62690ef6fdd6506f4d0ed8f79529b9.tar.bz2 qmmp-76510e6e6f62690ef6fdd6506f4d0ed8f79529b9.zip | |
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2156 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Engines/mplayer/mplayerengine.cpp | 3 | ||||
| -rw-r--r-- | src/qmmp/qmmpaudioengine.cpp | 5 | ||||
| -rw-r--r-- | src/qmmp/soundcore.cpp | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index 7471cc6cd..e08e9642f 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -246,4 +246,5 @@ void MplayerEngine::startMplayerProcess() delete info; m_source->deleteLater(); m_source = 0; + m_currentTime = 0; } diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index b26971bd3..e80294914 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2010 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -265,11 +265,10 @@ void QmmpAudioEngine::stop() } wait(); - if (m_output) - m_output->wait(); if (m_output) { + m_output->wait(); delete m_output; m_output = 0; } diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index 45d56507b..b58556083 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2010 by Ilya Kotov * + * Copyright (C) 2006-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -107,7 +107,10 @@ void SoundCore::stop() delete m_pendingEngine; m_pendingEngine = 0; if(m_engine) + { m_engine->stop(); + qApp->processEvents(QEventLoop::ExcludeUserInputEvents); + } qDeleteAll(m_pendingSources); m_pendingSources.clear(); updateVolume(); |