From be8ceae6e6c2836233dd8acedd829b18943f820a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Oct 2013 01:01:15 +0200 Subject: Song: GetURI() returns std::string --- src/PlayerThread.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/PlayerThread.cxx') diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index 9ad37eaee..94cfe2af1 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -461,12 +461,10 @@ Player::CheckDecoderStartup() decoder_starting = false; if (!paused && !OpenOutput()) { - char *uri = dc.song->GetURI(); + const auto uri = dc.song->GetURI(); FormatError(player_domain, "problems opening audio device " - "while playing \"%s\"", uri); - g_free(uri); - + "while playing \"%s\"", uri.c_str()); return true; } @@ -878,9 +876,10 @@ Player::SongBorder() { xfade_state = CrossFadeState::UNKNOWN; - char *uri = song->GetURI(); - FormatInfo(player_domain, "played \"%s\"", uri); - g_free(uri); + { + const auto uri = song->GetURI(); + FormatInfo(player_domain, "played \"%s\"", uri.c_str()); + } ReplacePipe(dc.pipe); -- cgit v1.2.3