From 2a388c2aa7c414b525c95de9b81a837b8da54ea7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 10 Feb 2009 18:51:29 +0100 Subject: 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(). --- src/player_thread.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/player_thread.c') diff --git a/src/player_thread.c b/src/player_thread.c index b1b08c52d..239fbab2d 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -403,6 +403,7 @@ static void do_play(void) crossFadeChunks = cross_fade_calc(pc.cross_fade_seconds, dc.total_time, &dc.out_audio_format, + &play_audio_format, music_pipe_size() - pc.buffered_before_play); if (crossFadeChunks > 0) { -- cgit v1.2.3