diff options
author | Max Kellermann <max@duempel.org> | 2013-01-28 23:41:45 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-01-28 23:41:45 +0100 |
commit | 76417d44464248949e7843eee0d5338a8e0a22ac (patch) | |
tree | c8f6416505b7268ce4f3902660ba35f4e35d1c04 /src/input/RewindInputPlugin.cxx | |
parent | cffc78ad6a978c8ef0afae4fbdd4b189612a7167 (diff) | |
download | mpd-76417d44464248949e7843eee0d5338a8e0a22ac.tar.gz mpd-76417d44464248949e7843eee0d5338a8e0a22ac.tar.xz mpd-76417d44464248949e7843eee0d5338a8e0a22ac.zip |
InputStream: use std::string
Diffstat (limited to 'src/input/RewindInputPlugin.cxx')
-rw-r--r-- | src/input/RewindInputPlugin.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/input/RewindInputPlugin.cxx b/src/input/RewindInputPlugin.cxx index 362e55b3f..207d9ff0f 100644 --- a/src/input/RewindInputPlugin.cxx +++ b/src/input/RewindInputPlugin.cxx @@ -61,7 +61,7 @@ struct RewindInputStream { char buffer[64 * 1024]; RewindInputStream(input_stream *_input) - :base(rewind_input_plugin, _input->uri, + :base(rewind_input_plugin, _input->uri.c_str(), _input->mutex, _input->cond), input(_input), tail(0) { } @@ -89,7 +89,7 @@ struct RewindInputStream { const struct input_stream *src = input; assert(dest != src); - assert(src->mime == NULL || dest->mime != src->mime); + assert(src->mime.empty() || dest->mime != src->mime); bool dest_ready = dest->ready; @@ -98,10 +98,8 @@ struct RewindInputStream { dest->size = src->size; dest->offset = src->offset; - if (!dest_ready && src->ready) { - g_free(dest->mime); - dest->mime = g_strdup(src->mime); - } + if (!dest_ready && src->ready) + dest->mime = src->mime; } }; |