aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-09 10:05:15 +0200
committerMax Kellermann <max@duempel.org>2008-09-09 10:05:15 +0200
commitbe9212ba84a43a1c7ce4c4dcf179bb9ef08929f7 (patch)
treebf06342ae83b5b2b960b6e9a1776c8c952ed1b8b /src/output_control.c
parent7f1cccb3ea2c94d27b1964530405c953d474bfd0 (diff)
downloadmpd-be9212ba84a43a1c7ce4c4dcf179bb9ef08929f7.tar.gz
mpd-be9212ba84a43a1c7ce4c4dcf179bb9ef08929f7.tar.xz
mpd-be9212ba84a43a1c7ce4c4dcf179bb9ef08929f7.zip
audio: moved cmpAudioFormat() to audio_format.h
Rename it to audio_format_equals() and return "true" if they are equal.
Diffstat (limited to 'src/output_control.c')
-rw-r--r--src/output_control.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/output_control.c b/src/output_control.c
index 3459a9047..df330ee21 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -20,7 +20,6 @@
#include "output_api.h"
#include "pcm_utils.h"
#include "utils.h"
-#include "audio.h"
int audio_output_open(struct audio_output *audioOutput,
const struct audio_format *audioFormat)
@@ -28,7 +27,7 @@ int audio_output_open(struct audio_output *audioOutput,
int ret = 0;
if (audioOutput->open &&
- 0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
+ audio_format_equals(audioFormat, &audioOutput->inAudioFormat)) {
return 0;
}
@@ -46,8 +45,8 @@ int audio_output_open(struct audio_output *audioOutput,
ret = audioOutput->plugin->open(audioOutput);
audioOutput->sameInAndOutFormats =
- !cmpAudioFormat(&audioOutput->inAudioFormat,
- &audioOutput->outAudioFormat);
+ audio_format_equals(&audioOutput->inAudioFormat,
+ &audioOutput->outAudioFormat);
return ret;
}