aboutsummaryrefslogtreecommitdiffstats
path: root/src/audio.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-07 22:41:22 +0200
committerMax Kellermann <max@duempel.org>2008-09-07 22:41:22 +0200
commit3b09c54b6769c7e0c8152dde2850a88f51e2f3d9 (patch)
tree30f28b2bfb230ce6674a08231ead1d3eac032164 /src/audio.c
parentbed2a49fe97b8f070ace2dd37909bb06540c66bd (diff)
downloadmpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.tar.gz
mpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.tar.xz
mpd-3b09c54b6769c7e0c8152dde2850a88f51e2f3d9.zip
output: renamed typedef AudioOutput to struct audio_output
Also rename AudioOutputPlugin to struct audio_output_plugin, and use forward declarations to reduce include dependencies.
Diffstat (limited to 'src/audio.c')
-rw-r--r--src/audio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/audio.c b/src/audio.c
index 0650f364c..b6242b425 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -19,6 +19,7 @@
#include "audio.h"
#include "audio_format.h"
#include "audioOutput.h"
+#include "output_api.h"
#include "log.h"
#include "path.h"
#include "client.h"
@@ -33,7 +34,7 @@ static struct audio_format audio_format;
static struct audio_format *audio_configFormat;
-static AudioOutput *audioOutputArray;
+static struct audio_output *audioOutputArray;
static unsigned int audioOutputArraySize;
enum ad_state {
@@ -107,11 +108,11 @@ void initAudioDriver(void)
audioOutputArraySize = audio_output_count();
audioDeviceStates = xmalloc(sizeof(enum ad_state) *
audioOutputArraySize);
- audioOutputArray = xmalloc(sizeof(AudioOutput) * audioOutputArraySize);
+ audioOutputArray = xmalloc(sizeof(struct audio_output) * audioOutputArraySize);
for (i = 0; i < audioOutputArraySize; i++)
{
- AudioOutput *output = &audioOutputArray[i];
+ struct audio_output *output = &audioOutputArray[i];
unsigned int j;
param = getNextConfigParam(CONF_AUDIO_OUTPUT, param);
@@ -266,7 +267,7 @@ int isCurrentAudioFormat(const struct audio_format *audioFormat)
static void syncAudioDeviceStates(void)
{
- AudioOutput *audioOutput;
+ struct audio_output *audioOutput;
unsigned int i;
if (!audio_format.channels)