1 files changed, 7 insertions, 18 deletions

diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 27f280231..bcfd6a8c1 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -24,18 +24,13 @@
 #include "OutputInternal.hxx"
 #include "OutputPlugin.hxx"
 #include "OutputError.hxx"
-#include "MixerPlugin.hxx"
 #include "MixerControl.hxx"
 #include "notify.hxx"
 #include "filter/ReplayGainFilterPlugin.hxx"
-#include "FilterPlugin.hxx"
 #include "util/Error.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
 #include <assert.h>
-#include <stdlib.h>
 
 /** after a failure, wait this number of seconds before
     automatically reopening the device */
@@ -154,10 +149,7 @@ audio_output_open(struct audio_output *ao,
 	assert(ao->allow_play);
 	assert(audio_format.IsValid());
 
-	if (ao->fail_timer != nullptr) {
-		g_timer_destroy(ao->fail_timer);
-		ao->fail_timer = nullptr;
-	}
+	ao->fail_timer.Reset();
 
 	if (ao->open && audio_format == ao->in_audio_format) {
 		assert(ao->pipe == &mp ||
@@ -215,14 +207,12 @@ audio_output_close_locked(struct audio_output *ao)
 	if (ao->mixer != nullptr)
 		mixer_auto_close(ao->mixer);
 
-	assert(!ao->open || ao->fail_timer == nullptr);
+	assert(!ao->open || !ao->fail_timer.IsDefined());
 
 	if (ao->open)
 		ao_command(ao, AO_COMMAND_CLOSE);
-	else if (ao->fail_timer != nullptr) {
-		g_timer_destroy(ao->fail_timer);
-		ao->fail_timer = nullptr;
-	}
+	else
+		ao->fail_timer.Reset();
 }
 
 bool
@@ -233,8 +223,7 @@ audio_output_update(struct audio_output *ao,
 	const ScopeLock protect(ao->mutex);
 
 	if (ao->enabled && ao->really_enabled) {
-		if (ao->fail_timer == nullptr ||
-		    g_timer_elapsed(ao->fail_timer, nullptr) > REOPEN_AFTER) {
+		if (ao->fail_timer.Check(REOPEN_AFTER * 1000)) {
 			return audio_output_open(ao, audio_format, mp);
 		}
 	} else if (audio_output_is_open(ao))
@@ -314,7 +303,7 @@ audio_output_release(struct audio_output *ao)
 void audio_output_close(struct audio_output *ao)
 {
 	assert(ao != nullptr);
-	assert(!ao->open || ao->fail_timer == nullptr);
+	assert(!ao->open || !ao->fail_timer.IsDefined());
 
 	const ScopeLock protect(ao->mutex);
 	audio_output_close_locked(ao);
@@ -324,7 +313,7 @@ void audio_output_finish(struct audio_output *ao)
 {
 	audio_output_close(ao);
 
-	assert(ao->fail_timer == nullptr);
+	assert(!ao->fail_timer.IsDefined());
 
 	if (ao->thread.IsDefined()) {
 		assert(ao->allow_play);