[banshee] [AppleDevice] Fix ipod detection for non-afc devices such as iPod classic
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [AppleDevice] Fix ipod detection for non-afc devices such as iPod classic
- Date: Fri, 13 Aug 2010 22:53:06 +0000 (UTC)
commit eea501609aa47ea15a662d1cd21d3a4a7e0b0840
Author: Alex Launi <alex launi gmail com>
Date: Sat Jul 31 11:06:55 2010 +0200
[AppleDevice] Fix ipod detection for non-afc devices such as iPod classic
Devices were being loaded as UMS, rather than as AppleDevices.
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
index 5f718bb..c4251e2 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
@@ -67,8 +67,10 @@ namespace Banshee.Dap.AppleDevice
public override void DeviceInitialize (IDevice device)
{
Volume = device as IVolume;
- if (Volume == null || Volume.FileSystem != "afc")
+
+ if (Volume == null || !(Volume.FileSystem == "afc" || GPod.ITDB.GetControlPath (Volume.MountPoint) != null)) {
throw new InvalidDeviceException ();
+ }
base.DeviceInitialize (device);
@@ -236,12 +238,12 @@ namespace Banshee.Dap.AppleDevice
{
string [] names = new string[4];
string prefix = "multimedia-player-";
- string shell_color = "green";
+ //string shell_color = "green";
names[0] = "";
names[2] = "ipod-standard-color";
names[3] = "multimedia-player";
-
+ /*
switch ("grayscale") {
case "grayscale":
names[1] = "ipod-standard-monochrome";
@@ -272,7 +274,7 @@ namespace Banshee.Dap.AppleDevice
default:
break;
}
-
+ */
names[1] = names[1] ?? names[2];
names[1] = prefix + names[1];
names[2] = prefix + names[2];
@@ -622,7 +624,6 @@ namespace Banshee.Dap.AppleDevice
}
}
}
-
#endregion
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]