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

db/simple: create dedicated directory

This commit is contained in:
Max Kellermann 2014-02-26 09:17:41 +01:00
parent d86cc5bf42
commit 4d73e4d605
27 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.am
View File

@ -196,8 +196,6 @@ libmpd_a_SOURCES += \
src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \ src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \
src/db/LightSong.cxx src/db/LightSong.hxx \ src/db/LightSong.cxx src/db/LightSong.hxx \
src/db/LightDirectory.hxx \ src/db/LightDirectory.hxx \
src/db/Song.cxx src/db/Song.hxx \
src/db/SongSort.cxx src/db/SongSort.hxx \
src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \ src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \
src/db/update/Service.cxx src/db/update/Service.hxx \ src/db/update/Service.cxx src/db/update/Service.hxx \
src/db/update/UpdateGlue.cxx \ src/db/update/UpdateGlue.cxx \
@ -210,7 +208,6 @@ libmpd_a_SOURCES += \
src/db/update/Remove.cxx src/db/update/Remove.hxx \ src/db/update/Remove.cxx src/db/update/Remove.hxx \
src/db/update/ExcludeList.cxx src/db/update/ExcludeList.hxx \ src/db/update/ExcludeList.cxx src/db/update/ExcludeList.hxx \
src/db/Uri.hxx \ src/db/Uri.hxx \
src/db/Directory.cxx src/db/Directory.hxx \
src/db/DatabaseGlue.cxx src/db/DatabaseGlue.hxx \ src/db/DatabaseGlue.cxx src/db/DatabaseGlue.hxx \
src/db/Configured.cxx src/db/Configured.hxx \ src/db/Configured.cxx src/db/Configured.hxx \
src/db/DatabaseSong.cxx src/db/DatabaseSong.hxx \ src/db/DatabaseSong.cxx src/db/DatabaseSong.hxx \
@ -572,10 +569,19 @@ libdb_plugins_a_SOURCES = \
src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \ src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \
src/db/Registry.cxx src/db/Registry.hxx \ src/db/Registry.cxx src/db/Registry.hxx \
src/db/Helpers.cxx src/db/Helpers.hxx \ src/db/Helpers.cxx src/db/Helpers.hxx \
src/db/DatabaseSave.cxx src/db/DatabaseSave.hxx \ src/db/plugins/simple/DatabaseSave.cxx \
src/db/DirectorySave.cxx src/db/DirectorySave.hxx \ src/db/plugins/simple/DatabaseSave.hxx \
src/db/plugins/simple/DirectorySave.cxx \
src/db/plugins/simple/DirectorySave.hxx \
src/db/plugins/LazyDatabase.cxx src/db/plugins/LazyDatabase.hxx \ src/db/plugins/LazyDatabase.cxx src/db/plugins/LazyDatabase.hxx \
src/db/plugins/SimpleDatabasePlugin.cxx src/db/plugins/SimpleDatabasePlugin.hxx src/db/plugins/simple/Directory.cxx \
src/db/plugins/simple/Directory.hxx \
src/db/plugins/simple/Song.cxx \
src/db/plugins/simple/Song.hxx \
src/db/plugins/simple/SongSort.cxx \
src/db/plugins/simple/SongSort.hxx \
src/db/plugins/simple/SimpleDatabasePlugin.cxx \
src/db/plugins/simple/SimpleDatabasePlugin.hxx
if HAVE_LIBMPDCLIENT if HAVE_LIBMPDCLIENT
libdb_plugins_a_SOURCES += \ libdb_plugins_a_SOURCES += \
@ -1444,10 +1450,9 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/db/DatabaseError.cxx \ src/db/DatabaseError.cxx \
src/db/Registry.cxx \ src/db/Registry.cxx \
src/db/Selection.cxx \ src/db/Selection.cxx \
src/db/Directory.cxx \
src/db/PlaylistVector.cxx \ src/db/PlaylistVector.cxx \
src/db/DatabaseLock.cxx \ src/db/DatabaseLock.cxx \
src/db/Song.cxx src/SongSave.cxx src/db/SongSort.cxx \ src/SongSave.cxx \
src/DetachedSong.cxx \ src/DetachedSong.cxx \
src/TagSave.cxx \ src/TagSave.cxx \
src/SongFilter.cxx src/SongFilter.cxx

