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

CueParser: use std::string

This commit is contained in:
Max Kellermann 2013-10-17 01:34:10 +02:00
parent abb0549e4b
commit eb10d08671
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cue/CueParser.cxx
View File

@ -31,7 +31,6 @@
CueParser::CueParser()
:state(HEADER), tag(new Tag()),
filename(nullptr),
current(nullptr),
previous(nullptr),
finished(nullptr),
@ -40,7 +39,6 @@ CueParser::CueParser()
CueParser::~CueParser()
{
delete tag;
g_free(filename);
if (current != nullptr)
current->Free();
@ -230,8 +228,7 @@ CueParser::Feed2(char *p)
}
state = WAVE;
g_free(filename);
filename = g_strdup(new_filename);
filename = new_filename;
} else if (state == IGNORE_FILE) {
return;
} else if (strcmp(command, "TRACK") == 0) {
@ -251,7 +248,7 @@ CueParser::Feed2(char *p)
}
state = TRACK;
current = Song::NewRemote(filename);
current = Song::NewRemote(filename.c_str());
assert(current->tag == nullptr);
current->tag = new Tag(*tag);
current->tag->AddItem(TAG_TRACK, nr);

4
src/cue/CueParser.hxx
View File

@ -23,6 +23,8 @@
#include "check.h"
#include "Compiler.h"
#include <string>
struct Song;
struct Tag;
@ -56,7 +58,7 @@ class CueParser {
Tag *tag;
char *filename;
std::string filename;
/**
* The song currently being edited.