From ba8cfc3e918a9c71ba60343d8fa46f8a6fecdd70 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 13 Nov 2011 22:27:49 -0500
Subject: [PATCH] Revert "Skip to next track if we have a QNR and it emits a
 failed signal"

This reverts commit 9418fd0fb8d1d726149650f35c28f9ac7d80f1bd.
---
 src/libtomahawk/audio/audioengine.cpp | 13 -------------
 src/libtomahawk/audio/audioengine.h   |  2 --
 src/libtomahawk/utils/rdioparser.cpp  |  1 -
 3 files changed, 16 deletions(-)

diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index 7578fc6be..25da732b2 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -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()
diff --git a/src/libtomahawk/audio/audioengine.h b/src/libtomahawk/audio/audioengine.h
index 6a516cb46..0638270d3 100644
--- a/src/libtomahawk/audio/audioengine.h
+++ b/src/libtomahawk/audio/audioengine.h
@@ -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 );
 
diff --git a/src/libtomahawk/utils/rdioparser.cpp b/src/libtomahawk/utils/rdioparser.cpp
index 7e7d2e28f..a0621f23c 100644
--- a/src/libtomahawk/utils/rdioparser.cpp
+++ b/src/libtomahawk/utils/rdioparser.cpp
@@ -374,7 +374,6 @@ RdioParser::pixmap() const
     if ( !s_pixmap )
         s_pixmap = new QPixmap( RESPATH "images/rdio.png" );
 
-
     return *s_pixmap;
 }