crossfade: don't use isCurrentAudioFormat()

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);

src/crossfade.h

@@ -25,6 +25,7 @@ struct music_chunk;
 
 unsigned cross_fade_calc(float duration, float total_time,
 			 const struct audio_format *af,
+			 const struct audio_format *old_format,
 			 unsigned max_chunks);
 
 void cross_fade_apply(struct music_chunk *a, const struct music_chunk *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) {