replace TextFile references with LineReader
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
#include "db/DatabaseLock.hxx"
|
||||
#include "DirectorySave.hxx"
|
||||
#include "fs/io/BufferedOutputStream.hxx"
|
||||
#include "fs/io/TextFile.hxx"
|
||||
#include "fs/io/LineReader.hxx"
|
||||
#include "tag/ParseName.hxx"
|
||||
#include "tag/Settings.hxx"
|
||||
#include "fs/Charset.hxx"
|
||||
@@ -64,7 +64,7 @@ db_save_internal(BufferedOutputStream &os, const Directory &music_root)
|
||||
}
|
||||
|
||||
void
|
||||
db_load_internal(TextFile &file, Directory &music_root)
|
||||
db_load_internal(LineReader &file, Directory &music_root)
|
||||
{
|
||||
char *line;
|
||||
unsigned format = 0;
|
||||
|
@@ -22,7 +22,7 @@
|
||||
|
||||
struct Directory;
|
||||
class BufferedOutputStream;
|
||||
class TextFile;
|
||||
class LineReader;
|
||||
|
||||
void
|
||||
db_save_internal(BufferedOutputStream &os, const Directory &root);
|
||||
@@ -31,6 +31,6 @@ db_save_internal(BufferedOutputStream &os, const Directory &root);
|
||||
* Throws #std::runtime_error on error.
|
||||
*/
|
||||
void
|
||||
db_load_internal(TextFile &file, Directory &root);
|
||||
db_load_internal(LineReader &file, Directory &root);
|
||||
|
||||
#endif
|
||||
|
@@ -23,7 +23,7 @@
|
||||
#include "SongSave.hxx"
|
||||
#include "song/DetachedSong.hxx"
|
||||
#include "PlaylistDatabase.hxx"
|
||||
#include "fs/io/TextFile.hxx"
|
||||
#include "fs/io/LineReader.hxx"
|
||||
#include "fs/io/BufferedOutputStream.hxx"
|
||||
#include "time/ChronoUtil.hxx"
|
||||
#include "util/StringAPI.hxx"
|
||||
@@ -121,7 +121,7 @@ ParseLine(Directory &directory, const char *line)
|
||||
}
|
||||
|
||||
static Directory *
|
||||
directory_load_subdir(TextFile &file, Directory &parent, std::string_view name)
|
||||
directory_load_subdir(LineReader &file, Directory &parent, std::string_view name)
|
||||
{
|
||||
if (parent.FindChild(name) != nullptr)
|
||||
throw FormatRuntimeError("Duplicate subdirectory '%.*s'",
|
||||
@@ -152,7 +152,7 @@ directory_load_subdir(TextFile &file, Directory &parent, std::string_view name)
|
||||
}
|
||||
|
||||
void
|
||||
directory_load(TextFile &file, Directory &directory)
|
||||
directory_load(LineReader &file, Directory &directory)
|
||||
{
|
||||
const char *line;
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#define MPD_DIRECTORY_SAVE_HXX
|
||||
|
||||
struct Directory;
|
||||
class TextFile;
|
||||
class LineReader;
|
||||
class BufferedOutputStream;
|
||||
|
||||
void
|
||||
@@ -31,6 +31,6 @@ directory_save(BufferedOutputStream &os, const Directory &directory);
|
||||
* Throws #std::runtime_error on error.
|
||||
*/
|
||||
void
|
||||
directory_load(TextFile &file, Directory &directory);
|
||||
directory_load(LineReader &file, Directory &directory);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user