[banshee] GStreamer: Small fixes

[Gabriel Burt <gburt src gnome org>]

commit f81d5724532494832ae71396415fdb1d0b742e1d
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Mon Mar 28 13:57:24 2011 -0500

    GStreamer: Small fixes
    
    Raising EoS/SoS on NexTrackStarting signal is only needed if we were
    playing a song before this one.  Prevent some NREs too.

 .../Banshee.GStreamer/PlayerEngine.cs              |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index 76848a9..315b9ac 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@ -308,7 +308,7 @@ namespace Banshee.GStreamer
             Close (false);
             OnEventChanged (PlayerEvent.EndOfStream);
             if (!next_track_pending &&
-                (!GaplessEnabled || ((CurrentTrack.MediaAttributes & TrackMediaAttributes.VideoStream) != 0))) {
+                (!GaplessEnabled || (CurrentTrack != null && CurrentTrack.HasAttribute (TrackMediaAttributes.VideoStream)))) {
                 // We don't request next track in OnEoS if gapless playback is enabled and current track has no video stream contained.
                 // The request next track is already called in OnAboutToFinish().
                 OnEventChanged (PlayerEvent.RequestNextTrack);
@@ -320,7 +320,7 @@ namespace Banshee.GStreamer
                 OpenUri (pending_uri, pending_maybe_video);
                 Play ();
                 pending_uri = null;
-            } else if (!GaplessEnabled || ((CurrentTrack.MediaAttributes & TrackMediaAttributes.VideoStream) != 0)) {
+            } else if (!GaplessEnabled || (CurrentTrack != null && CurrentTrack.HasAttribute (TrackMediaAttributes.VideoStream))) {
                 // This should be unreachable - the RequestNextTrack event is delegated to the main thread
                 // and so blocks the bus callback from delivering the EOS message.
                 //
@@ -362,10 +362,14 @@ namespace Banshee.GStreamer
         {
             if (GaplessEnabled) {
                 // Must do it here because the next track is already playing.
-                ServiceManager.PlayerEngine.IncrementLastPlayed (1.0);
 
-                OnEventChanged (PlayerEvent.EndOfStream);
-                OnEventChanged (PlayerEvent.StartOfStream);
+                // If the state is anything other than loaded, assume we were just playing a track and should
+                // EoS it and increment its playcount etc.
+                if (CurrentState != PlayerState.Loaded) {
+                    ServiceManager.PlayerEngine.IncrementLastPlayed (1.0);
+                    OnEventChanged (PlayerEvent.EndOfStream);
+                    OnEventChanged (PlayerEvent.StartOfStream);
+                }
             }
         }