[meego-commits] 6174: Changes to MeeGo:1.0:Netbook:Update:Testing/banshee-1

[Aaron Bockover]

Hi,
I have made the following changes to banshee-1 in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Aaron Bockover

[This message was auto-generated]

---

Request #6174:

  submit:   home:abock:branches:MeeGo:1.0:Netbook:Update:Testing/banshee-1(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/banshee-1


Message:
    - Added switch-to-nowplaying-on-video-start-bmc1748.patch, allowing

State:   new          2010-07-31T09:56:00 abock
Comment: None



changes files:
--------------
--- banshee-1.changes
+++ banshee-1.changes
@@ -1,0 +2,6 @@
+Sat Jul 31 20:56:16 UTC 2010 - abockover at novell.com
+
+- Added switch-to-nowplaying-on-video-start-bmc1748.patch, allowing
+  switching to Now Playing upon starting a video (bmc#1748)
+
+-------------------------------------------------------------------

new:
----
  switch-to-nowplaying-on-video-start-bmc1748.patch

spec files:
-----------
--- banshee-1.spec
+++ banshee-1.spec
@@ -62,6 +62,8 @@
 Patch10:        play-next-track-after-unsupported-codec-bmc802.patch
 # PATCH IS MEEGO SPECIFIC (EVALUATE UPSTREAM)
 Patch11:        close-player-engine-on-fsq-clear-bmc2684.patch
+# PATCH IS MEEGO SPECIFIC (EVALUATE UPSTREAM)
+Patch12:        switch-to-nowplaying-on-video-start-bmc1748.patch
 # PATCH IS INTEL MEEGO SPECIFIC
 Patch100:       media-as-meego-icon-name.patch
 Requires:       filesystem %gconf_package
@@ -656,6 +658,7 @@
 %patch9 -p1 -b .increase-pipeline-ready-timeout-bmc193
 %patch10 -p1 -b .play-next-track-after-unsupported-codec-bmc802
 %patch11 -p1 -b .close-player-engine-on-fsq-clear-bmc2684
+%patch12 -p1 -b .switch-to-nowplaying-on-video-start-bmc1748
 %if !0%{?suse_version}
 %patch100 -p1 -b .media-as-meego-icon-name
 %endif

other changes:
--------------

++++++ switch-to-nowplaying-on-video-start-bmc1748.patch (new)
--- switch-to-nowplaying-on-video-start-bmc1748.patch
+++ switch-to-nowplaying-on-video-start-bmc1748.patch
+From 1c6c64f07de93319860e4f58fac9d4f1687296db Mon Sep 17 00:00:00 2001
+From: Aaron Bockover <abockover at novell.com>
+Date: Sat, 31 Jul 2010 22:53:29 +0200
+Subject: [PATCH] Call OnTrackStarted on a PlayerEvent.StartOfStream
+
+This may just be a workaround and it needs to be verified. It should
+already be handled by the PlayerEvent.StateChange event when
+transitioning between tracks.
+
+This seems to fix bmc#1748
+---
+ .../PlaybackControllerService.cs                   |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+index 8dfb9fc..9f8743b 100644
+--- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
++++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
+@@ -131,6 +131,11 @@ namespace Banshee.PlaybackController
+                 case PlayerEvent.StartOfStream:
+                     CurrentTrack = player_engine.CurrentTrack;
+                     consecutive_errors = 0;
++
++                    // TODO: verify if this is the correct fix
++                    // for bmc1748; this should be handled already
++                    // by the PlayerEvent.StateChange event below
++                    OnTrackStarted ();
+                     break;
+                 case PlayerEvent.EndOfStream:
+                     EosTransition ();
+-- 
+1.7.1
+