mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

* Fix AudioEngine killing Phonon's QIODevice.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-01 13:05:04 +02:00
parent af49afac35
commit 82a5058e4c
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/audio/audioengine.cpp
View File

@@ -113,12 +113,6 @@ AudioEngine::stop()
m_expectStop = true; m_expectStop = true;
m_mediaObject->stop(); m_mediaObject->stop();
if ( !m_input.isNull() )
{
m_input->close();
m_input.clear();
}
setCurrentTrack( Tomahawk::result_ptr() ); setCurrentTrack( Tomahawk::result_ptr() );
emit stopped(); emit stopped();
} }
@@ -198,8 +192,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
m_expectStop = true; m_expectStop = true;
} }
m_input = io;
if ( !m_currentTrack->url().startsWith( "http://" ) ) if ( !m_currentTrack->url().startsWith( "http://" ) )
{ {
m_mediaObject->setCurrentSource( io.data() ); m_mediaObject->setCurrentSource( io.data() );
@@ -215,6 +207,9 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
} }
m_mediaObject->setCurrentSource( furl ); m_mediaObject->setCurrentSource( furl );
} }
m_input = io;
m_mediaObject->currentSource().setAutoDelete( true ); m_mediaObject->currentSource().setAutoDelete( true );
m_mediaObject->play(); m_mediaObject->play();