mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Don't get a QNetworkReply* for http urls as we just discard it later

Browse Source
This commit is contained in:
Leo Franchi
2011-05-07 09:36:55 -04:00
parent 84f6fa9b33
commit d657c43d72
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ AudioEngine::instance()
AudioEngine::AudioEngine() AudioEngine::AudioEngine()
: QObject() : QObject()
, m_isPlayingHttp( false )
, m_playlist( 0 ) , m_playlist( 0 )
, m_currentTrackPlaylist( 0 ) , m_currentTrackPlaylist( 0 )
, m_queue( 0 ) , m_queue( 0 )
@@ -173,6 +174,9 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
else else
{ {
setCurrentTrack( result ); setCurrentTrack( result );
if ( !isHttpResult( m_currentTrack->url() ) )
{
io = Servent::instance()->getIODeviceForUrl( m_currentTrack ); io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
if ( !io || io.isNull() ) if ( !io || io.isNull() )
@@ -182,19 +186,25 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
} }
} }
}
if ( !err ) if ( !err )
{ {
qDebug() << "Starting new song from url:" << m_currentTrack->url(); qDebug() << "Starting new song from url:" << m_currentTrack->url();
emit loading( m_currentTrack ); emit loading( m_currentTrack );
if ( !m_input.isNull() ) if ( !m_input.isNull() || m_isPlayingHttp )
{ {
m_expectStop = true; m_expectStop = true;
} }
if ( !m_currentTrack->url().startsWith( "http://" ) )
m_mediaObject->currentSource().setAutoDelete( true );
if ( !isHttpResult( m_currentTrack->url() ) )
{ {
m_mediaObject->setCurrentSource( io.data() ); m_mediaObject->setCurrentSource( io.data() );
m_isPlayingHttp = false;
} }
else else
{ {
@@ -206,13 +216,11 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
qDebug() << Q_FUNC_INFO << furl; qDebug() << Q_FUNC_INFO << furl;
} }
m_mediaObject->setCurrentSource( furl ); m_mediaObject->setCurrentSource( furl );
m_isPlayingHttp = true;
} }
m_input = io; m_input = io;
m_mediaObject->currentSource().setAutoDelete( true );
m_mediaObject->play(); m_mediaObject->play();
emit started( m_currentTrack ); emit started( m_currentTrack );
DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started ); DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
@@ -229,7 +237,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
return true; return true;
} }
void void
AudioEngine::loadPreviousTrack() AudioEngine::loadPreviousTrack()
{ {
@@ -346,3 +353,9 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
m_currentTrack = result; m_currentTrack = result;
} }
bool
AudioEngine::isHttpResult( const QString& url ) const
{
return url.startsWith( "http://" );
}

3
src/libtomahawk/audio/audioengine.h
View File

@@ -105,6 +105,9 @@ private slots:
void setCurrentTrack( const Tomahawk::result_ptr& result ); void setCurrentTrack( const Tomahawk::result_ptr& result );
private: private:
bool isHttpResult( const QString& ) const;
bool m_isPlayingHttp;
QSharedPointer<QIODevice> m_input; QSharedPointer<QIODevice> m_input;
Tomahawk::result_ptr m_currentTrack; Tomahawk::result_ptr m_currentTrack;