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

pcm/Convert: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-09-05 12:19:20 +02:00
parent 860064c812
commit ae1eb9ccde
27 changed files with 197 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/run_convert.cxx
View File

@@ -38,8 +38,9 @@
#include <stdio.h>
#include <unistd.h>
int main(int argc, char **argv)
{
int
main(int argc, char **argv)
try {
AudioFormat in_audio_format, out_audio_format;
if (argc != 3) {
@@ -68,10 +69,7 @@ int main(int argc, char **argv)
const size_t in_frame_size = in_audio_format.GetFrameSize();
PcmConvert state;
if (!state.Open(in_audio_format, out_audio_format_mask, error)) {
LogError(error, "Failed to open PcmConvert");
return EXIT_FAILURE;
}
state.Open(in_audio_format, out_audio_format_mask);
StaticFifoBuffer<uint8_t, 4096> buffer;
@@ -96,12 +94,7 @@ int main(int argc, char **argv)
buffer.Consume(src.size);
auto output = state.Convert({src.data, src.size}, error);
if (output.IsNull()) {
state.Close();
LogError(error, "Failed to convert");
return EXIT_FAILURE;
}
auto output = state.Convert({src.data, src.size});
gcc_unused ssize_t ignored = write(1, output.data,
output.size);
@@ -110,4 +103,7 @@ int main(int argc, char **argv)
state.Close();
return EXIT_SUCCESS;
} catch (const std::exception &e) {
LogError(e);
return EXIT_FAILURE;
}