banshee r5008 - in branches/banshee/stable: . src/Dap/Banshee.Dap/Banshee.Dap

[gburt svn gnome org]

Author: gburt
Date: Wed Feb  4 17:41:46 2009
New Revision: 5008
URL: http://svn.gnome.org/viewvc/banshee?rev=5008&view=rev

Log:
2009-02-03  Gabriel Burt  <gabriel burt gmail com>

	* src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs: Patch from AndrÃs G.
	Aragoneses, moving the removal of DAP playlists from being called on each
	LibrarySync (eg once for Music, Video, etc) to the overall DapSync, fixing
	bug where playlists didn't sync to DAPs because they were deleted when the
	PodcastSource synced (BGO #560970)



Modified:
   branches/banshee/stable/   (props changed)
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs

Modified: branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs	Wed Feb  4 17:41:46 2009
@@ -204,9 +204,8 @@
                 }
 
                 if (library.SupportsPlaylists && sync.Dap.SupportsPlaylists) {
-                    sync.Dap.RemovePlaylists ();
-
-                    // Then create the playlists, taking snapshots of smart playlists and saving them
+                    
+                    // Now create the playlists, taking snapshots of smart playlists and saving them
                     // as normal playlists
                     IList<AbstractPlaylistSource> playlists = GetSyncPlaylists ();
                     foreach (AbstractPlaylistSource from in playlists) {

Modified: branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs	Wed Feb  4 17:41:46 2009
@@ -285,11 +285,28 @@
         private void RateLimitedSync ()
         {
             syncing = true;
+
+            bool sync_playlists = false;
+            if (dap.SupportsPlaylists) {
+                foreach (DapLibrarySync library_sync in library_syncs) {
+                    if (library_sync.Library.SupportsPlaylists) {
+                        sync_playlists = true;
+                        break;
+                    }
+                }
+            }
             
+            if (sync_playlists) {
+                dap.RemovePlaylists ();
+            }
+
             foreach (DapLibrarySync library_sync in library_syncs) {
                 library_sync.Sync ();
             }
-            dap.SyncPlaylists ();
+
+            if (sync_playlists) {
+                dap.SyncPlaylists ();
+            }
 
             syncing = false;
         }