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

replace TextFile references with LineReader

Browse Source
This commit is contained in:
Max Kellermann
2021-12-03 14:16:32 +01:00
parent f9c4d88b12
commit 8681a3d74c
14 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/queue/PlaylistState.cxx
View File

@@ -28,7 +28,7 @@
#include "SingleMode.hxx"
#include "StateFileConfig.hxx"
#include "queue/QueueSave.hxx"
#include "fs/io/TextFile.hxx"
#include "fs/io/LineReader.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "player/Control.hxx"
#include "util/CharUtil.hxx"
@@ -102,7 +102,7 @@ playlist_state_save(BufferedOutputStream &os, const struct playlist &playlist,
}
static void
playlist_state_load(TextFile &file, const SongLoader &song_loader,
playlist_state_load(LineReader &file, const SongLoader &song_loader,
struct playlist &playlist)
{
const char *line = file.ReadLine();
@@ -128,7 +128,7 @@ playlist_state_load(TextFile &file, const SongLoader &song_loader,
bool
playlist_state_restore(const StateFileConfig &config,
const char *line, TextFile &file,
const char *line, LineReader &file,
const SongLoader &song_loader,
struct playlist &playlist, PlayerControl &pc)
{

4
src/queue/PlaylistState.hxx
View File

@@ -28,7 +28,7 @@
struct StateFileConfig;
struct playlist;
class PlayerControl;
class TextFile;
class LineReader;
class BufferedOutputStream;
class SongLoader;
@@ -38,7 +38,7 @@ playlist_state_save(BufferedOutputStream &os, const playlist &playlist,
bool
playlist_state_restore(const StateFileConfig &config,
const char *line, TextFile &file,
const char *line, LineReader &file,
const SongLoader &song_loader,
playlist &playlist, PlayerControl &pc);

6
src/queue/QueueSave.cxx
View File

@@ -23,7 +23,7 @@
#include "song/DetachedSong.hxx"
#include "SongSave.hxx"
#include "playlist/PlaylistSong.hxx"
#include "fs/io/TextFile.hxx"
#include "fs/io/LineReader.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "util/StringCompare.hxx"
#include "Log.hxx"
@@ -74,7 +74,7 @@ queue_save(BufferedOutputStream &os, const Queue &queue)
}
static DetachedSong
LoadQueueSong(TextFile &file, const char *line)
LoadQueueSong(LineReader &file, const char *line)
{
std::unique_ptr<DetachedSong> song;
@@ -94,7 +94,7 @@ LoadQueueSong(TextFile &file, const char *line)
}
void
queue_load_song(TextFile &file, const SongLoader &loader,
queue_load_song(LineReader &file, const SongLoader &loader,
const char *line, Queue &queue)
{
if (queue.IsFull())

4
src/queue/QueueSave.hxx
View File

@@ -27,7 +27,7 @@
struct Queue;
class BufferedOutputStream;
class TextFile;
class LineReader;
class SongLoader;
void
@@ -39,7 +39,7 @@ queue_save(BufferedOutputStream &os, const Queue &queue);
* Throws on error.
*/
void
queue_load_song(TextFile &file, const SongLoader &loader,
queue_load_song(LineReader &file, const SongLoader &loader,
const char *line, Queue &queue);
#endif