banshee r5139 - in trunk/banshee: . src/Dap/Banshee.Dap/Banshee.Dap src/Dap/Banshee.Dap/Banshee.Dap.Gui

[gburt svn gnome org]

Author: gburt
Date: Wed Mar 18 23:55:07 2009
New Revision: 5139
URL: http://svn.gnome.org/viewvc/banshee?rev=5139&view=rev

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

	* src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs: Remove cruft and unnecessary
	logging.

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapContent.cs	Wed Mar 18 23:55:07 2009
@@ -43,8 +43,6 @@
     {
         private DapSource dap;
         
-        //private WrapLabel dap_stats;
-
         // Ugh, this is to avoid the GLib.MissingIntPtrCtorException seen by some; BGO #552169
         protected DapContent (IntPtr ptr) : base (ptr)
         {
@@ -82,18 +80,8 @@
             
             Add (split_box);
             ShowAll ();
-            
-            /*dap_stats = new WrapLabel ();
-            dap.Sync.Updated += delegate { Banshee.Base.ThreadAssist.ProxyToMain (UpdateStatus); };
-            dap_stats.Text = dap.Sync.ToString ();
-            vbox.PackStart (dap_stats, false, false, 0);*/
         }
 
-        /*private void UpdateStatus ()
-        {
-            //dap_stats.Text = dap.Sync.ToString ();
-        }*/
-
         private void BuildActions ()
         {
             if (actions == null) {

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs	Wed Mar 18 23:55:07 2009
@@ -193,9 +193,9 @@
         internal void Sync ()
         {
             if (Enabled) {
-                Log.InformationFormat ("Syncing {0}, in main thread? {1}", library, Banshee.Base.ThreadAssist.InMainThread);
+                Banshee.Base.ThreadAssist.AssertNotInMainThread ();
                 if (to_remove.Count > 0) {
-                    Log.DebugFormat ("deleting items for {0} - {1} items; to_remove is smartplaylist {2}, with cachid {3}", library.Name, to_remove.Count, to_remove.DbId, to_remove.DatabaseTrackModel.CacheId);
+                    //Log.DebugFormat ("deleting items for {0} - {1} items; to_remove is smartplaylist {2}, with cachid {3}", library.Name, to_remove.Count, to_remove.DbId, to_remove.DatabaseTrackModel.CacheId);
                     sync.Dap.DeleteAllTracks (to_remove);
                 }
 

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Wed Mar 18 23:55:07 2009
@@ -227,15 +227,6 @@
             }
         }
         
-        /*public override void AddChildSource (Source child)
-        {
-            if (child is Banshee.Playlist.AbstractPlaylistSource && !(child is MediaGroupSource)) {
-                Log.Information ("Note: playlists added to digital audio players within Banshee are not yet saved to the device.", true);
-            }
-            
-            base.AddChildSource (child);
-        }*/
-
         // Force to zero so that count doesn't show up
         public override int Count {
             get { return 0; }

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs	Wed Mar 18 23:55:07 2009
@@ -249,7 +249,6 @@
                 library_sync.CalculateSync ();
             }
 
-            Log.Information (ToString ());
             OnUpdated ();
         }