Skip to content

M
mpd
Commit aafff8fd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

fs/output, fs/TextFile: move to fs/io/

parent 5ac2a699
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
Makefile.am
View file @ aafff8fd
...@@ -506,10 +506,11 @@ endif ...@@ -506,10 +506,11 @@ endif
FS_LIBS = libfs.a FS_LIBS = libfs.a
libfs_a_SOURCES = \ libfs_a_SOURCES = \
src/fs/output/OutputStream.hxx \ src/fs/io/TextFile.cxx src/fs/io/TextFile.hxx \
src/fs/output/StdoutOutputStream.hxx \ src/fs/io/OutputStream.hxx \
src/fs/output/FileOutputStream.cxx src/fs/output/FileOutputStream.hxx \ src/fs/io/StdoutOutputStream.hxx \
src/fs/output/BufferedOutputStream.cxx src/fs/output/BufferedOutputStream.hxx \ src/fs/io/FileOutputStream.cxx src/fs/io/FileOutputStream.hxx \
src/fs/io/BufferedOutputStream.cxx src/fs/io/BufferedOutputStream.hxx \
src/fs/Domain.cxx src/fs/Domain.hxx \ src/fs/Domain.cxx src/fs/Domain.hxx \
src/fs/Limits.hxx \ src/fs/Limits.hxx \
src/fs/Traits.cxx src/fs/Traits.hxx \ src/fs/Traits.cxx src/fs/Traits.hxx \
...@@ -517,7 +518,6 @@ libfs_a_SOURCES = \ ...@@ -517,7 +518,6 @@ libfs_a_SOURCES = \
src/fs/Charset.cxx src/fs/Charset.hxx \ src/fs/Charset.cxx src/fs/Charset.hxx \
src/fs/Path.cxx src/fs/Path.hxx \ src/fs/Path.cxx src/fs/Path.hxx \
src/fs/AllocatedPath.cxx src/fs/AllocatedPath.hxx \ src/fs/AllocatedPath.cxx src/fs/AllocatedPath.hxx \
src/fs/TextFile.cxx src/fs/TextFile.hxx \
src/fs/FileSystem.cxx src/fs/FileSystem.hxx \ src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \ src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \
src/fs/CheckFile.cxx src/fs/CheckFile.hxx \ src/fs/CheckFile.cxx src/fs/CheckFile.hxx \
...@@ -526,7 +526,7 @@ libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) ...@@ -526,7 +526,7 @@ libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
if HAVE_ZLIB if HAVE_ZLIB
libfs_a_SOURCES += \ libfs_a_SOURCES += \
src/fs/output/GzipOutputStream.cxx src/fs/output/GzipOutputStream.hxx src/fs/io/GzipOutputStream.cxx src/fs/io/GzipOutputStream.hxx
FS_LIBS += $(ZLIB_LIBS) FS_LIBS += $(ZLIB_LIBS)
endif endif
......
src/PlaylistDatabase.cxx
View file @ aafff8fd
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "PlaylistDatabase.hxx" #include "PlaylistDatabase.hxx"
#include "db/PlaylistVector.hxx" #include "db/PlaylistVector.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/PlaylistFile.cxx
View file @ aafff8fd
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "SongLoader.hxx" #include "SongLoader.hxx"
#include "Mapper.hxx" #include "Mapper.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx" #include "config/ConfigOption.hxx"
#include "config/ConfigDefaults.hxx" #include "config/ConfigDefaults.hxx"
......
src/SongSave.cxx
View file @ aafff8fd
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include "db/plugins/simple/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/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx" #include "tag/TagBuilder.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
......
src/StateFile.cxx
View file @ aafff8fd
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include "StateFile.hxx" #include "StateFile.hxx"
#include "output/OutputState.hxx" #include "output/OutputState.hxx"
#include "queue/PlaylistState.hxx" #include "queue/PlaylistState.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "fs/output/FileOutputStream.hxx" #include "fs/io/FileOutputStream.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include "Instance.hxx" #include "Instance.hxx"
#include "mixer/Volume.hxx" #include "mixer/Volume.hxx"
......
src/TagSave.cxx
View file @ aafff8fd
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "TagSave.hxx" #include "TagSave.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#define SONG_TIME "Time: " #define SONG_TIME "Time: "
......
src/db/plugins/simple/DatabaseSave.cxx
View file @ aafff8fd
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "db/DatabaseError.hxx" #include "db/DatabaseError.hxx"
#include "Directory.hxx" #include "Directory.hxx"
#include "DirectorySave.hxx" #include "DirectorySave.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagSettings.h" #include "tag/TagSettings.h"
#include "fs/Charset.hxx" #include "fs/Charset.hxx"
......
src/db/plugins/simple/DirectorySave.cxx
View file @ aafff8fd
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include "SongSave.hxx" #include "SongSave.hxx"
#include "DetachedSong.hxx" #include "DetachedSong.hxx"
#include "PlaylistDatabase.hxx" #include "PlaylistDatabase.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
......
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View file @ aafff8fd
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include "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/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "fs/output/FileOutputStream.hxx" #include "fs/io/FileOutputStream.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
......
src/fs/StandardDirectory.cxx
View file @ aafff8fd
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#ifdef USE_XDG #ifdef USE_XDG
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "TextFile.hxx" #include "io/TextFile.hxx"
#include <string.h> #include <string.h>
#include <utility> #include <utility>
#endif #endif
......
src/mixer/Volume.cxx
View file @ aafff8fd
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "system/PeriodClock.hxx" #include "system/PeriodClock.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <assert.h>
......
src/output/OutputState.cxx
View file @ aafff8fd
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "Internal.hxx" #include "Internal.hxx"
#include "Domain.hxx" #include "Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include <assert.h> #include <assert.h>
......
src/queue/PlaylistState.cxx
View file @ aafff8fd
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "PlaylistError.hxx" #include "PlaylistError.hxx"
#include "Playlist.hxx" #include "Playlist.hxx"
#include "queue/QueueSave.hxx" #include "queue/QueueSave.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "PlayerControl.hxx" #include "PlayerControl.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx" #include "config/ConfigOption.hxx"
......
src/queue/QueueSave.cxx
View file @ aafff8fd
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include "SongSave.hxx" #include "SongSave.hxx"
#include "SongLoader.hxx" #include "SongLoader.hxx"
#include "playlist/PlaylistSong.hxx" #include "playlist/PlaylistSong.hxx"
#include "fs/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
......
test/dump_playlist.cxx
View file @ aafff8fd
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistRegistry.hxx"
#include "playlist/PlaylistPlugin.hxx" #include "playlist/PlaylistPlugin.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "fs/output/StdioOutputStream.hxx" #include "fs/io/StdioOutputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "Log.hxx" #include "Log.hxx"
......
test/run_gzip.cxx
View file @ aafff8fd
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "fs/output/GzipOutputStream.hxx" #include "fs/io/GzipOutputStream.hxx"
#include "fs/output/StdioOutputStream.hxx" #include "fs/io/StdioOutputStream.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include <stdio.h> #include <stdio.h>
......
test/run_input.cxx
View file @ aafff8fd
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "fs/output/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "fs/output/StdioOutputStream.hxx" #include "fs/io/StdioOutputStream.hxx"
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
#include "archive/ArchiveList.hxx" #include "archive/ArchiveList.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment