aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-10-20 17:25:36 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-10-20 17:25:36 +0000
commitc2455ec0cace7b767c752e076c1e84d66fee07dc (patch)
treeb842e6603a1c6050a3d59e2fa792efea060f82ea /src
parentfd2ae556a241c40974ad34eb18556adc0f2f5977 (diff)
downloadmpd-c2455ec0cace7b767c752e076c1e84d66fee07dc.tar.gz
mpd-c2455ec0cace7b767c752e076c1e84d66fee07dc.tar.xz
mpd-c2455ec0cace7b767c752e076c1e84d66fee07dc.zip
oops, accidently broke crossfading, fixed now
git-svn-id: https://svn.musicpd.org/mpd/trunk@2281 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audio.c1
-rw-r--r--src/audioOutput_ao.c2
2 files changed, 2 insertions, 1 deletions
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;
}