banshee r3900 - in trunk/banshee: . src/Core/Banshee.ThickClient src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.Podcasting/Banshee.Podcasting

[abock svn gnome org]

Author: abock
Date: Tue May  6 19:47:57 2008
New Revision: 3900
URL: http://svn.gnome.org/viewvc/banshee?rev=3900&view=rev

Log:
2008-05-06  Aaron Bockover  <abock gnome org>

    * src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:
    * src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs:
    Build fixes



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
   trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
   trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am	Tue May  6 19:47:57 2008
@@ -102,9 +102,9 @@
 	Banshee.ThickClient.addin.xml \
 	Resources/banshee-dialogs.glade \
 	Resources/banshee-logo.png \
-	Resources/jcastro.png \
 	Resources/browser-album-cover.png \
-	Resources/core-ui-actions-layout.xml
+	Resources/core-ui-actions-layout.xml \
+	Resources/jcastro.png
 
 include $(top_srcdir)/build/build.mk
 

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs	Tue May  6 19:47:57 2008
@@ -134,7 +134,7 @@
         {
             // Stop currently playing track if its from us.
             try {
-                if (ServiceManager.PlayerEngine.CurrentState == Banshee.MediaEngine.PlayerEngineState.Playing) {
+                if (ServiceManager.PlayerEngine.CurrentState == Banshee.MediaEngine.PlayerState.Playing) {
                     DatabaseTrackInfo track = ServiceManager.PlayerEngine.CurrentTrack as DatabaseTrackInfo;
                     if (track != null && track.PrimarySource == this) {
                         ServiceManager.PlayerEngine.Close ();

Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs	Tue May  6 19:47:57 2008
@@ -42,6 +42,7 @@
 using Migo.Syndication;
 using Migo.DownloadCore;
 
+using Banshee.MediaEngine;
 using Banshee.Podcasting.Gui;
 using Banshee.Podcasting.Data;
 using Banshee.Collection.Database;
@@ -98,7 +99,7 @@
             feeds_manager.FeedDownloadCountChanged += OnFeedDownloadCountChangedHandler;
             feeds_manager.EnclosureDownloadCompleted += OnTaskStoppedHandler;
               
-            ServiceManager.PlayerEngine.StateChanged += OnPlayerEngineStateChangedHandler;
+            ServiceManager.PlayerEngine.ConnectEvent (OnPlayerEvent, PlayerEvent.StateChange);
 
             InitializeInterface ();
 
@@ -117,7 +118,7 @@
                 }
             }
             
-            ServiceManager.PlayerEngine.StateChanged -= OnPlayerEngineStateChangedHandler;
+            ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
 
             Log.Debug ("Disposing dmInterface");    
             if (download_manager_iface != null) {
@@ -335,7 +336,7 @@
             }*/
         }        
 
-        private void OnPlayerEngineStateChangedHandler (object sender, EventArgs e)
+        private void OnPlayerEvent (PlayerEventArgs args)
         {
             lock (sync) {
                 //source.Reload ();