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

Song: GetURI() returns std::string

Browse Source
This commit is contained in:
Max Kellermann
2013-10-17 01:01:15 +02:00
parent 67ae033de7
commit be8ceae6e6
10 changed files with 62 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/DecoderThread.cxx
View File

@@ -422,16 +422,13 @@ decoder_run(struct decoder_control *dc)
dc->ClearError();
const Song *song = dc->song;
char *uri;
assert(song != NULL);
if (song->IsFile())
uri = g_strdup(map_song_fs(song).c_str());
else
uri = song->GetURI();
const std::string uri = song->IsFile()
? std::string(map_song_fs(song).c_str())
: song->GetURI();
if (uri == NULL) {
if (uri.empty()) {
dc->state = DecoderState::ERROR;
dc->error.Set(decoder_domain, "Failed to map song");
@@ -439,8 +436,7 @@ decoder_run(struct decoder_control *dc)
return;
}
decoder_run_song(dc, song, uri);
g_free(uri);
decoder_run_song(dc, song, uri.c_str());
}