From 08296cd66d0ef4729767d97420fab96278a9af17 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 24 Jan 2014 00:24:43 +0100 Subject: [PATCH] Update*: move to update/ --- Makefile.am | 34 ++++++++++++++-------------- src/Main.cxx | 4 ++-- src/command/OtherCommands.cxx | 2 +- src/command/PlayerCommands.cxx | 2 +- src/{ => update}/InotifyDomain.cxx | 0 src/{ => update}/InotifyDomain.hxx | 0 src/{ => update}/InotifyQueue.cxx | 0 src/{ => update}/InotifyQueue.hxx | 0 src/{ => update}/InotifySource.cxx | 0 src/{ => update}/InotifySource.hxx | 0 src/{ => update}/InotifyUpdate.cxx | 0 src/{ => update}/InotifyUpdate.hxx | 0 src/{ => update}/UpdateArchive.cxx | 0 src/{ => update}/UpdateArchive.hxx | 0 src/{ => update}/UpdateContainer.cxx | 0 src/{ => update}/UpdateContainer.hxx | 0 src/{ => update}/UpdateDatabase.cxx | 0 src/{ => update}/UpdateDatabase.hxx | 0 src/{ => update}/UpdateDomain.cxx | 0 src/{ => update}/UpdateDomain.hxx | 0 src/{ => update}/UpdateGlue.cxx | 0 src/{ => update}/UpdateGlue.hxx | 0 src/{ => update}/UpdateIO.cxx | 2 +- src/{ => update}/UpdateIO.hxx | 0 src/{ => update}/UpdateInternal.hxx | 0 src/{ => update}/UpdateQueue.cxx | 0 src/{ => update}/UpdateQueue.hxx | 0 src/{ => update}/UpdateRemove.cxx | 0 src/{ => update}/UpdateRemove.hxx | 0 src/{ => update}/UpdateSong.cxx | 0 src/{ => update}/UpdateSong.hxx | 0 src/{ => update}/UpdateWalk.cxx | 0 src/{ => update}/UpdateWalk.hxx | 0 test/run_inotify.cxx | 2 +- 34 files changed, 23 insertions(+), 23 deletions(-) rename src/{ => update}/InotifyDomain.cxx (100%) rename src/{ => update}/InotifyDomain.hxx (100%) rename src/{ => update}/InotifyQueue.cxx (100%) rename src/{ => update}/InotifyQueue.hxx (100%) rename src/{ => update}/InotifySource.cxx (100%) rename src/{ => update}/InotifySource.hxx (100%) rename src/{ => update}/InotifyUpdate.cxx (100%) rename src/{ => update}/InotifyUpdate.hxx (100%) rename src/{ => update}/UpdateArchive.cxx (100%) rename src/{ => update}/UpdateArchive.hxx (100%) rename src/{ => update}/UpdateContainer.cxx (100%) rename src/{ => update}/UpdateContainer.hxx (100%) rename src/{ => update}/UpdateDatabase.cxx (100%) rename src/{ => update}/UpdateDatabase.hxx (100%) rename src/{ => update}/UpdateDomain.cxx (100%) rename src/{ => update}/UpdateDomain.hxx (100%) rename src/{ => update}/UpdateGlue.cxx (100%) rename src/{ => update}/UpdateGlue.hxx (100%) rename src/{ => update}/UpdateIO.cxx (98%) rename src/{ => update}/UpdateIO.hxx (100%) rename src/{ => update}/UpdateInternal.hxx (100%) rename src/{ => update}/UpdateQueue.cxx (100%) rename src/{ => update}/UpdateQueue.hxx (100%) rename src/{ => update}/UpdateRemove.cxx (100%) rename src/{ => update}/UpdateRemove.hxx (100%) rename src/{ => update}/UpdateSong.cxx (100%) rename src/{ => update}/UpdateSong.hxx (100%) rename src/{ => update}/UpdateWalk.cxx (100%) rename src/{ => update}/UpdateWalk.hxx (100%) diff --git a/Makefile.am b/Makefile.am index 77a37d09d..56ae9c98b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,16 +123,16 @@ src_mpd_SOURCES = \ src/FilterPlugin.cxx src/FilterPlugin.hxx \ src/FilterInternal.hxx \ src/FilterRegistry.cxx src/FilterRegistry.hxx \ - src/UpdateDomain.cxx src/UpdateDomain.hxx \ - src/UpdateGlue.cxx src/UpdateGlue.hxx \ - src/UpdateQueue.cxx src/UpdateQueue.hxx \ - src/UpdateIO.cxx src/UpdateIO.hxx \ - src/UpdateDatabase.cxx src/UpdateDatabase.hxx \ - src/UpdateWalk.cxx src/UpdateWalk.hxx \ - src/UpdateSong.cxx src/UpdateSong.hxx \ - src/UpdateContainer.cxx src/UpdateContainer.hxx \ - src/UpdateInternal.hxx \ - src/UpdateRemove.cxx src/UpdateRemove.hxx \ + src/update/UpdateDomain.cxx src/update/UpdateDomain.hxx \ + src/update/UpdateGlue.cxx src/update/UpdateGlue.hxx \ + src/update/UpdateQueue.cxx src/update/UpdateQueue.hxx \ + src/update/UpdateIO.cxx src/update/UpdateIO.hxx \ + src/update/UpdateDatabase.cxx src/update/UpdateDatabase.hxx \ + src/update/UpdateWalk.cxx src/update/UpdateWalk.hxx \ + src/update/UpdateSong.cxx src/update/UpdateSong.hxx \ + src/update/UpdateContainer.cxx src/update/UpdateContainer.hxx \ + src/update/UpdateInternal.hxx \ + src/update/UpdateRemove.cxx src/update/UpdateRemove.hxx \ src/Client.cxx src/Client.hxx \ src/ClientInternal.hxx \ src/ClientEvent.cxx \ @@ -237,10 +237,10 @@ endif if ENABLE_INOTIFY src_mpd_SOURCES += \ - src/InotifyDomain.cxx src/InotifyDomain.hxx \ - src/InotifySource.cxx src/InotifySource.hxx \ - src/InotifyQueue.cxx src/InotifyQueue.hxx \ - src/InotifyUpdate.cxx src/InotifyUpdate.hxx + src/update/InotifyDomain.cxx src/update/InotifyDomain.hxx \ + src/update/InotifySource.cxx src/update/InotifySource.hxx \ + src/update/InotifyQueue.cxx src/update/InotifyQueue.hxx \ + src/update/InotifyUpdate.cxx src/update/InotifyUpdate.hxx endif if ENABLE_SQLITE @@ -443,7 +443,7 @@ if ENABLE_ARCHIVE noinst_LIBRARIES += libarchive.a src_mpd_SOURCES += \ - src/UpdateArchive.cxx src/UpdateArchive.hxx + src/update/UpdateArchive.cxx src/update/UpdateArchive.hxx libarchive_a_SOURCES = \ src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \ @@ -1584,8 +1584,8 @@ noinst_PROGRAMS += test/run_inotify test_run_inotify_SOURCES = test/run_inotify.cxx \ test/ShutdownHandler.cxx test/ShutdownHandler.hxx \ src/Log.cxx src/LogBackend.cxx \ - src/InotifyDomain.cxx \ - src/InotifySource.cxx + src/update/InotifyDomain.cxx \ + src/update/InotifySource.cxx test_run_inotify_LDADD = \ libevent.a \ libsystem.a \ diff --git a/src/Main.cxx b/src/Main.cxx index a5ffb33dc..f91c63d99 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -23,7 +23,7 @@ #include "CommandLine.hxx" #include "PlaylistFile.hxx" #include "PlaylistGlobal.hxx" -#include "UpdateGlue.hxx" +#include "update/UpdateGlue.hxx" #include "MusicChunk.hxx" #include "StateFile.hxx" #include "PlayerThread.hxx" @@ -68,7 +68,7 @@ #include "Stats.hxx" #ifdef ENABLE_INOTIFY -#include "InotifyUpdate.hxx" +#include "update/InotifyUpdate.hxx" #endif #ifdef ENABLE_SQLITE diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index fc6903d37..b7b84bcde 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -21,7 +21,7 @@ #include "OtherCommands.hxx" #include "DatabaseCommands.hxx" #include "CommandError.hxx" -#include "UpdateGlue.hxx" +#include "update/UpdateGlue.hxx" #include "Directory.hxx" #include "DetachedSong.hxx" #include "SongPrint.hxx" diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index ae7a7ba89..20de2af92 100644 --- a/src/command/PlayerCommands.cxx +++ b/src/command/PlayerCommands.cxx @@ -22,7 +22,7 @@ #include "CommandError.hxx" #include "Playlist.hxx" #include "PlaylistPrint.hxx" -#include "UpdateGlue.hxx" +#include "update/UpdateGlue.hxx" #include "Client.hxx" #include "Volume.hxx" #include "output/OutputAll.hxx" diff --git a/src/InotifyDomain.cxx b/src/update/InotifyDomain.cxx similarity index 100% rename from src/InotifyDomain.cxx rename to src/update/InotifyDomain.cxx diff --git a/src/InotifyDomain.hxx b/src/update/InotifyDomain.hxx similarity index 100% rename from src/InotifyDomain.hxx rename to src/update/InotifyDomain.hxx diff --git a/src/InotifyQueue.cxx b/src/update/InotifyQueue.cxx similarity index 100% rename from src/InotifyQueue.cxx rename to src/update/InotifyQueue.cxx diff --git a/src/InotifyQueue.hxx b/src/update/InotifyQueue.hxx similarity index 100% rename from src/InotifyQueue.hxx rename to src/update/InotifyQueue.hxx diff --git a/src/InotifySource.cxx b/src/update/InotifySource.cxx similarity index 100% rename from src/InotifySource.cxx rename to src/update/InotifySource.cxx diff --git a/src/InotifySource.hxx b/src/update/InotifySource.hxx similarity index 100% rename from src/InotifySource.hxx rename to src/update/InotifySource.hxx diff --git a/src/InotifyUpdate.cxx b/src/update/InotifyUpdate.cxx similarity index 100% rename from src/InotifyUpdate.cxx rename to src/update/InotifyUpdate.cxx diff --git a/src/InotifyUpdate.hxx b/src/update/InotifyUpdate.hxx similarity index 100% rename from src/InotifyUpdate.hxx rename to src/update/InotifyUpdate.hxx diff --git a/src/UpdateArchive.cxx b/src/update/UpdateArchive.cxx similarity index 100% rename from src/UpdateArchive.cxx rename to src/update/UpdateArchive.cxx diff --git a/src/UpdateArchive.hxx b/src/update/UpdateArchive.hxx similarity index 100% rename from src/UpdateArchive.hxx rename to src/update/UpdateArchive.hxx diff --git a/src/UpdateContainer.cxx b/src/update/UpdateContainer.cxx similarity index 100% rename from src/UpdateContainer.cxx rename to src/update/UpdateContainer.cxx diff --git a/src/UpdateContainer.hxx b/src/update/UpdateContainer.hxx similarity index 100% rename from src/UpdateContainer.hxx rename to src/update/UpdateContainer.hxx diff --git a/src/UpdateDatabase.cxx b/src/update/UpdateDatabase.cxx similarity index 100% rename from src/UpdateDatabase.cxx rename to src/update/UpdateDatabase.cxx diff --git a/src/UpdateDatabase.hxx b/src/update/UpdateDatabase.hxx similarity index 100% rename from src/UpdateDatabase.hxx rename to src/update/UpdateDatabase.hxx diff --git a/src/UpdateDomain.cxx b/src/update/UpdateDomain.cxx similarity index 100% rename from src/UpdateDomain.cxx rename to src/update/UpdateDomain.cxx diff --git a/src/UpdateDomain.hxx b/src/update/UpdateDomain.hxx similarity index 100% rename from src/UpdateDomain.hxx rename to src/update/UpdateDomain.hxx diff --git a/src/UpdateGlue.cxx b/src/update/UpdateGlue.cxx similarity index 100% rename from src/UpdateGlue.cxx rename to src/update/UpdateGlue.cxx diff --git a/src/UpdateGlue.hxx b/src/update/UpdateGlue.hxx similarity index 100% rename from src/UpdateGlue.hxx rename to src/update/UpdateGlue.hxx diff --git a/src/UpdateIO.cxx b/src/update/UpdateIO.cxx similarity index 98% rename from src/UpdateIO.cxx rename to src/update/UpdateIO.cxx index 6343c4490..8e4406dc8 100644 --- a/src/UpdateIO.cxx +++ b/src/update/UpdateIO.cxx @@ -19,7 +19,7 @@ #include "config.h" /* must be first for large file support */ #include "UpdateIO.hxx" -#include "src/UpdateDomain.hxx" +#include "UpdateDomain.hxx" #include "Directory.hxx" #include "Mapper.hxx" #include "fs/AllocatedPath.hxx" diff --git a/src/UpdateIO.hxx b/src/update/UpdateIO.hxx similarity index 100% rename from src/UpdateIO.hxx rename to src/update/UpdateIO.hxx diff --git a/src/UpdateInternal.hxx b/src/update/UpdateInternal.hxx similarity index 100% rename from src/UpdateInternal.hxx rename to src/update/UpdateInternal.hxx diff --git a/src/UpdateQueue.cxx b/src/update/UpdateQueue.cxx similarity index 100% rename from src/UpdateQueue.cxx rename to src/update/UpdateQueue.cxx diff --git a/src/UpdateQueue.hxx b/src/update/UpdateQueue.hxx similarity index 100% rename from src/UpdateQueue.hxx rename to src/update/UpdateQueue.hxx diff --git a/src/UpdateRemove.cxx b/src/update/UpdateRemove.cxx similarity index 100% rename from src/UpdateRemove.cxx rename to src/update/UpdateRemove.cxx diff --git a/src/UpdateRemove.hxx b/src/update/UpdateRemove.hxx similarity index 100% rename from src/UpdateRemove.hxx rename to src/update/UpdateRemove.hxx diff --git a/src/UpdateSong.cxx b/src/update/UpdateSong.cxx similarity index 100% rename from src/UpdateSong.cxx rename to src/update/UpdateSong.cxx diff --git a/src/UpdateSong.hxx b/src/update/UpdateSong.hxx similarity index 100% rename from src/UpdateSong.hxx rename to src/update/UpdateSong.hxx diff --git a/src/UpdateWalk.cxx b/src/update/UpdateWalk.cxx similarity index 100% rename from src/UpdateWalk.cxx rename to src/update/UpdateWalk.cxx diff --git a/src/UpdateWalk.hxx b/src/update/UpdateWalk.hxx similarity index 100% rename from src/UpdateWalk.hxx rename to src/update/UpdateWalk.hxx diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx index 4a604a6d6..9ed00d3d6 100644 --- a/test/run_inotify.cxx +++ b/test/run_inotify.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "ShutdownHandler.hxx" -#include "InotifySource.hxx" +#include "update/InotifySource.hxx" #include "event/Loop.hxx" #include "util/Error.hxx" #include "Log.hxx"