oops, accidently broke crossfading, fixed now
git-svn-id: https://svn.musicpd.org/mpd/trunk@2281 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
fd2ae556a2
commit
c2455ec0ca
@ -145,6 +145,7 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
|
|||||||
|
|
||||||
int openAudioDevice(AudioFormat * audioFormat) {
|
int openAudioDevice(AudioFormat * audioFormat) {
|
||||||
if(!aoOutput->open || !isCurrentAudioFormat(audioFormat)) {
|
if(!aoOutput->open || !isCurrentAudioFormat(audioFormat)) {
|
||||||
|
copyAudioFormat(&audio_format, audioFormat);
|
||||||
return openAudioOutput(aoOutput, audioFormat);
|
return openAudioOutput(aoOutput, audioFormat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ static int audioOutputAo_play(AudioOutput * audioOutput, char * playChunk,
|
|||||||
AoData * ad = (AoData *)audioOutput->data;
|
AoData * ad = (AoData *)audioOutput->data;
|
||||||
|
|
||||||
if(ad->device==NULL) {
|
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;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user