banshee r4933 - in trunk/banshee: . src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage src/Dap/Banshee.Dap/Banshee.Dap

[blorentz svn gnome org]

Author: blorentz
Date: Wed Jan 21 20:34:48 2009
New Revision: 4933
URL: http://svn.gnome.org/viewvc/banshee?rev=4933&view=rev

Log:
2009-01-21  Bertrand Lorentz  <bertrand lorentz gmail com>

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:
	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Make sure that folder depth
	defaults to -1 if it's not set, and transfer cover art to the DAP in this
	case (BGO #561914).



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs	Wed Jan 21 20:34:48 2009
@@ -84,7 +84,12 @@
                             case "cover_art_file_name": cover_art_file_name = item.Value[0]; break;
                             case "cover_art_size": Int32.TryParse (item.Value[0], out cover_art_size); break;
                             
-                            case "folder_depth": Int32.TryParse (item.Value[0], out folder_depth); break;
+                            case "folder_depth": 
+                                if (!Int32.TryParse (item.Value[0], out folder_depth)) {
+                                    folder_depth = -1;
+                                }
+                            Hyena.Log.DebugFormat ("MassStorageDevice.LoadDeviceConfiguration {0}", folder_depth);
+                                break;
                             case "audio_folders": audio_folders = item.Value; break;
                             
                             case "output_formats": playback_mime_types = item.Value; break;
@@ -137,7 +142,7 @@
             get { return cover_art_size; } 
         }
         
-        private int folder_depth;
+        private int folder_depth = -1;
         public virtual int FolderDepth { 
             get { return folder_depth; } 
         }

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	Wed Jan 21 20:34:48 2009
@@ -386,7 +386,7 @@
         protected int FolderDepth {
             get {
                 if (folder_depth == -1) {
-                    folder_depth = HasMediaCapabilities ? MediaCapabilities.FolderDepth : 0;
+                    folder_depth = HasMediaCapabilities ? MediaCapabilities.FolderDepth : -1;
                 }
                 return folder_depth;
             }
@@ -452,7 +452,7 @@
             }
 
             if (CoverArtSize > -1 && !String.IsNullOrEmpty (CoverArtFileType) && 
-                    !String.IsNullOrEmpty (CoverArtFileName) && FolderDepth > 0) {
+                    !String.IsNullOrEmpty (CoverArtFileName) && (FolderDepth == -1 || FolderDepth > 0)) {
                 SafeUri cover_uri = new SafeUri (System.IO.Path.Combine (System.IO.Path.GetDirectoryName (new_uri.LocalPath),
                                                                          CoverArtFileName));
                 string coverart_id;

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 Jan 21 20:34:48 2009
@@ -190,7 +190,7 @@
             AddDapProperty (Catalog.GetString ("Vendor"), device.Vendor);
             
             if (acceptable_mimetypes == null) {
-                acceptable_mimetypes = MediaCapabilities != null 
+                acceptable_mimetypes = HasMediaCapabilities 
                     ? MediaCapabilities.PlaybackMimeTypes 
                     : new string [] { "taglib/mp3" };
             }