summaryrefslogtreecommitdiff
path: root/src/decoder/Bridge.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-01-17 22:04:31 +0100
committerMax Kellermann <max@musicpd.org>2017-01-17 22:18:21 +0100
commit39114f91a7c39c3da9a097f0bc63c08b2b74bf0f (patch)
tree6b76798ead5ebec8dbec2574e3185640677f9a11 /src/decoder/Bridge.cxx
parent4f01387edfc522908758ca8f3ad0eb96cf841e02 (diff)
AudioFormat: replace struct audio_format_string with class StringBuffer, return it
Diffstat (limited to 'src/decoder/Bridge.cxx')
-rw-r--r--src/decoder/Bridge.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx
index 0df3eb39e..201e6a1aa 100644
--- a/src/decoder/Bridge.cxx
+++ b/src/decoder/Bridge.cxx
@@ -32,6 +32,7 @@
#include "Log.hxx"
#include "input/InputStream.hxx"
#include "util/ConstBuffer.hxx"
+#include "util/StringBuffer.hxx"
#include <assert.h>
#include <string.h>
@@ -246,15 +247,13 @@ void
DecoderBridge::Ready(const AudioFormat audio_format,
bool seekable, SignedSongTime duration)
{
- struct audio_format_string af_string;
-
assert(convert == nullptr);
assert(stream_tag == nullptr);
assert(decoder_tag == nullptr);
assert(!seeking);
FormatDebug(decoder_domain, "audio_format=%s, seekable=%s",
- audio_format_to_string(audio_format, &af_string),
+ ToString(audio_format).c_str(),
seekable ? "true" : "false");
{
@@ -264,8 +263,7 @@ DecoderBridge::Ready(const AudioFormat audio_format,
if (dc.in_audio_format != dc.out_audio_format) {
FormatDebug(decoder_domain, "converting to %s",
- audio_format_to_string(dc.out_audio_format,
- &af_string));
+ ToString(dc.out_audio_format).c_str());
convert = new PcmConvert();