GNOME.org
 

[banshee/cleanup: 2/10] cleanup: Remove Ipod backend

commit 996f03d96f8b451101a62565b8da1a2140d084d1
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Tue Apr 26 20:53:37 2011 -0500

    cleanup: Remove Ipod backend
    
    The ipod-sharp based backend is obsolete in favor of the AppleDevice,
    libgpod-based backend.

 Banshee.sln                                        |    8 -
 build/build.environment.mk                         |    2 -
 build/build.rules.mk                               |    6 +-
 build/m4/banshee/dap-ipod.m4                       |   34 -
 configure.ac                                       |    3 -
 data/addin-xml-strings.cs                          |    5 -
 .../Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs  |   37 -
 .../Banshee.Services/Banshee.Hardware/IDevice.cs   |   11 -
 .../devices/multimedia-player-ipod-U2-color.png    |  Bin 493 -> 493 bytes
 .../multimedia-player-ipod-U2-monochrome.png       |  Bin 471 -> 471 bytes
 .../devices/multimedia-player-ipod-mini-blue.png   |  Bin 440 -> 440 bytes
 .../devices/multimedia-player-ipod-mini-gold.png   |  Bin 435 -> 435 bytes
 .../devices/multimedia-player-ipod-mini-green.png  |  Bin 432 -> 432 bytes
 .../devices/multimedia-player-ipod-mini-pink.png   |  Bin 446 -> 446 bytes
 .../devices/multimedia-player-ipod-mini-silver.png |  Bin 392 -> 392 bytes
 .../devices/multimedia-player-ipod-nano-black.png  |  Bin 370 -> 370 bytes
 .../devices/multimedia-player-ipod-nano-white.png  |  Bin 327 -> 327 bytes
 .../devices/multimedia-player-ipod-shuffle.png     |  Bin 292 -> 292 bytes
 .../multimedia-player-ipod-standard-color.png      |  Bin 460 -> 460 bytes
 .../multimedia-player-ipod-standard-monochrome.png |  Bin 443 -> 443 bytes
 .../devices/multimedia-player-ipod-video-black.png |  Bin 490 -> 490 bytes
 .../devices/multimedia-player-ipod-video-white.png |  Bin 446 -> 446 bytes
 .../devices/multimedia-player-ipod-U2-color.png    |  Bin 737 -> 737 bytes
 .../multimedia-player-ipod-U2-monochrome.png       |  Bin 679 -> 679 bytes
 .../devices/multimedia-player-ipod-mini-blue.png   |  Bin 702 -> 702 bytes
 .../devices/multimedia-player-ipod-mini-gold.png   |  Bin 702 -> 702 bytes
 .../devices/multimedia-player-ipod-mini-green.png  |  Bin 700 -> 700 bytes
 .../devices/multimedia-player-ipod-mini-pink.png   |  Bin 686 -> 686 bytes
 .../devices/multimedia-player-ipod-mini-silver.png |  Bin 655 -> 655 bytes
 .../devices/multimedia-player-ipod-nano-black.png  |  Bin 562 -> 562 bytes
 .../devices/multimedia-player-ipod-nano-white.png  |  Bin 582 -> 582 bytes
 .../devices/multimedia-player-ipod-shuffle.png     |  Bin 521 -> 521 bytes
 .../multimedia-player-ipod-standard-color.png      |  Bin 720 -> 720 bytes
 .../multimedia-player-ipod-standard-monochrome.png |  Bin 614 -> 614 bytes
 .../devices/multimedia-player-ipod-video-black.png |  Bin 701 -> 701 bytes
 .../devices/multimedia-player-ipod-video-white.png |  Bin 643 -> 643 bytes
 .../devices/multimedia-player-ipod-U2-color.svg    |    0
 .../multimedia-player-ipod-U2-monochrome.svg       |    0
 .../devices/multimedia-player-ipod-mini-blue.svg   |    0
 .../devices/multimedia-player-ipod-mini-gold.svg   |    0
 .../devices/multimedia-player-ipod-mini-green.svg  |    0
 .../devices/multimedia-player-ipod-mini-pink.svg   |    0
 .../devices/multimedia-player-ipod-mini-silver.svg |    0
 .../devices/multimedia-player-ipod-nano-black.svg  |    0
 .../devices/multimedia-player-ipod-nano-white.svg  |    0
 .../devices/multimedia-player-ipod-shuffle.svg     |    0
 .../multimedia-player-ipod-standard-color.svg      |    0
 .../multimedia-player-ipod-standard-monochrome.svg |    0
 .../devices/multimedia-player-ipod-video-black.svg |    0
 .../devices/multimedia-player-ipod-video-white.svg |    0
 .../Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml    |   27 -
 src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj   |  128 ----
 .../Banshee.Dap.Ipod/DatabaseRebuilder.cs          |  244 -------
 .../Banshee.Dap.Ipod/IpodSource.cs                 |  758 --------------------
 .../Banshee.Dap.Ipod/IpodTrackInfo.cs              |  316 --------
 .../Banshee.Dap.Ipod/PodSleuthDevice.cs            |  386 ----------
 .../Banshee.Dap.Ipod/PodSleuthDeviceProvider.cs    |   81 ---
 .../Banshee.Dap.Ipod/UnsupportedDatabaseView.cs    |  174 -----
 src/Dap/Banshee.Dap.Ipod/Makefile.am               |   36 -
 src/Dap/Makefile.am                                |    1 -
 60 files changed, 1 insertions(+), 2256 deletions(-)
