banshee r4152 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue src/Libraries/Hyena/Hyena.Collections

[abock svn gnome org]

Author: abock
Date: Mon Jun 16 21:00:14 2008
New Revision: 4152
URL: http://svn.gnome.org/viewvc/banshee?rev=4152&view=rev

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

    * src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:
    Fix some special case playback issue that was broken depending on cache
    state between library and FSQ - if an item is not available yet, do not
    disable the play_enqueued state, instead defer to the next reload; fix
    the regression where the source was not visible at startup; I really hope
    this fixes the last of the FSQ issues - it's working *really* well for me
    but I am about to stab my eye balls out over this code.

    * src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:
    * src/Libraries/Hyena/Hyena.Collections/QueuePipelineElement.cs: Removed
    two errant write lines



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
   trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Collections/QueuePipelineElement.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs	Mon Jun 16 21:00:14 2008
@@ -176,7 +176,9 @@
                     return;
                 }
                 
-                Log.DebugTimerPrint (timer_id, Title + " duration: {0}");
+                if (!KeepUserJobHidden) {
+                    Log.DebugTimerPrint (timer_id, Title + " duration: {0}");
+                }
                 
                 user_job.CancelRequested -= OnCancelRequested;
                 user_job.Finish ();

Modified: trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs	Mon Jun 16 21:00:14 2008
@@ -91,6 +91,8 @@
             UpdateActions ();
             ServiceManager.SourceManager.ActiveSourceChanged += delegate { UpdateActions (); };
             TrackModel.Reloaded += OnTrackModelReloaded;
+            
+            Reload ();
 
             play_enqueued = ApplicationContext.CommandLine.Contains ("play-enqueued");
             
@@ -137,13 +139,12 @@
         }
         
         private void PlayEnqueued ()
-        {
+        {   
             if (!play_enqueued || path_to_play == null) {
                 return;
             }
             
             SafeUri uri = null;
-            play_enqueued = false;
             
             ServiceManager.PlaybackController.NextSource = this;
             
@@ -165,6 +166,7 @@
                     TrackInfo track = TrackModel[index];
                     if (track != null) {
                         ServiceManager.PlayerEngine.OpenPlay (track);
+                        play_enqueued = false;
                     }
                 }
             }
@@ -208,15 +210,6 @@
             }
         }
         
-        public override void Reload ()
-        {
-            base.Reload ();
-            
-            //if (Count > 0) {
-                PlayEnqueued ();
-          //  }
-        }
-        
         private void OnTrackModelReloaded (object sender, EventArgs args)
         {
             if (Count > 0 && !visible) {
@@ -225,7 +218,7 @@
             } else if (Count <= 0 && visible) {
                 ServiceManager.SourceManager.RemoveSource (this);
                 visible = false;
-            }            
+            }
             
             if (Count > 0) {
                 PlayEnqueued ();

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Collections/QueuePipelineElement.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Collections/QueuePipelineElement.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Collections/QueuePipelineElement.cs	Mon Jun 16 21:00:14 2008
@@ -52,14 +52,10 @@
             lock (this) {
                 canceled = false;
             }
-            
-            Console.WriteLine ("Finished {0}", GetType ());
         }
         
         protected virtual void OnCanceled ()
         {
-            Console.WriteLine ("Canceled {0}", GetType ());
-        
             lock (queue) {
                 queue.Clear ();
             }