banshee r2961 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.MediaEngine src/Core/Banshee.Services/Banshee.Streaming

[abock svn gnome org]

Author: abock
Date: Thu Jan 10 21:22:49 2008
New Revision: 2961
URL: http://svn.gnome.org/viewvc/banshee?rev=2961&view=rev

Log:
2008-01-11  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:
    Set CanPlay attribute

    * src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:
    Enable all the metadata service glory again now that the services are
    actually ported over. Awesome.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs	Thu Jan 10 21:22:49 2008
@@ -4,7 +4,7 @@
 // Author:
 //   Aaron Bockover <abockover novell com>
 //
-// Copyright (C) 2006-2007 Novell, Inc.
+// Copyright (C) 2006-2008 Novell, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -37,7 +37,7 @@
 using Banshee.Base;
 using Banshee.Streaming;
 using Banshee.ServiceStack;
-//using Banshee.Metadata;
+using Banshee.Metadata;
 using Banshee.Configuration;
 using Banshee.Collection;
 
@@ -92,7 +92,7 @@
                     "No player engines were found. Please ensure Banshee has been cleanly installed."));
             }
             
-            //MetadataService.Instance.HaveResult += OnMetadataServiceHaveResult;
+            MetadataService.Instance.HaveResult += OnMetadataServiceHaveResult;
         }
         
         private void LoadEngine(TypeExtensionNode node)
@@ -116,7 +116,7 @@
         {
         }
         
-        /*private void OnMetadataServiceHaveResult(object o, MetadataLookupResultArgs args)
+        private void OnMetadataServiceHaveResult(object o, MetadataLookupResultArgs args)
         {
             if(CurrentTrack != null && args.Track == CurrentTrack) {
                 foreach(StreamTag tag in args.ResultTags) {
@@ -127,7 +127,7 @@
                 eventargs.Event = PlayerEngineEvent.TrackInfoUpdated;
                 OnEngineEventChanged(active_engine, eventargs);
             }
-        }*/
+        }
         
         private void OnEngineStateChanged(object o, PlayerEngineStateArgs args)
         {
@@ -137,7 +137,7 @@
             
             if(args.State == PlayerEngineState.Loaded && CurrentTrack != null) {
                 active_engine.Volume = (ushort)VolumeSchema.Get ();
-                //MetadataService.Instance.Lookup(CurrentTrack);
+                MetadataService.Instance.Lookup(CurrentTrack);
             } 
             
             PlayerEngineStateHandler handler = StateChanged;

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs	Thu Jan 10 21:22:49 2008
@@ -49,18 +49,21 @@
         
         public event EventHandler ParsingPlaylistEvent;
         
-        public RadioTrackInfo(Track track) : base()
+        protected RadioTrackInfo()
+        {
+            Attributes |= TrackAttributes.IsLive | TrackAttributes.CanPlay;
+        }
+        
+        public RadioTrackInfo(Track track) : this()
         {
             TrackTitle = track.Title;
             ArtistName = track.Creator;
             this.track = track;
-            Attributes |= TrackAttributes.IsLive;
         }
         
-        public RadioTrackInfo(SafeUri uri) : base()
+        public RadioTrackInfo(SafeUri uri) : this()
         {
             this.single_location = uri;
-            Attributes |= TrackAttributes.IsLive;
         }
         
         public void Play()