---
diff --git a/Banshee.sln b/Banshee.sln
index 528040e..45a8030 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -72,8 +72,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Dap.MassStorage", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Dap.Mtp", "src\Dap\Banshee.Dap.Mtp\Banshee.Dap.Mtp.csproj", "{3935AE8A-E283-4C0D-9094-7435A937DC90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Dap.Ipod", "src\Dap\Banshee.Dap.Ipod\Banshee.Dap.Ipod.csproj", "{371ECE68-8D0F-4AFE-AC8F-147167AE3674}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Dap.AppleDevice", "src\Dap\Banshee.Dap.AppleDevice\Banshee.Dap.AppleDevice.csproj", "{DEADBEEF-CAFE-BABE-FACE-000C0FFEE000}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{4DD1DE63-F20B-4FC3-8FDA-F0BDF4183722}"
@@ -226,11 +224,6 @@ Global
 		{2ADB831A-A050-47D0-B6B9-9C19D60233BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2ADB831A-A050-47D0-B6B9-9C19D60233BB}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
 		{2ADB831A-A050-47D0-B6B9-9C19D60233BB}.Windows|Any CPU.Build.0 = Windows|Any CPU
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -506,7 +499,6 @@ Global
 		{BC2E94DF-7A82-461E-BE7C-60E41ADC3562} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{6B73E278-23FB-4A59-9B44-AB7F0212B936} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{3935AE8A-E283-4C0D-9094-7435A937DC90} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{DEADBEEF-CAFE-BABE-FACE-000C0FFEE000} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{C9E904B1-1141-49F4-BE84-85222A8E8A79} = {4DD1DE63-F20B-4FC3-8FDA-F0BDF4183722}
 		{BFF64BCD-D7A7-4FB8-8147-7DEF7C3DC525} = {4DD1DE63-F20B-4FC3-8FDA-F0BDF4183722}
diff --git a/build/build.environment.mk b/build/build.environment.mk
index f8a1d4e..daf8717 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -22,7 +22,6 @@ LINK_GUDEV = $(GUDEV_SHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
 LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS) 
 LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
-LINK_IPOD = $(IPODSHARP_LIBS)
 LINK_BOO = $(BOO_LIBS)
 LINK_GDATA = $(GDATASHARP_LIBS)
 LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@@ -120,7 +119,6 @@ LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
 REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
 REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
 REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
-REF_DAP_IPOD = $(LINK_DAP_DEPS) $(LINK_IPOD)
 REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
 
 # Extensions
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 78f25fe..f946a7b 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -30,10 +30,6 @@ if ENABLE_ATK
     ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
 endif
 
-if ENABLE_IPOD
-    LEGACY_IPOD_FLAG = "-define:LEGACY_IPOD_SUPPORT"
-endif
-
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
@@ -73,7 +69,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		-nowarn:0278 -nowarn:0078 $$warn \
 		-define:HAVE_GTK_2_10 -define:NET_2_0 \
 		-debug -target:$(TARGET) -out:$@ \
-		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) $(LEGACY_IPOD_FLAG) \
+		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(srcdir)/$(notdir $  config) ]; then \
 		cp $(srcdir)/$(notdir $  config) $(top_builddir)/bin; \
diff --git a/configure.ac b/configure.ac
index 7335fd4..3cd61a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,6 @@ fi
 dnl DAP support (each module is optional)
 BANSHEE_CHECK_DAP_MTP
 BANSHEE_CHECK_DAP_APPLEDEVICE
-BANSHEE_CHECK_DAP_IPOD
 BANSHEE_CHECK_DAP_KARMA
 
 dnl DAAP support (optional)
@@ -339,7 +338,6 @@ src/Libraries/MusicBrainz/Makefile
 src/Dap/Makefile
 src/Dap/Banshee.Dap/Makefile
 src/Dap/Banshee.Dap.AppleDevice/Makefile
