banshee r3069 - in trunk/banshee: . src src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.MediaEngine src/Core/Banshee.Services/Banshee.PlaybackController src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient/Banshee.Gui

[abock svn gnome org]

Author: abock
Date: Mon Jan 28 22:09:29 2008
New Revision: 3069
URL: http://svn.gnome.org/viewvc/banshee?rev=3069&view=rev

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

    * src/Core/Banshee.Services/Banshee.MediaEngine/IPlaybackController.cs:
    * src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerDatabaseStack.cs:
    * src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackRepeatMode.cs:
    * src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackShuffleMode.cs:
    * src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs:
    * src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:
    Moved playback controller APIs to their own 
    namespace - Banshee.PlaybackController

    * src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerService.cs:
    Removed all the play queue stuff I did last night - it was way too late
    and was a horrible hack design



Added:
   trunk/banshee/src/Core/Banshee.Services/Banshee.PlaybackController/
Modified:
   trunk/banshee/Banshee.mds
   trunk/banshee/ChangeLog
   trunk/banshee/src/Banshee.mds
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlaybackController.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerDatabaseStack.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerService.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackRepeatMode.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackShuffleMode.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs

Modified: trunk/banshee/Banshee.mds
==============================================================================
--- trunk/banshee/Banshee.mds	(original)
+++ trunk/banshee/Banshee.mds	Mon Jan 28 22:09:29 2008
@@ -14,4 +14,4 @@
     <Entry filename="src/Banshee.mds" />
     <Entry filename="tests/tests.mdp" />
   </Entries>
-</Combine>
+</Combine>
\ No newline at end of file

Modified: trunk/banshee/src/Banshee.mds
==============================================================================
--- trunk/banshee/src/Banshee.mds	(original)
+++ trunk/banshee/src/Banshee.mds	Mon Jan 28 22:09:29 2008
@@ -16,4 +16,4 @@
     <Entry filename="Backends/Backends.mds" />
     <Entry filename="Extensions/Extensions.mds" />
   </Entries>
-</Combine>
+</Combine>
\ No newline at end of file

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlaybackController.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlaybackController.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IPlaybackController.cs	Mon Jan 28 22:09:29 2008
@@ -31,7 +31,7 @@
 
 using Banshee.ServiceStack;
 
-namespace Banshee.MediaEngine
+namespace Banshee.PlaybackController
 {
     public delegate void PlaybackControllerStoppedHandler ();
 

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerDatabaseStack.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerDatabaseStack.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerDatabaseStack.cs	Mon Jan 28 22:09:29 2008
@@ -4,7 +4,7 @@
 // Author:
 //   Aaron Bockover <abockover novell com>
 //
-// Copyright (C) 2007 Novell, Inc.
+// Copyright (C) 2007-2008 Novell, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@
 using Hyena.Collections;
 using Banshee.Collection;
 
-namespace Banshee.MediaEngine
+namespace Banshee.PlaybackController
 {
     internal class PlaybackControllerDatabaseStack : IStackProvider<TrackInfo>
     {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackControllerService.cs	Mon Jan 28 22:09:29 2008
@@ -34,8 +34,9 @@
 using Banshee.Sources;
 using Banshee.ServiceStack;
 using Banshee.Collection;
+using Banshee.MediaEngine;
 
-namespace Banshee.MediaEngine
+namespace Banshee.PlaybackController
 {
     public class PlaybackControllerService : IService, IPlaybackController
     {
@@ -95,8 +96,6 @@
         {
             switch (args.Event) {
                 case PlayerEngineEvent.EndOfStream:
-                    FondlePlayQueue ();
-                
                     if (!StopWhenFinished) {
                         Next ();
                     } else {
@@ -125,8 +124,6 @@
         
         public void Next ()
         {
-            FondlePlayQueue ();
-            
             TrackInfo tmp_track = CurrentTrack;
 
             if (next_stack.Count > 0) {
@@ -189,20 +186,7 @@
             changing_to_track = CurrentTrack;
             player_engine.OpenPlay (CurrentTrack);
         }
-        
-        private void FondlePlayQueue ()
-        {
-            if (PlayQueue == null || PlayQueue.Count <= 0) {
-                return;
-            }
-            
-            if (current_track_source == PlayQueue) {
-                // TODO: Remove from play queue
-            }
-            
-            Source = PlayQueue;
-        }
-        
+
         protected virtual void OnStopped ()
         {
             EventHandler handler = Stopped;
@@ -248,10 +232,6 @@
             }
         }
         
-        private ITrackModelSource PlayQueue {
-            get { return Banshee.Playlist.PlayQueueSource.Instance; }
-        }
-        
         public PlaybackShuffleMode ShuffleMode {
             get { return shuffle_mode; }
             set { shuffle_mode = value; }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackRepeatMode.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackRepeatMode.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackRepeatMode.cs	Mon Jan 28 22:09:29 2008
@@ -4,7 +4,7 @@
 // Author:
 //   Aaron Bockover <abockover novell com>
 //
-// Copyright (C) 2007 Novell, Inc.
+// Copyright (C) 2007-2008 Novell, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace Banshee.MediaEngine
+namespace Banshee.PlaybackController
 {
     public enum PlaybackRepeatMode
     {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackShuffleMode.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackShuffleMode.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlaybackShuffleMode.cs	Mon Jan 28 22:09:29 2008
@@ -4,7 +4,7 @@
 // Author:
 //   Aaron Bockover <abockover novell com>
 //
-// Copyright (C) 2007 Novell, Inc.
+// Copyright (C) 2007-2008 Novell, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace Banshee.MediaEngine
+namespace Banshee.PlaybackController
 {
     public enum PlaybackShuffleMode
     {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs	Mon Jan 28 22:09:29 2008
@@ -38,6 +38,7 @@
 using Banshee.SmartPlaylist;
 using Banshee.Database;
 using Banshee.MediaEngine;
+using Banshee.PlaybackController;
 using Banshee.Library;
 
 namespace Banshee.ServiceStack

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp	Mon Jan 28 22:09:29 2008
@@ -113,6 +113,7 @@
     <File name="Banshee.Database/BansheeModelProvider.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Database/BansheeModelCache.cs" subtype="Code" buildaction="Compile" />
     <File name="Banshee.Playlist/PlayQueueSource.cs" subtype="Code" buildaction="Compile" />
+    <File name="Banshee.PlaybackController" subtype="Directory" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	Mon Jan 28 22:09:29 2008
@@ -34,6 +34,7 @@
 using Banshee.Collection;
 using Banshee.ServiceStack;
 using Banshee.MediaEngine;
+using Banshee.PlaybackController;
 using Banshee.Gui.Dialogs;
 
 namespace Banshee.Gui