2
src/Main.cxx
View File

@ -69,7 +69,7 @@
#include "db/update/Service.hxx" #include "db/update/Service.hxx"
#include "db/Configured.hxx" #include "db/Configured.hxx"
#include "db/DatabasePlugin.hxx" #include "db/DatabasePlugin.hxx"
#include "db/plugins/SimpleDatabasePlugin.hxx" #include "db/plugins/simple/SimpleDatabasePlugin.hxx"
#include "storage/Configured.hxx" #include "storage/Configured.hxx"
#include "storage/CompositeStorage.hxx" #include "storage/CompositeStorage.hxx"
#ifdef ENABLE_INOTIFY #ifdef ENABLE_INOTIFY

1
src/SongFilter.cxx
View File

@ -19,7 +19,6 @@
#include "config.h" #include "config.h"
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "db/Song.hxx"
#include "db/LightSong.hxx" #include "db/LightSong.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"

2
src/SongSave.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "SongSave.hxx" #include "SongSave.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "TagSave.hxx" #include "TagSave.hxx"
#include "fs/TextFile.hxx" #include "fs/TextFile.hxx"

4
src/SongUpdate.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" /* must be first for large file support */ #include "config.h" /* must be first for large file support */
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "db/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "storage/FileInfo.hxx" #include "storage/FileInfo.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"

2
src/db/PlaylistVector.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_PLAYLIST_VECTOR_HXX #ifndef MPD_PLAYLIST_VECTOR_HXX
#define MPD_PLAYLIST_VECTOR_HXX #define MPD_PLAYLIST_VECTOR_HXX
#include "PlaylistInfo.hxx" #include "db/PlaylistInfo.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <list> #include <list>

2
src/db/Registry.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "Registry.hxx" #include "Registry.hxx"
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
#include "plugins/SimpleDatabasePlugin.hxx" #include "plugins/simple/SimpleDatabasePlugin.hxx"
#include "plugins/ProxyDatabasePlugin.hxx" #include "plugins/ProxyDatabasePlugin.hxx"
#include "plugins/upnp/UpnpDatabasePlugin.hxx" #include "plugins/upnp/UpnpDatabasePlugin.hxx"

4
src/db/DatabaseSave.cxx → src/db/plugins/simple/DatabaseSave.cxx
View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "DatabaseSave.hxx" #include "DatabaseSave.hxx"
#include "DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "DatabaseError.hxx" #include "db/DatabaseError.hxx"
#include "Directory.hxx" #include "Directory.hxx"
#include "DirectorySave.hxx" #include "DirectorySave.hxx"
#include "fs/TextFile.hxx" #include "fs/TextFile.hxx"

0
src/db/DatabaseSave.hxx → src/db/plugins/simple/DatabaseSave.hxx
View File

11
src/db/Directory.cxx → src/db/plugins/simple/Directory.cxx
View File

@ -19,14 +19,13 @@
#include "config.h" #include "config.h"
#include "Directory.hxx" #include "Directory.hxx"
#include "LightDirectory.hxx"
#include "Uri.hxx"
#include "SongFilter.hxx"
#include "PlaylistVector.hxx"
#include "db/DatabaseLock.hxx"
#include "SongSort.hxx" #include "SongSort.hxx"
#include "Song.hxx" #include "Song.hxx"
#include "LightSong.hxx" #include "db/LightDirectory.hxx"
#include "db/LightSong.hxx"
#include "db/Uri.hxx"
#include "db/DatabaseLock.hxx"
#include "SongFilter.hxx"
#include "lib/icu/Collate.hxx" #include "lib/icu/Collate.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"

2
src/db/Directory.hxx → src/db/plugins/simple/Directory.hxx
View File

@ -24,7 +24,7 @@
#include "util/list.h" #include "util/list.h"
#include "Compiler.h" #include "Compiler.h"
#include "db/Visitor.hxx" #include "db/Visitor.hxx"
#include "PlaylistVector.hxx" #include "db/PlaylistVector.hxx"
#include <string> #include <string>

0
src/db/DirectorySave.cxx → src/db/plugins/simple/DirectorySave.cxx
View File

