From a137f817f5e569211afdef0134c2179fdbad507f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 29 Jan 2014 18:05:33 +0100
Subject: [PATCH] db/Directory: move isRootDirectory() to Uri.hxx
Decouple command/OtherCommands.cxx from the "simple" database plugin.
---
Makefile.am | 1 +
src/command/OtherCommands.cxx | 2 +-
src/db/Directory.cxx | 1 +
src/db/Directory.hxx | 6 ------
src/db/Uri.hxx | 29 +++++++++++++++++++++++++++++
src/db/update/UpdateWalk.cxx | 1 +
6 files changed, 33 insertions(+), 7 deletions(-)
create mode 100644 src/db/Uri.hxx
diff --git a/Makefile.am b/Makefile.am
index 23ae8d6ea..238ea0e7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,7 @@ src_mpd_SOURCES = \
src/decoder/DecoderPlugin.hxx \
src/decoder/DecoderInternal.cxx src/decoder/DecoderInternal.hxx \
src/decoder/DecoderPrint.cxx src/decoder/DecoderPrint.hxx \
+ src/db/Uri.hxx \
src/db/Directory.cxx src/db/Directory.hxx \
src/db/DirectorySave.cxx src/db/DirectorySave.hxx \
src/db/DatabaseSimple.hxx \
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index 359fa9fe3..f8976e561 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -22,7 +22,7 @@
#include "DatabaseCommands.hxx"
#include "db/update/UpdateGlue.hxx"
#include "CommandError.hxx"
-#include "db/Directory.hxx"
+#include "db/Uri.hxx"
#include "DetachedSong.hxx"
#include "SongPrint.hxx"
#include "TagPrint.hxx"
diff --git a/src/db/Directory.cxx b/src/db/Directory.cxx
index e74eabd19..9c7c83314 100644
--- a/src/db/Directory.cxx
+++ b/src/db/Directory.cxx
@@ -20,6 +20,7 @@
#include "config.h"
#include "Directory.hxx"
#include "LightDirectory.hxx"
+#include "Uri.hxx"
#include "SongFilter.hxx"
#include "PlaylistVector.hxx"
#include "db/DatabaseLock.hxx"
diff --git a/src/db/Directory.hxx b/src/db/Directory.hxx
index e114b27f4..705826a65 100644
--- a/src/db/Directory.hxx
+++ b/src/db/Directory.hxx
@@ -239,10 +239,4 @@ public:
LightDirectory Export() const;
};
-static inline bool
-isRootDirectory(const char *name)
-{
- return name[0] == 0 || (name[0] == '/' && name[1] == 0);
-}
-
#endif
diff --git a/src/db/Uri.hxx b/src/db/Uri.hxx
new file mode 100644
index 000000000..04960ba80
--- /dev/null
+++ b/src/db/Uri.hxx
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DB_URI_HXX
+#define MPD_DB_URI_HXX
+
+static inline bool
+isRootDirectory(const char *name)
+{
+ return name[0] == 0 || (name[0] == '/' && name[1] == 0);
+}
+
+#endif
diff --git a/src/db/update/UpdateWalk.cxx b/src/db/update/UpdateWalk.cxx
index 75924a7f7..95c7e6a81 100644
--- a/src/db/update/UpdateWalk.cxx
+++ b/src/db/update/UpdateWalk.cxx
@@ -29,6 +29,7 @@
#include "db/Directory.hxx"
#include "db/Song.hxx"
#include "db/PlaylistVector.hxx"
+#include "db/Uri.hxx"
#include "playlist/PlaylistRegistry.hxx"
#include "Mapper.hxx"
#include "ExcludeList.hxx"