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

output/Internal: hide Configure() and remove the non-configuring constructor

Browse Source
This commit is contained in:
Max Kellermann 2016-11-09 12:04:54 +01:00
parent d0aa154ea6
commit bbe7a37359
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Init.cxx
View File

@ -49,19 +49,15 @@
#define AUDIO_OUTPUT_FORMAT "format" #define AUDIO_OUTPUT_FORMAT "format"
#define AUDIO_FILTERS "filters" #define AUDIO_FILTERS "filters"
AudioOutput::AudioOutput(const AudioOutputPlugin &_plugin) AudioOutput::AudioOutput(const AudioOutputPlugin &_plugin,
const ConfigBlock &block)
:plugin(_plugin) :plugin(_plugin)
{ {
assert(plugin.finish != nullptr); assert(plugin.finish != nullptr);
assert(plugin.open != nullptr); assert(plugin.open != nullptr);
assert(plugin.close != nullptr); assert(plugin.close != nullptr);
assert(plugin.play != nullptr); assert(plugin.play != nullptr);
}
AudioOutput::AudioOutput(const AudioOutputPlugin &_plugin,
const ConfigBlock &block)
:AudioOutput(_plugin)
{
Error error; Error error;
if (!Configure(block, error)) if (!Configure(block, error))
throw std::runtime_error(error.GetMessage()); throw std::runtime_error(error.GetMessage());

4
src/output/Internal.hxx
View File

@ -282,8 +282,6 @@ struct AudioOutput {
*/ */
bool current_chunk_finished; bool current_chunk_finished;
AudioOutput(const AudioOutputPlugin &_plugin);
/** /**
* Throws #std::runtime_error on error. * Throws #std::runtime_error on error.
*/ */
@ -292,8 +290,10 @@ struct AudioOutput {
~AudioOutput(); ~AudioOutput();
private:
bool Configure(const ConfigBlock &block, Error &error); bool Configure(const ConfigBlock &block, Error &error);
public:
void StartThread(); void StartThread();
void StopThread(); void StopThread();

4
src/output/plugins/SolarisOutputPlugin.cxx
View File

@ -60,10 +60,6 @@ struct SolarisOutput {
explicit SolarisOutput(const ConfigBlock &block) explicit SolarisOutput(const ConfigBlock &block)
:base(solaris_output_plugin, block), :base(solaris_output_plugin, block),
device(block.GetBlockValue("device", "/dev/audio")) {} device(block.GetBlockValue("device", "/dev/audio")) {}
bool Initialize(const ConfigBlock &block, Error &error_r) {
return base.Configure(block, error_r);
}
}; };
static bool static bool