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

AudioFormat: replace struct audio_format_string with class StringBuffer, return it

Browse Source
This commit is contained in:
Max Kellermann
2017-01-17 22:04:31 +01:00
parent 4f01387edf
commit 39114f91a7
10 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/decoder/Bridge.cxx
View File

@@ -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();