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

input/TextInputStream: return char*

Browse Source 
Revert to the old API before commit e9e55b08, removing unnecessary
bloat.
This commit is contained in:
Max Kellermann
2014-08-07 00:06:02 +02:00
parent 08fee9a284
commit 69ae879c58
6 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/playlist/plugins/CuePlaylistPlugin.cxx
View File

@@ -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;

11
src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
View File

@@ -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;

5
src/playlist/plugins/M3uPlaylistPlugin.cxx
View File

@@ -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);