0
src/db/DirectorySave.hxx → src/db/plugins/simple/DirectorySave.hxx
View File

6
src/db/plugins/SimpleDatabasePlugin.cxx → src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@ -23,10 +23,10 @@
#include "db/Selection.hxx" #include "db/Selection.hxx"
#include "db/Helpers.hxx" #include "db/Helpers.hxx"
#include "db/LightDirectory.hxx" #include "db/LightDirectory.hxx"
#include "db/Directory.hxx" #include "Directory.hxx"
#include "db/Song.hxx" #include "Song.hxx"
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "db/DatabaseSave.hxx" #include "DatabaseSave.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/DatabaseError.hxx" #include "db/DatabaseError.hxx"
#include "fs/TextFile.hxx" #include "fs/TextFile.hxx"

0
src/db/plugins/SimpleDatabasePlugin.hxx → src/db/plugins/simple/SimpleDatabasePlugin.hxx
View File

2
src/db/Song.cxx → src/db/plugins/simple/Song.cxx
View File

@ -23,7 +23,7 @@
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "util/VarSize.hxx" #include "util/VarSize.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "LightSong.hxx" #include "db/LightSong.hxx"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

0
src/db/Song.hxx → src/db/plugins/simple/Song.hxx
View File

0
src/db/SongSort.cxx → src/db/plugins/simple/SongSort.cxx
View File

0
src/db/SongSort.hxx → src/db/plugins/simple/SongSort.hxx
View File

4
src/db/update/Archive.cxx
View File

@ -21,8 +21,8 @@
#include "Walk.hxx" #include "Walk.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "storage/FileInfo.hxx" #include "storage/FileInfo.hxx"

4
src/db/update/Container.cxx
View File

@ -21,8 +21,8 @@
#include "Walk.hxx" #include "Walk.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"

4
src/db/update/Editor.cxx
View File

@ -21,9 +21,9 @@
#include "Editor.hxx" #include "Editor.hxx"
#include "Remove.hxx" #include "Remove.hxx"
#include "db/PlaylistVector.hxx" #include "db/PlaylistVector.hxx"
#include "db/Directory.hxx"
#include "db/Song.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/plugins/simple/Directory.hxx"
#include "db/plugins/simple/Song.hxx"
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>

2
src/db/update/Remove.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" /* must be first for large file support */ #include "config.h" /* must be first for large file support */
#include "Remove.hxx" #include "Remove.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "db/LightSong.hxx" #include "db/LightSong.hxx"
#include "db/DatabaseListener.hxx" #include "db/DatabaseListener.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/db/update/UpdateGlue.cxx
View File

@ -21,7 +21,7 @@
#include "Service.hxx" #include "Service.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/DatabaseListener.hxx" #include "db/DatabaseListener.hxx"
#include "db/plugins/SimpleDatabasePlugin.hxx" #include "db/plugins/simple/SimpleDatabasePlugin.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/db/update/UpdateIO.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" /* must be first for large file support */ #include "config.h" /* must be first for large file support */
#include "UpdateIO.hxx" #include "UpdateIO.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "storage/FileInfo.hxx" #include "storage/FileInfo.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"

4
src/db/update/UpdateSong.cxx
View File

@ -22,8 +22,8 @@
#include "UpdateIO.hxx" #include "UpdateIO.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/Directory.hxx" #include "db/plugins/simple/Directory.hxx"
#include "db/Song.hxx" #include "db/plugins/simple/Song.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "storage/FileInfo.hxx" #include "storage/FileInfo.hxx"
#include "Log.hxx" #include "Log.hxx"

4
src/db/update/Walk.cxx
View File

@ -23,10 +23,10 @@
#include "Editor.hxx" #include "Editor.hxx"
#include "UpdateDomain.hxx" #include "UpdateDomain.hxx"
#include "db/DatabaseLock.hxx" #include "db/DatabaseLock.hxx"
#include "db/Directory.hxx"
#include "db/Song.hxx"
#include "db/PlaylistVector.hxx" #include "db/PlaylistVector.hxx"
#include "db/Uri.hxx" #include "db/Uri.hxx"
#include "db/plugins/simple/Directory.hxx"
#include "db/plugins/simple/Song.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "ExcludeList.hxx" #include "ExcludeList.hxx"