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

PcmConvert: Convert() returns ConstBuffer

Browse Source
This commit is contained in:
Max Kellermann
2014-08-12 16:36:07 +02:00
parent 4d5f610029
commit 56f61a6d59
5 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/run_convert.cxx
View File

@@ -28,6 +28,7 @@
#include "AudioFormat.hxx"
#include "pcm/PcmConvert.hxx"
#include "config/ConfigGlobal.hxx"
#include "util/ConstBuffer.hxx"
#include "util/StaticFifoBuffer.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
@@ -48,7 +49,6 @@ config_get_string(gcc_unused enum ConfigOption option,
int main(int argc, char **argv)
{
AudioFormat in_audio_format, out_audio_format;
const void *output;
if (argc != 3) {
fprintf(stderr,
@@ -104,16 +104,15 @@ int main(int argc, char **argv)
buffer.Consume(src.size);
size_t length;
output = state.Convert(src.data, src.size,
&length, error);
if (output == NULL) {
auto output = state.Convert({src.data, src.size}, error);
if (output.IsNull()) {
state.Close();
LogError(error, "Failed to convert");
return EXIT_FAILURE;
}
gcc_unused ssize_t ignored = write(1, output, length);
gcc_unused ssize_t ignored = write(1, output.data,
output.size);
}
state.Close();