aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2011-07-25 21:55:43 +0200
committerMax Kellermann <max@duempel.org>2011-08-27 11:30:34 +0200
commit310895f0606ebe1f88e20755f221c51cc66a63df (patch)
tree1e3c4727d39cc9dc889780511b7d7d365038ea63 /src/output
parent4428894abaa4d40c443cabbf6c1eb467d6f55791 (diff)
downloadmpd-310895f0606ebe1f88e20755f221c51cc66a63df.tar.gz
mpd-310895f0606ebe1f88e20755f221c51cc66a63df.tar.xz
mpd-310895f0606ebe1f88e20755f221c51cc66a63df.zip
rename 'Timer' to 'struct timer'
Diffstat (limited to 'src/output')
-rw-r--r--src/output/fifo_output_plugin.c2
-rw-r--r--src/output/httpd_internal.h4
-rw-r--r--src/output/null_plugin.c4
-rw-r--r--src/output/openal_plugin.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/output/fifo_output_plugin.c b/src/output/fifo_output_plugin.c
index 3ecc16e3e..8f2234dd7 100644
--- a/src/output/fifo_output_plugin.c
+++ b/src/output/fifo_output_plugin.c
@@ -42,7 +42,7 @@ struct fifo_data {
int input;
int output;
bool created;
- Timer *timer;
+ struct timer *timer;
};
/**
diff --git a/src/output/httpd_internal.h b/src/output/httpd_internal.h
index 67396b667..3e6e9768d 100644
--- a/src/output/httpd_internal.h
+++ b/src/output/httpd_internal.h
@@ -65,10 +65,10 @@ struct httpd_output {
GMutex *mutex;
/**
- * A #Timer object to synchronize this output with the
+ * A #timer object to synchronize this output with the
* wallclock.
*/
- Timer *timer;
+ struct timer *timer;
/**
* The listener socket.
diff --git a/src/output/null_plugin.c b/src/output/null_plugin.c
index 5ccb1c00d..f572959a0 100644
--- a/src/output/null_plugin.c
+++ b/src/output/null_plugin.c
@@ -28,7 +28,7 @@
struct null_data {
bool sync;
- Timer *timer;
+ struct timer *timer;
};
static void *
@@ -82,7 +82,7 @@ null_play(void *data, G_GNUC_UNUSED const void *chunk, size_t size,
G_GNUC_UNUSED GError **error)
{
struct null_data *nd = data;
- Timer *timer = nd->timer;
+ struct timer *timer = nd->timer;
if (!nd->sync)
return size;
diff --git a/src/output/openal_plugin.c b/src/output/openal_plugin.c
index 45a9a30ad..23641c6c5 100644
--- a/src/output/openal_plugin.c
+++ b/src/output/openal_plugin.c
@@ -41,7 +41,7 @@ struct openal_data {
const char *device_name;
ALCdevice *device;
ALCcontext *context;
- Timer *timer;
+ struct timer *timer;
ALuint buffers[NUM_BUFFERS];
int filled;
ALuint source;