From c2455ec0cace7b767c752e076c1e84d66fee07dc Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Wed, 20 Oct 2004 17:25:36 +0000 Subject: oops, accidently broke crossfading, fixed now git-svn-id: https://svn.musicpd.org/mpd/trunk@2281 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/audio.c | 1 + src/audioOutput_ao.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/audio.c b/src/audio.c index 446eff40e..aba275f2f 100644 --- a/src/audio.c +++ b/src/audio.c @@ -145,6 +145,7 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) { int openAudioDevice(AudioFormat * audioFormat) { if(!aoOutput->open || !isCurrentAudioFormat(audioFormat)) { + copyAudioFormat(&audio_format, audioFormat); return openAudioOutput(aoOutput, audioFormat); } diff --git a/src/audioOutput_ao.c b/src/audioOutput_ao.c index 57b45a6fa..efba88529 100644 --- a/src/audioOutput_ao.c +++ b/src/audioOutput_ao.c @@ -190,7 +190,7 @@ static int audioOutputAo_play(AudioOutput * audioOutput, char * playChunk, AoData * ad = (AoData *)audioOutput->data; if(ad->device==NULL) { - ERROR("trying to play w/o the audio device being open!\n"); + ERROR("trying to play w/o the ao device being open!\n"); return -1; } -- cgit v1.2.3