output/Multiple: use std::unique_ptr<FilteredAudioOutput>

src/output/Control.cxx

@@ -37,13 +37,21 @@ static constexpr PeriodClock::Duration REOPEN_AFTER = std::chrono::seconds(10);
 
 struct notify audio_output_client_notify;
 
-AudioOutputControl::AudioOutputControl(FilteredAudioOutput *_output,
+AudioOutputControl::AudioOutputControl(std::unique_ptr<FilteredAudioOutput> _output,
 				       AudioOutputClient &_client) noexcept
-	:output(_output), client(_client),
+	:output(std::move(_output)), client(_client),
 	 thread(BIND_THIS_METHOD(Task))
 {
 }
 
+AudioOutputControl::~AudioOutputControl() noexcept
+{
+	assert(!fail_timer.IsDefined());
+	assert(!thread.IsDefined());
+	assert(output == nullptr);
+	assert(!open);
+}
+
 void
 AudioOutputControl::Configure(const ConfigBlock &block)
 {
@@ -377,6 +385,5 @@ AudioOutputControl::FinishDestroy() noexcept
 	if (thread.IsDefined())
 		thread.Join();
 
-	delete output;
+	output.reset();
-	output = nullptr;
 }

src/output/Control.hxx

@@ -30,6 +30,7 @@
 
 #include <utility>
 #include <exception>
+#include <memory>
 #include <string>
 #include <map>
 
@@ -52,7 +53,7 @@ class AudioOutputClient;
  * Controller for an #AudioOutput and its output thread.
  */
 class AudioOutputControl {
-	FilteredAudioOutput *output;
+	std::unique_ptr<FilteredAudioOutput> output;
 
 	/**
 	 * The PlayerControl object which "owns" this output.  This
@@ -211,17 +212,10 @@ public:
 	 */
 	mutable Mutex mutex;
 
-	AudioOutputControl(FilteredAudioOutput *_output,
+	AudioOutputControl(std::unique_ptr<FilteredAudioOutput> _output,
 			   AudioOutputClient &_client) noexcept;
 
-#ifndef NDEBUG
+	~AudioOutputControl() noexcept;
-	~AudioOutputControl() noexcept {
-		assert(!fail_timer.IsDefined());
-		assert(!thread.IsDefined());
-		assert(output == nullptr);
-		assert(!open);
-	}
-#endif
 
 	AudioOutputControl(const AudioOutputControl &) = delete;
 	AudioOutputControl &operator=(const AudioOutputControl &) = delete;

src/output/Filtered.hxx

@@ -239,7 +239,7 @@ extern struct notify audio_output_client_notify;
 /**
  * Throws #std::runtime_error on error.
  */
-FilteredAudioOutput *
+std::unique_ptr<FilteredAudioOutput>
 audio_output_new(EventLoop &event_loop,
 		 const ReplayGainConfig &replay_gain_config,
 		 const ConfigBlock &block,

src/output/Init.cxx

@@ -259,7 +259,7 @@ FilteredAudioOutput::Setup(EventLoop &event_loop,
 			    convert_filter.Set(convert_filter_prepare()));
 }
 
-FilteredAudioOutput *
+std::unique_ptr<FilteredAudioOutput>
 audio_output_new(EventLoop &event_loop,
 		 const ReplayGainConfig &replay_gain_config,
 		 const ConfigBlock &block,
@@ -292,16 +292,10 @@ audio_output_new(EventLoop &event_loop,
 						       block));
 	assert(ao != nullptr);
 
-	auto *f = new FilteredAudioOutput(plugin->name, std::move(ao), block);
+	auto f = std::make_unique<FilteredAudioOutput>(plugin->name,
-
+						       std::move(ao), block);
-	try {
+	f->Setup(event_loop, replay_gain_config,
-		f->Setup(event_loop, replay_gain_config,
+		 plugin->mixer_plugin,
-			 plugin->mixer_plugin,
+		 mixer_listener, block);
-			 mixer_listener, block);
-	} catch (...) {
-		delete f;
-		throw;
-	}
-
 	return f;
 }

src/output/MultipleOutputs.cxx

@@ -51,7 +51,7 @@ MultipleOutputs::~MultipleOutputs() noexcept
 		delete i;
 }
 
-static FilteredAudioOutput *
+static std::unique_ptr<FilteredAudioOutput>
 LoadOutput(EventLoop &event_loop,
 	   const ReplayGainConfig &replay_gain_config,
 	   MixerListener &mixer_listener,
@@ -73,10 +73,10 @@ LoadOutputControl(EventLoop &event_loop,
 		  MixerListener &mixer_listener,
 		  AudioOutputClient &client, const ConfigBlock &block)
 {
-	auto *output = LoadOutput(event_loop, replay_gain_config,
+	auto output = LoadOutput(event_loop, replay_gain_config,
-				  mixer_listener,
+				 mixer_listener,
-				  block);
+				 block);
-	auto *control = new AudioOutputControl(output, client);
+	auto *control = new AudioOutputControl(std::move(output), client);
 
 	try {
 		control->Configure(block);