From 82a5058e4c0c70447815d9272942cea9c428856e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 May 2011 13:05:04 +0200 Subject: [PATCH] * Fix AudioEngine killing Phonon's QIODevice. --- src/libtomahawk/audio/audioengine.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index daf259d77..657c38c7a 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -113,12 +113,6 @@ AudioEngine::stop() m_expectStop = true; m_mediaObject->stop(); - if ( !m_input.isNull() ) - { - m_input->close(); - m_input.clear(); - } - setCurrentTrack( Tomahawk::result_ptr() ); emit stopped(); } @@ -198,8 +192,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result ) m_expectStop = true; } - m_input = io; - if ( !m_currentTrack->url().startsWith( "http://" ) ) { m_mediaObject->setCurrentSource( io.data() ); @@ -215,6 +207,9 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result ) } m_mediaObject->setCurrentSource( furl ); } + + m_input = io; + m_mediaObject->currentSource().setAutoDelete( true ); m_mediaObject->play();