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

encoder/Configured: glue code to initialize PreparedEncoder

Browse Source
This commit is contained in:
Max Kellermann
2017-11-10 21:37:56 +01:00
parent fef9747fbf
commit 6464b4b372
6 changed files with 105 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/plugins/RecorderOutputPlugin.cxx
View File

@@ -23,14 +23,12 @@
#include "tag/Format.hxx"
#include "encoder/ToOutputStream.hxx"
#include "encoder/EncoderInterface.hxx"
#include "encoder/EncoderPlugin.hxx"
#include "encoder/EncoderList.hxx"
#include "encoder/Configured.hxx"
#include "config/ConfigError.hxx"
#include "config/ConfigPath.hxx"
#include "Log.hxx"
#include "fs/AllocatedPath.hxx"
#include "fs/io/FileOutputStream.hxx"
#include "util/RuntimeError.hxx"
#include "util/Domain.hxx"
#include "util/ScopeExit.hxx"
@@ -109,16 +107,11 @@ private:
};
RecorderOutput::RecorderOutput(const ConfigBlock &block)
:AudioOutput(0)
:AudioOutput(0),
prepared_encoder(CreateConfiguredEncoder(block))
{
/* read configuration */
const char *encoder_name =
block.GetBlockValue("encoder", "vorbis");
const auto encoder_plugin = encoder_plugin_get(encoder_name);
if (encoder_plugin == nullptr)
throw FormatRuntimeError("No such encoder: %s", encoder_name);
path = block.GetPath("path");
const char *fmt = block.GetBlockValue("format_path", nullptr);
@@ -130,10 +123,6 @@ RecorderOutput::RecorderOutput(const ConfigBlock &block)
if (!path.IsNull() && fmt != nullptr)
throw std::runtime_error("Cannot have both 'path' and 'format_path'");
/* initialize encoder */
prepared_encoder.reset(encoder_init(*encoder_plugin, block));
}
inline void