[gnome-music/wip/merge: 288/343] player: Skip unplayable tracks in Songs view and error icon is now visible.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit e8fb0406e70062e9d90f305f3aa8e441de64a847
Author: Sai <suman sai14 gmail com>
Date:   Sat Jul 20 01:59:16 2013 +0530

    player: Skip unplayable tracks in Songs view and error icon is now visible.
    
    removed theerror in discoverer in the previous commit.
    
    the discoverer should check for the next url.

 gnomemusic/player.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 7a1ece0..7befe96 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -123,11 +123,20 @@ class Player(GObject.GObject):
         self.play_next()
         return True
 
-    def _on_bus_eos(self, bus, message):
+    def skip_track(self):
+        self.currentTrack = self._get_next_track()
         self.nextTrack = self._get_next_track()
 
+    def _on_bus_eos(self, bus, message):
+        self.nextTrack = self._get_next_track()
+        media = self.playlist.get_value(self.nextTrack, self.playlistField)
         if self.nextTrack:
-            GLib.idle_add(self._on_glib_idle)
+            try:
+                self.discoverer.discover_uri(media.get_url())
+                GLib.idle_add(self._on_glib_idle)
+            except:
+                self.skip_track()
+                GLib.idle_add(self._on_glib_idle)
         elif (self.repeat == RepeatType.NONE):
             self.stop()
             self.playBtn.set_image(self._playImage)