From be9212ba84a43a1c7ce4c4dcf179bb9ef08929f7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 9 Sep 2008 10:05:15 +0200 Subject: audio: moved cmpAudioFormat() to audio_format.h Rename it to audio_format_equals() and return "true" if they are equal. --- src/output_control.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/output_control.c') 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; } -- cgit v1.2.3