Commit 100d7b8a authored by Michael Pyne's avatar Michael Pyne
Browse files

Backport memory/resource leak fix for JuK to 4.1.

svn path=/branches/KDE/4.1/kdemultimedia/juk/; revision=831169
parent 3003561a
...@@ -617,6 +617,7 @@ void PlayerManager::crossfadeToFile(const FileHandle &newFile) ...@@ -617,6 +617,7 @@ void PlayerManager::crossfadeToFile(const FileHandle &newFile)
Phonon::AudioOutput *out = m_output; Phonon::AudioOutput *out = m_output;
mo->disconnect(this); mo->disconnect(this);
out->setParent(mo); // Allow mo's death to also kill out
connect(mo, SIGNAL(finished()), SLOT(slotKillSender())); connect(mo, SIGNAL(finished()), SLOT(slotKillSender()));
m_media = new Phonon::MediaObject(this); m_media = new Phonon::MediaObject(this);
...@@ -651,6 +652,9 @@ void PlayerManager::crossfadeToFile(const FileHandle &newFile) ...@@ -651,6 +652,9 @@ void PlayerManager::crossfadeToFile(const FileHandle &newFile)
m_fader->setVolume(0.0f); m_fader->setVolume(0.0f);
m_fader->fadeTo(m_output->volume(), 2000); m_fader->fadeTo(m_output->volume(), 2000);
// Give the media object some extra time for good measure but then kill it.
QTimer::singleShot(4000, mo, SLOT(deleteLater()));
} }
QString PlayerManager::randomPlayMode() const QString PlayerManager::randomPlayMode() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment