oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/Directory: move isRootDirectory() to Uri.hxx 

Decouple command/OtherCommands.cxx from the "simple" database plugin.
This commit is contained in:
Max Kellermann 2014-01-29 18:05:33 +01:00
parent ff87145537
commit a137f817f5
6 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -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 \

2
src/command/OtherCommands.cxx
View File

@ -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"

1
src/db/Directory.cxx
View File

@ -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"

6
src/db/Directory.hxx
View File

@ -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

29
src/db/Uri.hxx Normal file
View File

@ -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

1
src/db/update/UpdateWalk.cxx
View File

@ -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"