aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_thread.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/player_thread.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/player_thread.c')
-rw-r--r--src/player_thread.c1
1 files changed, 1 insertions, 0 deletions
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) {