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

[gburt svn gnome org]

Author: gburt
Date: Tue May  6 16:30:37 2008
New Revision: 3889
URL: http://svn.gnome.org/viewvc/banshee?rev=3889&view=rev

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

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
	Style.

	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Fix bug that caused mass
	storage DAPs to be ignored.


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	Tue May  6 16:30:37 2008
@@ -100,7 +100,11 @@
         }
 
         protected override IDeviceMediaCapabilities MediaCapabilities {
-            get { return (volume.Parent == null) ? base.MediaCapabilities : volume.Parent.MediaCapabilities ?? base.MediaCapabilities; }
+            get {
+                return (volume.Parent == null)
+                    ? base.MediaCapabilities
+                    : volume.Parent.MediaCapabilities ?? base.MediaCapabilities;
+            }
         }
 
         protected string IsAudioPlayerPath {

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	Tue May  6 16:30:37 2008
@@ -262,7 +262,7 @@
         }
 
         protected virtual bool HasMediaCapabilities {
-            get { return device.MediaCapabilities != null; }
+            get { return MediaCapabilities != null; }
         }
 
         protected virtual IDeviceMediaCapabilities MediaCapabilities {