From e660229c405cd0b6bebe52439c98c97869b01c9b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 1 Feb 2015 22:24:19 +0100 Subject: output/sles: use AudioOutputWrapper::Create() --- src/output/plugins/sles/SlesOutputPlugin.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/output') diff --git a/src/output/plugins/sles/SlesOutputPlugin.cxx b/src/output/plugins/sles/SlesOutputPlugin.cxx index 94084e1b8..1e23cd2cc 100644 --- a/src/output/plugins/sles/SlesOutputPlugin.cxx +++ b/src/output/plugins/sles/SlesOutputPlugin.cxx @@ -97,6 +97,8 @@ public: bool Configure(const ConfigBlock &block, Error &error); + static SlesOutput *Create(const ConfigBlock &block, Error &error); + bool Open(AudioFormat &audio_format, Error &error); void Close(); @@ -444,8 +446,8 @@ sles_test_default_device() return true; } -static AudioOutput * -sles_output_init(const ConfigBlock &block, Error &error) +inline SlesOutput * +SlesOutput::Create(const ConfigBlock &block, Error &error) { SlesOutput *sles = new SlesOutput(); @@ -455,7 +457,7 @@ sles_output_init(const ConfigBlock &block, Error &error) return nullptr; } - return *sles; + return sles; } typedef AudioOutputWrapper Wrapper; @@ -463,7 +465,7 @@ typedef AudioOutputWrapper Wrapper; const struct AudioOutputPlugin sles_output_plugin = { "sles", sles_test_default_device, - sles_output_init, + &Wrapper::Init, &Wrapper::Finish, nullptr, nullptr, -- cgit v1.2.3