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

[gburt svn gnome org]

Author: gburt
Date: Wed May 28 18:21:14 2008
New Revision: 4009
URL: http://svn.gnome.org/viewvc/banshee?rev=4009&view=rev

Log:
2008-05-28  Gabriel Burt  <gabriel burt gmail com>

	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Only set the
	AcceptableMimeTypes if they are null/haven't been set.

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
	Parse the .is_audio_player output_formats key.  The last fix required to
	close BGO #531769.


Modified:
   trunk/banshee/ChangeLog
   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/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 May 28 18:21:14 2008
@@ -319,7 +319,10 @@
                         break;
 
                     case "output_formats":
-                        //PlaybackFormats = val.Split (',');
+                        AcceptableMimeTypes = val.Split(',');
+                        for (int i = 0; i < AcceptableMimeTypes.Length; i++) {
+                            AcceptableMimeTypes[i] = AcceptableMimeTypes[i].Trim ();
+                        }
                         break;
 
                     case "folder_depth":

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 May 28 18:21:14 2008
@@ -112,9 +112,11 @@
             AddDapProperty (Catalog.GetString ("Product"), device.Product);
             AddDapProperty (Catalog.GetString ("Vendor"), device.Vendor);
             
-            acceptable_mimetypes = MediaCapabilities != null 
-                ? MediaCapabilities.PlaybackMimeTypes 
-                : new string [] { "taglib/mp3" };
+            if (acceptable_mimetypes == null) {
+                acceptable_mimetypes = MediaCapabilities != null 
+                    ? MediaCapabilities.PlaybackMimeTypes 
+                    : new string [] { "taglib/mp3" };
+            }
 
             AddChildSource (new MusicGroupSource (this));
             AddChildSource (new VideoGroupSource (this));