-src/Dap/Banshee.Dap.Ipod/Makefile
 src/Dap/Banshee.Dap.MassStorage/Makefile
 src/Dap/Banshee.Dap.Mtp/Makefile
 src/Dap/Banshee.Dap.Karma/Makefile
@@ -412,7 +410,6 @@ ${PACKAGE}-${VERSION}
     Mass Storage:          yes
     MTP:                   ${enable_libmtp}
     Apple Device:          ${enable_appledevice}
-    ipod-sharp (legacy):   ${enable_ipodsharp}
     Karma:                 ${enable_karmasharp}
 
   Extra Features:
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index c9d1db9..73573cc 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -9,11 +9,6 @@ internal static class AddinXmlStringCatalog
         Catalog.GetString (@"Support for most iPod/iPhone/iPad devices.");
         Catalog.GetString (@"Device Support");
 
-        // ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
-        Catalog.GetString (@"iPod Support");
-        Catalog.GetString (@"Support for most iPod devices.");
-        Catalog.GetString (@"Device Support");
-
         // ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
         Catalog.GetString (@"Karma Support");
         Catalog.GetString (@"Support for Rio Karma devices.");
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs
index 45afb85..ca811b7 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/UsbDevice.cs
@@ -206,43 +206,6 @@ namespace Banshee.Hardware.Gio
         {
             Device = device;
         }
-
-#if LEGACY_IPOD_SUPPORT
-        bool IDevice.PropertyExists (string key)
-        {
-            return Device.PropertyExists (key);
-        }
-
-        string IDevice.GetPropertyString (string key)
-        {
-            return Device.GetPropertyString (key);
-        }
-
-        double IDevice.GetPropertyDouble (string key)
-        {
-            return Device.GetPropertyDouble (key);
-        }
-
-        bool IDevice.GetPropertyBoolean (string key)
-        {
-            return Device.GetPropertyBoolean (key);
-        }
-
-        int IDevice.GetPropertyInteger (string key)
-        {
-            return Device.GetPropertyInteger (key);
-        }
-
-        ulong IDevice.GetPropertyUInt64 (string key)
-        {
-            return Device.GetPropertyUInt64 (key);
-        }
-
-        public string[] GetPropertyStringList (string key)
-        {
-            return Device.GetPropertyStringList (key);
-        }
-#endif
     }
 }
 #endif
diff --git a/src/Core/Banshee.Services/Banshee.Hardware/IDevice.cs b/src/Core/Banshee.Services/Banshee.Hardware/IDevice.cs
index c5a7962..c87b526 100644
--- a/src/Core/Banshee.Services/Banshee.Hardware/IDevice.cs
+++ b/src/Core/Banshee.Services/Banshee.Hardware/IDevice.cs
@@ -41,17 +41,6 @@ namespace Banshee.Hardware
 
         IDeviceMediaCapabilities MediaCapabilities { get; }
 
-#if LEGACY_IPOD_SUPPORT
-        bool PropertyExists (string key);
-
-        string GetPropertyString (string key);
-        double GetPropertyDouble (string key);
-        bool GetPropertyBoolean (string key);
-        int GetPropertyInteger (string key);
-        ulong GetPropertyUInt64 (string key);
-        string [] GetPropertyStringList (string key);
-#endif
-
         IUsbDevice ResolveRootUsbDevice ();
         IUsbPortInfo ResolveUsbPortInfo ();
     }
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-color.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-U2-monochrome.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-blue.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-gold.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-green.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-pink.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-mini-silver.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-black.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-nano-white.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-shuffle.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-color.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-standard-monochrome.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-video-black.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/16x16/devices/multimedia-player-ipod-video-white.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-color.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-U2-monochrome.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-blue.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-gold.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-green.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-pink.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-mini-silver.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-black.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-nano-white.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-shuffle.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-color.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-standard-monochrome.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-video-black.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/22x22/devices/multimedia-player-ipod-video-white.png
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-color.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-U2-monochrome.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-blue.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-gold.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-green.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-pink.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-mini-silver.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-black.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-nano-white.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-shuffle.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-color.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-standard-monochrome.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-video-black.svg
diff --git a/src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg b/src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg
similarity index 100%
rename from src/Dap/Banshee.Dap.Ipod/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg
rename to src/Dap/Banshee.Dap.AppleDevice/ThemeIcons/scalable/devices/multimedia-player-ipod-video-white.svg
diff --git a/src/Dap/Makefile.am b/src/Dap/Makefile.am
index 0da024c..27a0f7c 100644
--- a/src/Dap/Makefile.am
+++ b/src/Dap/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = \
 	Banshee.Dap \
 	Banshee.Dap.AppleDevice \
-	Banshee.Dap.Ipod \
 	Banshee.Dap.MassStorage \
 	Banshee.Dap.Mtp \
 	Banshee.Dap.Karma
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]