diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-07 00:06:02 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-07 00:06:02 +0200 |
| commit | 69ae879c585039297951821e353f7c1ca12b6cb8 (patch) | |
| tree | fe394a053d2a45817e934f926be6ee660ba689a8 /src/playlist | |
| parent | 08fee9a284cc082822392b38574fd2d4b0afb843 (diff) | |
| download | mpd-69ae879c585039297951821e353f7c1ca12b6cb8.tar.gz mpd-69ae879c585039297951821e353f7c1ca12b6cb8.tar.xz mpd-69ae879c585039297951821e353f7c1ca12b6cb8.zip | |
input/TextInputStream: return char*
Revert to the old API before commit e9e55b08, removing unnecessary
bloat.
Diffstat (limited to 'src/playlist')
| -rw-r--r-- | src/playlist/plugins/CuePlaylistPlugin.cxx | 6 | ||||
| -rw-r--r-- | src/playlist/plugins/ExtM3uPlaylistPlugin.cxx | 11 | ||||
| -rw-r--r-- | src/playlist/plugins/M3uPlaylistPlugin.cxx | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/playlist/plugins/CuePlaylistPlugin.cxx b/src/playlist/plugins/CuePlaylistPlugin.cxx index 8776baace..b907d34d0 100644 --- a/src/playlist/plugins/CuePlaylistPlugin.cxx +++ b/src/playlist/plugins/CuePlaylistPlugin.cxx @@ -52,9 +52,9 @@ CuePlaylist::NextSong() if (song != nullptr) return song; - std::string line; - while (tis.ReadLine(line)) { - parser.Feed(line.c_str()); + const char *line; + while ((line = tis.ReadLine()) != nullptr) { + parser.Feed(line); song = parser.Get(); if (song != nullptr) return song; diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx index 5dd127add..95cc84289 100644 --- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx @@ -39,9 +39,8 @@ public: } bool CheckFirstLine() { - std::string line; - return tis.ReadLine(line) && - strcmp(line.c_str(), "#EXTM3U") == 0; + const char *line = tis.ReadLine(); + return line != nullptr && strcmp(line, "#EXTM3U") == 0; } virtual DetachedSong *NextSong() override; @@ -105,15 +104,13 @@ DetachedSong * ExtM3uPlaylist::NextSong() { Tag tag; - std::string line; const char *line_s; do { - if (!tis.ReadLine(line)) + line_s = tis.ReadLine(); + if (line_s == nullptr) return nullptr; - line_s = line.c_str(); - if (StringStartsWith(line_s, "#EXTINF:")) { tag = extm3u_parse_tag(line_s + 8); continue; diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx index f892f2010..c7f3b5085 100644 --- a/src/playlist/plugins/M3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx @@ -45,14 +45,13 @@ m3u_open_stream(InputStream &is) DetachedSong * M3uPlaylist::NextSong() { - std::string line; const char *line_s; do { - if (!tis.ReadLine(line)) + line_s = tis.ReadLine(); + if (line_s == nullptr) return nullptr; - line_s = line.c_str(); line_s = strchug_fast(line_s); } while (line_s[0] == '#' || *line_s == 0); |