aboutsummaryrefslogtreecommitdiffstats
path: root/src/crossfade.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-10 18:51:29 +0100
committerMax Kellermann <max@duempel.org>2009-02-10 18:51:29 +0100
commit2a388c2aa7c414b525c95de9b81a837b8da54ea7 (patch)
treef72d9ba3912087f60b2abdfbb372b9cf549fbeb8 /src/crossfade.c
parent34244398d01b4182558f45c6363be62d37c29b50 (diff)
downloadmpd-2a388c2aa7c414b525c95de9b81a837b8da54ea7.tar.gz
mpd-2a388c2aa7c414b525c95de9b81a837b8da54ea7.tar.xz
mpd-2a388c2aa7c414b525c95de9b81a837b8da54ea7.zip
crossfade: don't use isCurrentAudioFormat()
The crossfading code shouldn't depend on the audio output code. Pass the current audio format to cross_fade_calc() and let it compare directly, instead of using isCurrentAudioFormat().
Diffstat (limited to 'src/crossfade.c')
-rw-r--r--src/crossfade.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/crossfade.c b/src/crossfade.c
index a21b05fa2..fb3515fc4 100644
--- a/src/crossfade.c
+++ b/src/crossfade.c
@@ -18,7 +18,6 @@
*/
#include "crossfade.h"
-#include "audio.h"
#include "pcm_mix.h"
#include "pipe.h"
#include "audio_format.h"
@@ -29,12 +28,14 @@
unsigned cross_fade_calc(float duration, float total_time,
const struct audio_format *af,
+ const struct audio_format *old_format,
unsigned max_chunks)
{
unsigned int chunks;
if (duration <= 0 || duration >= total_time ||
- !isCurrentAudioFormat(af))
+ /* we can't crossfade when the audio formats are different */
+ !audio_format_equals(af, old_format))
return 0;
assert(duration > 0);