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

encoder: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-11-07 09:20:12 +01:00
parent b8aac3f8fc
commit d8b6aff23a
16 changed files with 299 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/run_encoder.cxx
View File

@@ -26,7 +26,6 @@
#include "AudioParser.hxx"
#include "config/Block.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#include <memory>
@@ -66,7 +65,6 @@ int main(int argc, char **argv)
block.AddBlockParam("quality", "5.0", -1);
try {
Error error;
std::unique_ptr<PreparedEncoder> p_encoder(encoder_init(*plugin, block));
/* open the encoder */
@@ -75,11 +73,7 @@ int main(int argc, char **argv)
if (argc > 2)
audio_format = ParseAudioFormat(argv[2], false);
std::unique_ptr<Encoder> encoder(p_encoder->Open(audio_format, error));
if (encoder == nullptr) {
LogError(error, "Failed to open encoder");
return EXIT_FAILURE;
}
std::unique_ptr<Encoder> encoder(p_encoder->Open(audio_format));
StdioOutputStream os(stdout);
@@ -89,19 +83,11 @@ int main(int argc, char **argv)
ssize_t nbytes;
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
if (!encoder->Write(buffer, nbytes, error)) {
LogError(error, "encoder_write() failed");
return EXIT_FAILURE;
}
encoder->Write(buffer, nbytes);
EncoderToOutputStream(os, *encoder);
}
if (!encoder->End(error)) {
LogError(error, "encoder_flush() failed");
return EXIT_FAILURE;
}
encoder->End();
EncoderToOutputStream(os, *encoder);
return EXIT_SUCCESS;

22
test/test_vorbis_encoder.cxx
View File

@@ -27,7 +27,6 @@
#include "fs/io/StdioOutputStream.hxx"
#include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#include <memory>
@@ -40,8 +39,6 @@ static uint8_t zero[256];
int
main(gcc_unused int argc, gcc_unused char **argv)
try {
gcc_unused bool success;
/* create the encoder */
const auto plugin = encoder_plugin_get("vorbis");
@@ -56,8 +53,7 @@ try {
/* open the encoder */
AudioFormat audio_format(44100, SampleFormat::S16, 2);
std::unique_ptr<Encoder> encoder(p_encoder->Open(audio_format,
IgnoreError()));
std::unique_ptr<Encoder> encoder(p_encoder->Open(audio_format));
assert(encoder != nullptr);
StdioOutputStream os(stdout);
@@ -66,15 +62,13 @@ try {
/* write a block of data */
success = encoder->Write(zero, sizeof(zero), IgnoreError());
assert(success);
encoder->Write(zero, sizeof(zero));
EncoderToOutputStream(os, *encoder);
/* write a tag */
success = encoder->PreTag(IgnoreError());
assert(success);
encoder->PreTag();
EncoderToOutputStream(os, *encoder);
@@ -87,21 +81,17 @@ try {
tag_builder.Commit(tag);
}
success = encoder->SendTag(tag, IgnoreError());
assert(success);
encoder->SendTag(tag);
EncoderToOutputStream(os, *encoder);
/* write another block of data */
success = encoder->Write(zero, sizeof(zero), IgnoreError());
assert(success);
encoder->Write(zero, sizeof(zero));
/* finish */
success = encoder->End(IgnoreError());
assert(success);
encoder->End();
EncoderToOutputStream(os, *encoder);
return EXIT_SUCCESS;