[banshee] Banshee.IO: remove Directory separator constants, as they're now in Hyena
- From: AndrÃs Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Banshee.IO: remove Directory separator constants, as they're now in Hyena
- Date: Sun, 11 Nov 2012 21:47:55 +0000 (UTC)
commit 4d674be3e6b738737cd7637e0d9d420b6502465a
Author: Andres G. Aragoneses <knocte gmail com>
Date: Sun Nov 11 21:30:59 2012 +0000
Banshee.IO: remove Directory separator constants, as they're now in Hyena
These constants live now in Hyena.Paths so there is no need to duplicate
them in Banshee.IO.
There is no change of behaviour in this commit. (It changes the API, but
banshee-community-extensions seems unaffected.)
.../DeviceMediaCapabilities.cs | 6 +++---
src/Core/Banshee.Core/Banshee.IO/Directory.cs | 3 ---
.../Banshee.Dap.MassStorage/MassStorageDevice.cs | 7 +++----
3 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
index 41cb46b..f769e47 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DeviceMediaCapabilities.cs
@@ -33,7 +33,7 @@ using KeyFile;
using Banshee.Base;
using Banshee.Hardware;
-using Banshee.IO;
+using Hyena;
namespace Banshee.Hardware.Gio
{
@@ -232,7 +232,7 @@ namespace Banshee.Hardware.Gio
if (mpi_file.HasKey (PlaylistGroup, "FolderSeparator")) {
string folder_separator = mpi_file.GetString (PlaylistGroup, "FolderSeparator");
if (folder_separator == "DOS") {
- FolderSeparator = Directory.DosSeparator;
+ FolderSeparator = Paths.Folder.DosSeparator;
}
}
}
@@ -251,7 +251,7 @@ namespace Banshee.Hardware.Gio
OutputFormats = new string[] {};
PlaylistFormats = new string[] {};
AccessProtocols = new string[] {};
- FolderSeparator = Directory.UnixSeparator;
+ FolderSeparator = Paths.Folder.UnixSeparator;
}
}
}
diff --git a/src/Core/Banshee.Core/Banshee.IO/Directory.cs b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
index ed098f0..927ef88 100644
--- a/src/Core/Banshee.Core/Banshee.IO/Directory.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
@@ -35,9 +35,6 @@ namespace Banshee.IO
{
public static class Directory
{
- public const char DosSeparator = '\\';
- public const char UnixSeparator = '/';
-
public static bool Exists (string directory)
{
return Provider.Directory.Exists (Provider.GetPath (directory));
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
index 17fdca2..9569899 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
@@ -39,7 +39,6 @@ using Banshee.Base;
using Banshee.Hardware;
using Banshee.Collection;
using Banshee.Collection.Database;
-using Folder = Banshee.IO.Directory;
namespace Banshee.Dap.MassStorage
{
@@ -127,10 +126,10 @@ namespace Banshee.Dap.MassStorage
folder_depth = GetPreferredValue ("folder_depth", config, DefaultFolderDepth);
string preferred_folder_separator = GetPreferredValue ("folder_separator", config, DefaultFolderSeparator);
- if (preferred_folder_separator == Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
- folder_separator = Folder.DosSeparator;
+ if (preferred_folder_separator == Paths.Folder.DosSeparator.ToString () || preferred_folder_separator == "DOS") {
+ folder_separator = Paths.Folder.DosSeparator;
} else {
- folder_separator = Folder.UnixSeparator;
+ folder_separator = Paths.Folder.UnixSeparator;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]