1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-23 09:19:41 +01:00

Revert "Skip to next track if we have a QNR and it emits a failed signal"

This reverts commit 9418fd0fb8d1d726149650f35c28f9ac7d80f1bd.
This commit is contained in:
Leo Franchi 2011-11-13 22:27:49 -05:00
parent 2f97ff63f3
commit ba8cfc3e91
3 changed files with 0 additions and 16 deletions

View File

@ -450,9 +450,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
tLog() << "Starting new song:" << m_currentTrack->url();
emit loading( m_currentTrack );
if ( QNetworkReply* qnr_io = qobject_cast< QNetworkReply* >( io.data() ) )
connect( qnr_io, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( ioStreamError( QNetworkReply::NetworkError ) ) );
if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
{
if ( QNetworkReply* qnr_io = qobject_cast< QNetworkReply* >( io.data() ) )
@ -605,16 +602,6 @@ AudioEngine::playItem( Tomahawk::PlaylistInterface* playlist, const Tomahawk::re
}
}
void
AudioEngine::ioStreamError( QNetworkReply::NetworkError error )
{
if ( error != QNetworkReply::NoError )
{
if ( canGoNext() )
loadNextTrack();
}
}
void
AudioEngine::playlistNextTrackReady()

View File

@ -21,7 +21,6 @@
#include <QObject>
#include <QTimer>
#include <QNetworkReply>
#include <phonon/MediaObject>
#include <phonon/AudioOutput>
@ -137,7 +136,6 @@ private slots:
void setCurrentTrack( const Tomahawk::result_ptr& result );
void ioStreamError( QNetworkReply::NetworkError );
private:
void setState( AudioState state );

View File

@ -374,7 +374,6 @@ RdioParser::pixmap() const
if ( !s_pixmap )
s_pixmap = new QPixmap( RESPATH "images/rdio.png" );
return *s_pixmap;
}