[banshee] MassStorage: Save playlists relative to BaseDirectory (bgo#587756)

[Bertrand Lorentz <blorentz src gnome org>]

commit a1b48ea79b2d0fc6084cf84ea79612b3dfcc848d
Author: Pavol Babincak <scroolik gmail com>
Date:   Sun Apr 8 20:57:49 2012 +0200

    MassStorage: Save playlists relative to BaseDirectory (bgo#587756)
    
    Until now playlists were created under the first folder in AudioFolders
    or BaseDirectory if AudioFolders wasn't set.
    
    The (now obsolete) HAL specification described playlist_path as being
    relative to the mount point of the device.
    
    The Media player info repository doesn't explicitly describe what is
    the base directory for playlist_path. But common values show that it's
    relative to the root of the device.
    
    So we now consider the PlaylistPath to be relative to the base directory
    of the device. Default values for the devices with custom support are
    adjusted to also reflect that.
    
    Signed-off-by: Bertrand Lorentz <bertrand lorentz gmail com>

 .../Banshee.Dap.MassStorage/AndroidDevice.cs       |    2 +-
 .../Banshee.Dap.MassStorage/MaemoDevice.cs         |    2 +-
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |    2 +-
 .../Banshee.Dap.MassStorage/RockBoxDevice.cs       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
index 7b1a416..0dcf270 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
@@ -67,7 +67,7 @@ namespace Banshee.Dap.MassStorage
             "audio/x-mpegurl"
         };
 
-        private static string playlists_path = "Playlists/";
+        private static string playlists_path = "Music/Playlists/";
 
         private AmazonMp3GroupSource amazon_source;
         private string amazon_base_dir;
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MaemoDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MaemoDevice.cs
index 821e961..a3f1405 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MaemoDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MaemoDevice.cs
@@ -89,7 +89,7 @@ namespace Banshee.Dap.MassStorage
             "phone-nokia-n900", DapSource.FallbackIcon
         };
 
-        private static string playlists_path = "Playlists/";
+        private static string playlists_path = "Music/Playlists/";
 
 
         public override void SourceInitialize ()
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
index 3e23b30..bcbe342 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
@@ -242,7 +242,7 @@ namespace Banshee.Dap.MassStorage
                     if (MediaCapabilities == null || MediaCapabilities.PlaylistPath == null) {
                         playlists_path = WritePath;
                     } else {
-                        playlists_path = System.IO.Path.Combine (WritePath, MediaCapabilities.PlaylistPath);
+                        playlists_path = System.IO.Path.Combine (BaseDirectory, MediaCapabilities.PlaylistPath);
                         playlists_path = playlists_path.Replace ("%File", String.Empty);
                     }
 
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
index c7cd256..88629e8 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/RockBoxDevice.cs
@@ -64,7 +64,7 @@ namespace Banshee.Dap.MassStorage
             "audio/x-mpegurl"
         };
 
-        private static string playlists_path = "Playlists/";
+        private static string playlists_path = "Music/Playlists/";
 
         private static int folder_depth = 2;