aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-04-09 00:22:35 +0200
committerMax Kellermann <max@duempel.org>2013-04-09 00:38:03 +0200
commit2090911363a131b2a38d39d3b8458eae02889e57 (patch)
treef4aca1787b5986a91cdcf95e5f15d433c12089ff
parent3cc7be0fa6ad68fae6f3d1938e2f7f5a2e951454 (diff)
downloadmpd-2090911363a131b2a38d39d3b8458eae02889e57.tar.gz
mpd-2090911363a131b2a38d39d3b8458eae02889e57.tar.xz
mpd-2090911363a131b2a38d39d3b8458eae02889e57.zip
cue_parser: convert to C++
-rw-r--r--Makefile.am4
-rw-r--r--src/cue/CueParser.cxx322
-rw-r--r--src/cue/CueParser.hxx128
-rw-r--r--src/cue/cue_parser.c403
-rw-r--r--src/cue/cue_parser.h58
-rw-r--r--src/playlist/CuePlaylistPlugin.cxx18
-rw-r--r--src/playlist/EmbeddedCuePlaylistPlugin.cxx18
7 files changed, 469 insertions, 482 deletions
diff --git a/Makefile.am b/Makefile.am
index c4a2d1443..b062cb57c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,7 +136,7 @@ src_mpd_SOURCES = \
src/Idle.cxx src/Idle.hxx \
src/CommandLine.cxx src/CommandLine.hxx \
src/CrossFade.cxx src/CrossFade.hxx \
- src/cue/cue_parser.c src/cue/cue_parser.h \
+ src/cue/CueParser.cxx src/cue/CueParser.hxx \
src/decoder_error.h \
src/DecoderThread.cxx src/DecoderThread.hxx \
src/DecoderControl.cxx src/DecoderControl.hxx \
@@ -1157,7 +1157,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
src/tag_handler.c src/TagFile.cxx \
src/audio_check.c src/pcm_buffer.c \
src/text_input_stream.c \
- src/cue/cue_parser.c src/cue/cue_parser.h \
+ src/cue/CueParser.cxx src/cue/CueParser.hxx \
src/fd_util.c
if HAVE_FLAC
diff --git a/src/cue/CueParser.cxx b/src/cue/CueParser.cxx
new file mode 100644
index 000000000..55c619cd8
--- /dev/null
+++ b/src/cue/CueParser.cxx
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "CueParser.hxx"
+#include "string_util.h"
+#include "song.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stdlib.h>
+
+CueParser::CueParser()
+ :state(HEADER), tag(tag_new()),
+ filename(nullptr),
+ current(nullptr),
+ previous(nullptr),
+ finished(nullptr),
+ end(false) {}
+
+CueParser::~CueParser()
+{
+ tag_free(tag);
+ g_free(filename);
+
+ if (current != nullptr)
+ song_free(current);
+
+ if (previous != nullptr)
+ song_free(previous);
+
+ if (finished != nullptr)
+ song_free(finished);
+}
+
+static const char *
+cue_next_word(char *p, char **pp)
+{
+ assert(p >= *pp);
+ assert(!g_ascii_isspace(*p));
+
+ const char *word = p;
+ while (*p != 0 && !g_ascii_isspace(*p))
+ ++p;
+
+ *p = 0;
+ *pp = p + 1;
+ return word;
+}
+
+static const char *
+cue_next_quoted(char *p, char **pp)
+{
+ assert(p >= *pp);
+ assert(p[-1] == '"');
+
+ char *end = strchr(p, '"');
+ if (end == nullptr) {
+ /* syntax error - ignore it silently */
+ *pp = p + strlen(p);
+ return p;
+ }
+
+ *end = 0;
+ *pp = end + 1;
+
+ return p;
+}
+
+static const char *
+cue_next_token(char **pp)
+{
+ char *p = strchug_fast(*pp);
+ if (*p == 0)
+ return nullptr;
+
+ return cue_next_word(p, pp);
+}
+
+static const char *
+cue_next_value(char **pp)
+{
+ char *p = strchug_fast(*pp);
+ if (*p == 0)
+ return nullptr;
+
+ if (*p == '"')
+ return cue_next_quoted(p + 1, pp);
+ else
+ return cue_next_word(p, pp);
+}
+
+static void
+cue_add_tag(struct tag *tag, enum tag_type type, char *p)
+{
+ const char *value = cue_next_value(&p);
+ if (value != nullptr)
+ tag_add_item(tag, type, value);
+
+}
+
+static void
+cue_parse_rem(char *p, struct tag *tag)
+{
+ const char *type = cue_next_token(&p);
+ if (type == nullptr)
+ return;
+
+ enum tag_type type2 = tag_name_parse_i(type);
+ if (type2 != TAG_NUM_OF_ITEM_TYPES)
+ cue_add_tag(tag, type2, p);
+}
+
+struct tag *
+CueParser::GetCurrentTag()
+{
+ if (state == HEADER)
+ return tag;
+ else if (state == TRACK)
+ return current->tag;
+ else
+ return nullptr;
+}
+
+static int
+cue_parse_position(const char *p)
+{
+ char *endptr;
+ unsigned long minutes = strtoul(p, &endptr, 10);
+ if (endptr == p || *endptr != ':')
+ return -1;
+
+ p = endptr + 1;
+ unsigned long seconds = strtoul(p, &endptr, 10);
+ if (endptr == p || *endptr != ':')
+ return -1;
+
+ p = endptr + 1;
+ unsigned long frames = strtoul(p, &endptr, 10);
+ if (endptr == p || *endptr != 0)
+ return -1;
+
+ return minutes * 60000 + seconds * 1000 + frames * 1000 / 75;
+}
+
+void
+CueParser::Commit()
+{
+ /* the caller of this library must call cue_parser_get() often
+ enough */
+ assert(finished == nullptr);
+ assert(!end);
+
+ if (current == nullptr)
+ return;
+
+ finished = previous;
+ previous = current;
+ current = nullptr;
+}
+
+void
+CueParser::Feed2(char *p)
+{
+ assert(!end);
+ assert(p != nullptr);
+
+ const char *command = cue_next_token(&p);
+ if (command == nullptr)
+ return;
+
+ if (strcmp(command, "REM") == 0) {
+ struct tag *current_tag = GetCurrentTag();
+ if (current_tag != nullptr)
+ cue_parse_rem(p, current_tag);
+ } else if (strcmp(command, "PERFORMER") == 0) {
+ /* MPD knows a "performer" tag, but it is not a good
+ match for this CUE tag; from the Hydrogenaudio
+ Knowledgebase: "At top-level this will specify the
+ CD artist, while at track-level it specifies the
+ track artist." */
+
+ enum tag_type type = state == TRACK
+ ? TAG_ARTIST
+ : TAG_ALBUM_ARTIST;
+
+ struct tag *current_tag = GetCurrentTag();
+ if (current_tag != nullptr)
+ cue_add_tag(current_tag, type, p);
+ } else if (strcmp(command, "TITLE") == 0) {
+ if (state == HEADER)
+ cue_add_tag(tag, TAG_ALBUM, p);
+ else if (state == TRACK)
+ cue_add_tag(current->tag, TAG_TITLE, p);
+ } else if (strcmp(command, "FILE") == 0) {
+ Commit();
+
+ const char *new_filename = cue_next_value(&p);
+ if (new_filename == nullptr)
+ return;
+
+ const char *type = cue_next_token(&p);
+ if (type == nullptr)
+ return;
+
+ if (strcmp(type, "WAVE") != 0 &&
+ strcmp(type, "MP3") != 0 &&
+ strcmp(type, "AIFF") != 0) {
+ state = IGNORE_FILE;
+ return;
+ }
+
+ state = WAVE;
+ g_free(filename);
+ filename = g_strdup(new_filename);
+ } else if (state == IGNORE_FILE) {
+ return;
+ } else if (strcmp(command, "TRACK") == 0) {
+ Commit();
+
+ const char *nr = cue_next_token(&p);
+ if (nr == nullptr)
+ return;
+
+ const char *type = cue_next_token(&p);
+ if (type == nullptr)
+ return;
+
+ if (strcmp(type, "AUDIO") != 0) {
+ state = IGNORE_TRACK;
+ return;
+ }
+
+ state = TRACK;
+ current = song_remote_new(filename);
+ assert(current->tag == nullptr);
+ current->tag = tag_dup(tag);
+ tag_add_item(current->tag, TAG_TRACK, nr);
+ last_updated = false;
+ } else if (state == IGNORE_TRACK) {
+ return;
+ } else if (state == TRACK && strcmp(command, "INDEX") == 0) {
+ const char *nr = cue_next_token(&p);
+ if (nr == nullptr)
+ return;
+
+ const char *position = cue_next_token(&p);
+ if (position == nullptr)
+ return;
+
+ int position_ms = cue_parse_position(position);
+ if (position_ms < 0)
+ return;
+
+ if (!last_updated && previous != nullptr &&
+ previous->start_ms < (unsigned)position_ms) {
+ last_updated = true;
+ previous->end_ms = position_ms;
+ previous->tag->time =
+ (previous->end_ms - previous->start_ms + 500) / 1000;
+ }
+
+ current->start_ms = position_ms;
+ }
+}
+
+void
+CueParser::Feed(const char *line)
+{
+ assert(!end);
+ assert(line != nullptr);
+
+ char *allocated = g_strdup(line);
+ Feed2(allocated);
+ g_free(allocated);
+}
+
+void
+CueParser::Finish()
+{
+ if (end)
+ /* has already been called, ignore */
+ return;
+
+ Commit();
+ end = true;
+}
+
+struct song *
+CueParser::Get()
+{
+ if (finished == nullptr && end) {
+ /* cue_parser_finish() has been called already:
+ deliver all remaining (partial) results */
+ assert(current == nullptr);
+
+ finished = previous;
+ previous = nullptr;
+ }
+
+ struct song *song = finished;
+ finished = nullptr;
+ return song;
+}
diff --git a/src/cue/CueParser.hxx b/src/cue/CueParser.hxx
new file mode 100644
index 000000000..1266f1a6f
--- /dev/null
+++ b/src/cue/CueParser.hxx
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CUE_PARSER_HXX
+#define MPD_CUE_PARSER_HXX
+
+#include "check.h"
+#include "gcc.h"
+
+class CueParser {
+ enum {
+ /**
+ * Parsing the CUE header.
+ */
+ HEADER,
+
+ /**
+ * Parsing a "FILE ... WAVE".
+ */
+ WAVE,
+
+ /**
+ * Ignore everything until the next "FILE".
+ */
+ IGNORE_FILE,
+
+ /**
+ * Parsing a "TRACK ... AUDIO".
+ */
+ TRACK,
+
+ /**
+ * Ignore everything until the next "TRACK".
+ */
+ IGNORE_TRACK,
+ } state;
+
+ struct tag *tag;
+
+ char *filename;
+
+ /**
+ * The song currently being edited.
+ */
+ struct song *current;
+
+ /**
+ * The previous song. It is remembered because its end_time
+ * will be set to the current song's start time.
+ */
+ struct song *previous;
+
+ /**
+ * A song that is completely finished and can be returned to
+ * the caller via cue_parser_get().
+ */
+ struct song *finished;
+
+ /**
+ * Set to true after previous.end_time has been updated to the
+ * start time of the current song.
+ */
+ bool last_updated;
+
+ /**
+ * Tracks whether cue_parser_finish() has been called. If
+ * true, then all remaining (partial) results will be
+ * delivered by cue_parser_get().
+ */
+ bool end;
+
+public:
+ CueParser();
+ ~CueParser();
+
+ /**
+ * Feed a text line from the CUE file into the parser. Call
+ * cue_parser_get() after this to see if a song has been finished.
+ */
+ void Feed(const char *line);
+
+ /**
+ * Tell the parser that the end of the file has been reached. Call
+ * cue_parser_get() after this to see if a song has been finished.
+ * This procedure must be done twice!
+ */
+ void Finish();
+
+ /**
+ * Check if a song was finished by the last cue_parser_feed() or
+ * cue_parser_finish() call.
+ *
+ * @return a song object that must be freed by the caller, or NULL if
+ * no song was finished at this time
+ */
+ struct song *Get();
+
+private:
+ gcc_pure
+ struct tag *GetCurrentTag();
+
+ /**
+ * Commit the current song. It will be moved to "previous",
+ * so the next song may soon edit its end time (using the next
+ * song's start time).
+ */
+ void Commit();
+
+ void Feed2(char *p);
+};
+
+#endif
diff --git a/src/cue/cue_parser.c b/src/cue/cue_parser.c
deleted file mode 100644
index bee757c9c..000000000
--- a/src/cue/cue_parser.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "cue_parser.h"
-#include "string_util.h"
-#include "song.h"
-#include "tag.h"
-
-#include <glib.h>
-
-#include <assert.h>
-#include <stdlib.h>
-
-struct cue_parser {
- enum {
- /**
- * Parsing the CUE header.
- */
- HEADER,
-
- /**
- * Parsing a "FILE ... WAVE".
- */
- WAVE,
-
- /**
- * Ignore everything until the next "FILE".
- */
- IGNORE_FILE,
-
- /**
- * Parsing a "TRACK ... AUDIO".
- */
- TRACK,
-
- /**
- * Ignore everything until the next "TRACK".
- */
- IGNORE_TRACK,
- } state;
-
- struct tag *tag;
-
- char *filename;
-
- /**
- * The song currently being edited.
- */
- struct song *current;
-
- /**
- * The previous song. It is remembered because its end_time
- * will be set to the current song's start time.
- */
- struct song *previous;
-
- /**
- * A song that is completely finished and can be returned to
- * the caller via cue_parser_get().
- */
- struct song *finished;
-
- /**
- * Set to true after previous.end_time has been updated to the
- * start time of the current song.
- */
- bool last_updated;
-
- /**
- * Tracks whether cue_parser_finish() has been called. If
- * true, then all remaining (partial) results will be
- * delivered by cue_parser_get().
- */
- bool end;
-};
-
-struct cue_parser *
-cue_parser_new(void)
-{
- struct cue_parser *parser = g_new(struct cue_parser, 1);
- parser->state = HEADER;
- parser->tag = tag_new();
- parser->filename = NULL;
- parser->current = NULL;
- parser->previous = NULL;
- parser->finished = NULL;
- parser->end = false;
- return parser;
-}
-
-void
-cue_parser_free(struct cue_parser *parser)
-{
- tag_free(parser->tag);
- g_free(parser->filename);
-
- if (parser->current != NULL)
- song_free(parser->current);
-
- if (parser->previous != NULL)
- song_free(parser->previous);
-
- if (parser->finished != NULL)
- song_free(parser->finished);
-
- g_free(parser);
-}
-
-static const char *
-cue_next_word(char *p, char **pp)
-{
- assert(p >= *pp);
- assert(!g_ascii_isspace(*p));
-
- const char *word = p;
- while (*p != 0 && !g_ascii_isspace(*p))
- ++p;
-
- *p = 0;
- *pp = p + 1;
- return word;
-}
-
-static const char *
-cue_next_quoted(char *p, char **pp)
-{
- assert(p >= *pp);
- assert(p[-1] == '"');
-
- char *end = strchr(p, '"');
- if (end == NULL) {
- /* syntax error - ignore it silently */
- *pp = p + strlen(p);
- return p;
- }
-
- *end = 0;
- *pp = end + 1;
-
- return p;
-}
-
-static const char *
-cue_next_token(char **pp)
-{
- char *p = strchug_fast(*pp);
- if (*p == 0)
- return NULL;
-
- return cue_next_word(p, pp);
-}
-
-static const char *
-cue_next_value(char **pp)
-{
- char *p = strchug_fast(*pp);
- if (*p == 0)
- return NULL;
-
- if (*p == '"')
- return cue_next_quoted(p + 1, pp);
- else
- return cue_next_word(p, pp);
-}
-
-static void
-cue_add_tag(struct tag *tag, enum tag_type type, char *p)
-{
- const char *value = cue_next_value(&p);
- if (value != NULL)
- tag_add_item(tag, type, value);
-
-}
-
-static void
-cue_parse_rem(char *p, struct tag *tag)
-{
- const char *type = cue_next_token(&p);
- if (type == NULL)
- return;
-
- enum tag_type type2 = tag_name_parse_i(type);
- if (type2 != TAG_NUM_OF_ITEM_TYPES)
- cue_add_tag(tag, type2, p);
-}
-
-static struct tag *
-cue_current_tag(struct cue_parser *parser)
-{
- if (parser->state == HEADER)
- return parser->tag;
- else if (parser->state == TRACK)
- return parser->current->tag;
- else
- return NULL;
-}
-
-static int
-cue_parse_position(const char *p)
-{
- char *endptr;
- unsigned long minutes = strtoul(p, &endptr, 10);
- if (endptr == p || *endptr != ':')
- return -1;
-
- p = endptr + 1;
- unsigned long seconds = strtoul(p, &endptr, 10);
- if (endptr == p || *endptr != ':')
- return -1;
-
- p = endptr + 1;
- unsigned long frames = strtoul(p, &endptr, 10);
- if (endptr == p || *endptr != 0)
- return -1;
-
- return minutes * 60000 + seconds * 1000 + frames * 1000 / 75;
-}
-
-/**
- * Commit the current song. It will be moved to "previous", so the
- * next song may soon edit its end time (using the next song's start
- * time).
- */
-static void
-cue_parser_commit(struct cue_parser *parser)
-{
- /* the caller of this library must call cue_parser_get() often
- enough */
- assert(parser->finished == NULL);
- assert(!parser->end);
-
- if (parser->current == NULL)
- return;
-
- parser->finished = parser->previous;
- parser->previous = parser->current;
- parser->current = NULL;
-}
-
-static void
-cue_parser_feed2(struct cue_parser *parser, char *p)
-{
- assert(parser != NULL);
- assert(!parser->end);
- assert(p != NULL);
-
- const char *command = cue_next_token(&p);
- if (command == NULL)
- return;
-
- if (strcmp(command, "REM") == 0) {
- struct tag *tag = cue_current_tag(parser);
- if (tag != NULL)
- cue_parse_rem(p, tag);
- } else if (strcmp(command, "PERFORMER") == 0) {
- /* MPD knows a "performer" tag, but it is not a good
- match for this CUE tag; from the Hydrogenaudio
- Knowledgebase: "At top-level this will specify the
- CD artist, while at track-level it specifies the
- track artist." */
-
- enum tag_type type = parser->state == TRACK
- ? TAG_ARTIST
- : TAG_ALBUM_ARTIST;
-
- struct tag *tag = cue_current_tag(parser);
- if (tag != NULL)
- cue_add_tag(tag, type, p);
- } else if (strcmp(command, "TITLE") == 0) {
- if (parser->state == HEADER)
- cue_add_tag(parser->tag, TAG_ALBUM, p);
- else if (parser->state == TRACK)
- cue_add_tag(parser->current->tag, TAG_TITLE, p);
- } else if (strcmp(command, "FILE") == 0) {
- cue_parser_commit(parser);
-
- const char *filename = cue_next_value(&p);
- if (filename == NULL)
- return;
-
- const char *type = cue_next_token(&p);
- if (type == NULL)
- return;
-
- if (strcmp(type, "WAVE") != 0 &&
- strcmp(type, "MP3") != 0 &&
- strcmp(type, "AIFF") != 0) {
- parser->state = IGNORE_FILE;
- return;
- }
-
- parser->state = WAVE;
- g_free(parser->filename);
- parser->filename = g_strdup(filename);
- } else if (parser->state == IGNORE_FILE) {
- return;
- } else if (strcmp(command, "TRACK") == 0) {
- cue_parser_commit(parser);
-
- const char *nr = cue_next_token(&p);
- if (nr == NULL)
- return;
-
- const char *type = cue_next_token(&p);
- if (type == NULL)
- return;
-
- if (strcmp(type, "AUDIO") != 0) {
- parser->state = IGNORE_TRACK;
- return;
- }
-
- parser->state = TRACK;
- parser->current = song_remote_new(parser->filename);
- assert(parser->current->tag == NULL);
- parser->current->tag = tag_dup(parser->tag);
- tag_add_item(parser->current->tag, TAG_TRACK, nr);
- parser->last_updated = false;
- } else if (parser->state == IGNORE_TRACK) {
- return;
- } else if (parser->state == TRACK && strcmp(command, "INDEX") == 0) {
- const char *nr = cue_next_token(&p);
- if (nr == NULL)
- return;
-
- const char *position = cue_next_token(&p);
- if (position == NULL)
- return;
-
- int position_ms = cue_parse_position(position);
- if (position_ms < 0)
- return;
-
- if (!parser->last_updated && parser->previous != NULL &&
- parser->previous->start_ms < (unsigned)position_ms) {
- parser->last_updated = true;
- parser->previous->end_ms = position_ms;
- parser->previous->tag->time =
- (parser->previous->end_ms - parser->previous->start_ms + 500) / 1000;
- }
-
- parser->current->start_ms = position_ms;
- }
-}
-
-void
-cue_parser_feed(struct cue_parser *parser, const char *line)
-{
- assert(parser != NULL);
- assert(!parser->end);
- assert(line != NULL);
-
- char *allocated = g_strdup(line);
- cue_parser_feed2(parser, allocated);
- g_free(allocated);
-}
-
-void
-cue_parser_finish(struct cue_parser *parser)
-{
- if (parser->end)
- /* has already been called, ignore */
- return;
-
- cue_parser_commit(parser);
- parser->end = true;
-}
-
-struct song *
-cue_parser_get(struct cue_parser *parser)
-{
- assert(parser != NULL);
-
- if (parser->finished == NULL && parser->end) {
- /* cue_parser_finish() has been called already:
- deliver all remaining (partial) results */
- assert(parser->current == NULL);
-
- parser->finished = parser->previous;
- parser->previous = NULL;
- }
-
- struct song *song = parser->finished;
- parser->finished = NULL;
- return song;
-}
diff --git a/src/cue/cue_parser.h b/src/cue/cue_parser.h
deleted file mode 100644
index d8d695739..000000000
--- a/src/cue/cue_parser.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_CUE_PARSER_H
-#define MPD_CUE_PARSER_H
-
-#include "check.h"
-
-#include <stdbool.h>
-
-struct cue_parser *
-cue_parser_new(void);
-
-void
-cue_parser_free(struct cue_parser *parser);
-
-/**
- * Feed a text line from the CUE file into the parser. Call
- * cue_parser_get() after this to see if a song has been finished.
- */
-void
-cue_parser_feed(struct cue_parser *parser, const char *line);
-
-/**
- * Tell the parser that the end of the file has been reached. Call
- * cue_parser_get() after this to see if a song has been finished.
- * This procedure must be done twice!
- */
-void
-cue_parser_finish(struct cue_parser *parser);
-
-/**
- * Check if a song was finished by the last cue_parser_feed() or
- * cue_parser_finish() call.
- *
- * @return a song object that must be freed by the caller, or NULL if
- * no song was finished at this time
- */
-struct song *
-cue_parser_get(struct cue_parser *parser);
-
-#endif
diff --git a/src/playlist/CuePlaylistPlugin.cxx b/src/playlist/CuePlaylistPlugin.cxx
index 71ae2261a..730ef783b 100644
--- a/src/playlist/CuePlaylistPlugin.cxx
+++ b/src/playlist/CuePlaylistPlugin.cxx
@@ -23,10 +23,10 @@
#include "tag.h"
#include "song.h"
#include "input_stream.h"
+#include "cue/CueParser.hxx"
extern "C" {
#include "text_input_stream.h"
-#include "cue/cue_parser.h"
}
#include <glib.h>
@@ -41,16 +41,14 @@ struct CuePlaylist {
struct input_stream *is;
struct text_input_stream *tis;
- struct cue_parser *parser;
+ CueParser parser;
CuePlaylist(struct input_stream *_is)
- :is(_is), tis(text_input_stream_new(is)),
- parser(cue_parser_new()) {
+ :is(_is), tis(text_input_stream_new(is)) {
playlist_provider_init(&base, &cue_playlist_plugin);
}
~CuePlaylist() {
- cue_parser_free(parser);
text_input_stream_free(tis);
}
};
@@ -74,20 +72,20 @@ cue_playlist_read(struct playlist_provider *_playlist)
{
CuePlaylist *playlist = (CuePlaylist *)_playlist;
- struct song *song = cue_parser_get(playlist->parser);
+ struct song *song = playlist->parser.Get();
if (song != NULL)
return song;
const char *line;
while ((line = text_input_stream_read(playlist->tis)) != NULL) {
- cue_parser_feed(playlist->parser, line);
- song = cue_parser_get(playlist->parser);
+ playlist->parser.Feed(line);
+ song = playlist->parser.Get();
if (song != NULL)
return song;
}
- cue_parser_finish(playlist->parser);
- return cue_parser_get(playlist->parser);
+ playlist->parser.Finish();
+ return playlist->parser.Get();
}
static const char *const cue_playlist_suffixes[] = {
diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
index 04cb12eca..eaedc738f 100644
--- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
@@ -30,11 +30,11 @@
#include "tag_handler.h"
#include "song.h"
#include "TagFile.hxx"
+#include "cue/CueParser.hxx"
extern "C" {
#include "tag_ape.h"
#include "tag_id3.h"
-#include "cue/cue_parser.h"
}
#include <glib.h>
@@ -64,7 +64,7 @@ struct embcue_playlist {
*/
char *next;
- struct cue_parser *parser;
+ CueParser *parser;
};
static void
@@ -112,7 +112,7 @@ embcue_playlist_open_uri(const char *uri,
playlist->filename = g_path_get_basename(uri);
playlist->next = playlist->cuesheet;
- playlist->parser = cue_parser_new();
+ playlist->parser = new CueParser();
return &playlist->base;
}
@@ -122,7 +122,7 @@ embcue_playlist_close(struct playlist_provider *_playlist)
{
struct embcue_playlist *playlist = (struct embcue_playlist *)_playlist;
- cue_parser_free(playlist->parser);
+ delete playlist->parser;
g_free(playlist->cuesheet);
g_free(playlist->filename);
g_free(playlist);
@@ -133,7 +133,7 @@ embcue_playlist_read(struct playlist_provider *_playlist)
{
struct embcue_playlist *playlist = (struct embcue_playlist *)_playlist;
- struct song *song = cue_parser_get(playlist->parser);
+ struct song *song = playlist->parser->Get();
if (song != NULL)
return song;
@@ -149,14 +149,14 @@ embcue_playlist_read(struct playlist_provider *_playlist)
end of the buffer */
playlist->next += strlen(line);
- cue_parser_feed(playlist->parser, line);
- song = cue_parser_get(playlist->parser);
+ playlist->parser->Feed(line);
+ song = playlist->parser->Get();
if (song != NULL)
return song_replace_uri(song, playlist->filename);
}
- cue_parser_finish(playlist->parser);
- song = cue_parser_get(playlist->parser);
+ playlist->parser->Finish();
+ song = playlist->parser->Get();
if (song != NULL)
song = song_replace_uri(song, playlist->filename);
return song;