banshee r3126 - in branches/banshee/stable: . src/Dap/Banshee.Dap.Mtp

[gburt svn gnome org]

Author: gburt
Date: Fri Feb  1 00:19:19 2008
New Revision: 3126
URL: http://svn.gnome.org/viewvc/banshee?rev=3126&view=rev

Log:
2008-01-31  Gabriel Burt  <gabriel burt gmail com>

	* src/Dap/Banshee.Dap.Mtp/AlbumSet.cs:
	* src/Dap/Banshee.Dap.Mtp/MtpDap.cs: Add GGonf keys to allow suppressing
	album art transfer even if a device supports it, and to set the max width
	for cover art.


Modified:
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/AlbumSet.cs
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs

Modified: branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/AlbumSet.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/AlbumSet.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/AlbumSet.cs	Fri Feb  1 00:19:19 2008
@@ -81,9 +81,9 @@
             }
         }*/
 
-        private const int MAX_THUMB_WIDTH = 170;
         public IEnumerable<double> Save ()
         {
+            int MAX_THUMB_WIDTH = MtpDap.AlbumArtWidthSchema.Get ();
             double total = old_list.Count + new_list.Count;
             double current = 0;
             foreach (Album album in old_list) {

Modified: branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs
==============================================================================
--- branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs	(original)
+++ branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/MtpDap.cs	Fri Feb  1 00:19:19 2008
@@ -46,6 +46,7 @@
 using Banshee.Base;
 using Banshee.Widgets;
 using Banshee.Sources;
+using Banshee.Configuration;
 
 using Mtp;
 
@@ -434,7 +435,7 @@
 				UpdateMetadata ();
 				UploadTracks ();
 
-                if (supports_jpegs) {
+                if (supports_jpegs && NeverSyncAlbumArtSchema.Get () == false) {
                     UpdateSaveProgress (sync_title, Catalog.GetString ("Syncing album art"), 0);
                     AlbumSet album_set = new AlbumSet (device);
                     foreach (MtpDapTrackInfo track in all_tracks) {
@@ -650,5 +651,25 @@
 		public override bool IsPlaybackSupported {
 			get { return false; }
 		}
+
+        public static readonly SchemaEntry<bool> NeverSyncAlbumArtSchema = new SchemaEntry<bool>(
+            "plugins.mtp", "never_sync_albumart",
+            false,
+            "Album art disabled",
+            "Regardless of device's capabilities, do not sync album art"
+        );
+
+        public static readonly SchemaEntry<int> AlbumArtWidthSchema = new SchemaEntry<int>(
+            "plugins.mtp", "albumart_max_width",
+            170,
+            "Album art max width",
+            "The maximum width to allow for album art."
+        );
+
+        static MtpDap () {
+            // Make sure these get created
+            NeverSyncAlbumArtSchema.Set (NeverSyncAlbumArtSchema.Get ());
+            AlbumArtWidthSchema.Set (AlbumArtWidthSchema.Get ());
+        }
 	}
 }