← Back to branch summary

~ubuntu-branches/ubuntu/raring/banshee/raring

« back to all changes in this revision

Viewing changes to src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-02-18 22:17:24 UTC
  • mfrom: (6.3.23 experimental)
  • Revision ID: package-import@ubuntu.com-20120218221724-cnwdvn490wjjue8t
Tags: 2.3.5-1ubuntu1
* Merge from Debian Experimental, remaining changes:
  + Enable and recommend SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
39
39
using Banshee.Hardware;
40
40
using Banshee.Collection;
41
41
using Banshee.Collection.Database;
 
42
using Folder = Banshee.IO.Directory;
42
43
 
43
44
namespace Banshee.Dap.MassStorage
44
45
{
122
123
            playlist_formats = MergeValues ("playlist_formats", config, DefaultPlaylistFormats);
123
124
            playlist_path = GetPreferredValue ("playlist_path", config, DefaultPlaylistPath);
124
125
            folder_depth = GetPreferredValue ("folder_depth", config, DefaultFolderDepth);
 
126
 
 
127
            string preferred_folder_separator = GetPreferredValue ("folder_separator", config, DefaultFolderSeparator);
 
128
            if (preferred_folder_separator == Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
 
129
                folder_separator = Folder.DosSeparator;
 
130
            } else {
 
131
                folder_separator = Folder.UnixSeparator;
 
132
            }
125
133
        }
126
134
 
127
135
        private string[] MergeValues (string key, IDictionary<string, string[]> config, string[] defaultValues)
200
208
            get { return FolderDepth; }
201
209
        }
202
210
 
 
211
        protected virtual string DefaultFolderSeparator {
 
212
            get { return null; }
 
213
        }
 
214
 
 
215
        private char folder_separator;
 
216
        public virtual char FolderSeparator {
 
217
            get { return folder_separator; }
 
218
        }
 
219
 
203
220
        protected virtual string [] DefaultAudioFolders {
204
221
            get { return new string[0]; }
205
222
        }