mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-05 05:37:29 +02:00
Don't get a QNetworkReply* for http urls as we just discard it later
This commit is contained in:
@@ -38,6 +38,7 @@ AudioEngine::instance()
|
||||
|
||||
AudioEngine::AudioEngine()
|
||||
: QObject()
|
||||
, m_isPlayingHttp( false )
|
||||
, m_playlist( 0 )
|
||||
, m_currentTrackPlaylist( 0 )
|
||||
, m_queue( 0 )
|
||||
@@ -173,6 +174,9 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
||||
else
|
||||
{
|
||||
setCurrentTrack( result );
|
||||
|
||||
if ( !isHttpResult( m_currentTrack->url() ) )
|
||||
{
|
||||
io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
|
||||
|
||||
if ( !io || io.isNull() )
|
||||
@@ -182,19 +186,25 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ( !err )
|
||||
{
|
||||
qDebug() << "Starting new song from url:" << m_currentTrack->url();
|
||||
emit loading( m_currentTrack );
|
||||
|
||||
if ( !m_input.isNull() )
|
||||
if ( !m_input.isNull() || m_isPlayingHttp )
|
||||
{
|
||||
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_isPlayingHttp = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -206,13 +216,11 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
||||
qDebug() << Q_FUNC_INFO << furl;
|
||||
}
|
||||
m_mediaObject->setCurrentSource( furl );
|
||||
m_isPlayingHttp = true;
|
||||
}
|
||||
|
||||
m_input = io;
|
||||
|
||||
m_mediaObject->currentSource().setAutoDelete( true );
|
||||
m_mediaObject->play();
|
||||
|
||||
emit started( m_currentTrack );
|
||||
|
||||
DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
|
||||
@@ -229,7 +237,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AudioEngine::loadPreviousTrack()
|
||||
{
|
||||
@@ -346,3 +353,9 @@ AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
|
||||
|
||||
m_currentTrack = result;
|
||||
}
|
||||
|
||||
bool
|
||||
AudioEngine::isHttpResult( const QString& url ) const
|
||||
{
|
||||
return url.startsWith( "http://" );
|
||||
}
|
||||
|
@@ -105,6 +105,9 @@ private slots:
|
||||
void setCurrentTrack( const Tomahawk::result_ptr& result );
|
||||
|
||||
private:
|
||||
bool isHttpResult( const QString& ) const;
|
||||
|
||||
bool m_isPlayingHttp;
|
||||
QSharedPointer<QIODevice> m_input;
|
||||
|
||||
Tomahawk::result_ptr m_currentTrack;
|
||||
|
Reference in New Issue
Block a user