aboutsummaryrefslogtreecommitdiffstats
path: root/src/OutputAll.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/OutputAll.cxx')
-rw-r--r--src/OutputAll.cxx11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index 36d41184a..8cbfb6e23 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -33,8 +33,6 @@
#include "ConfigOption.hxx"
#include "notify.hxx"
-#include <glib.h>
-
#include <assert.h>
#include <string.h>
@@ -110,7 +108,7 @@ audio_output_all_init(PlayerControl &pc)
Error error;
num_audio_outputs = audio_output_config_count();
- audio_outputs = g_new(struct audio_output *, num_audio_outputs);
+ audio_outputs = new audio_output *[num_audio_outputs];
const config_param empty;
@@ -160,7 +158,7 @@ audio_output_all_finish(void)
audio_output_finish(audio_outputs[i]);
}
- g_free(audio_outputs);
+ delete[] audio_outputs;
audio_outputs = nullptr;
num_audio_outputs = 0;
}
@@ -225,10 +223,7 @@ audio_output_reset_reopen(struct audio_output *ao)
{
const ScopeLock protect(ao->mutex);
- if (!ao->open && ao->fail_timer != nullptr) {
- g_timer_destroy(ao->fail_timer);
- ao->fail_timer = nullptr;
- }
+ ao->fail_timer.Reset();
}
/**