aboutsummaryrefslogtreecommitdiffstats
path: root/src/OutputInternal.hxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/OutputInternal.hxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/OutputInternal.hxx b/src/OutputInternal.hxx
index c07cdf856..ab1c1242e 100644
--- a/src/OutputInternal.hxx
+++ b/src/OutputInternal.hxx
@@ -22,18 +22,17 @@
#include "AudioFormat.hxx"
#include "pcm/PcmBuffer.hxx"
+#include "pcm/PcmDither.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "thread/Thread.hxx"
-
-#include <time.h>
+#include "system/PeriodClock.hxx"
class Error;
class Filter;
class MusicPipe;
struct config_param;
struct PlayerControl;
-typedef struct _GTimer GTimer;
enum audio_output_command {
AO_COMMAND_NONE = 0,
@@ -147,7 +146,7 @@ struct audio_output {
* to estimate how long it should stay disabled (unless
* explicitly reopened with "play").
*/
- GTimer *fail_timer;
+ PeriodClock fail_timer;
/**
* The configured audio format.
@@ -174,6 +173,11 @@ struct audio_output {
PcmBuffer cross_fade_buffer;
/**
+ * The dithering state for cross-fading two streams.
+ */
+ PcmDither cross_fade_dither;
+
+ /**
* The filter object of this audio output. This is an
* instance of chain_filter_plugin.
*/