this really fixes pause
git-svn-id: https://svn.musicpd.org/mpd/trunk@2294 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
d171fe9a2f
commit
d021f6b042
@ -35,6 +35,8 @@ static AudioOutput * aoOutput = NULL;
|
||||
static AudioOutput * shoutOutput = NULL;
|
||||
|
||||
static void copyAudioFormat(AudioFormat * dest, AudioFormat * src) {
|
||||
if(!src) return;
|
||||
|
||||
dest->sampleRate = src->sampleRate;
|
||||
dest->bits = src->bits;
|
||||
dest->channels = src->channels;
|
||||
@ -150,10 +152,9 @@ int isCurrentAudioFormat(AudioFormat * audioFormat) {
|
||||
|
||||
int openAudioDevice(AudioFormat * audioFormat) {
|
||||
if(!aoOutput->open || !isCurrentAudioFormat(audioFormat)) {
|
||||
if(!audioFormat) return -1;
|
||||
copyAudioFormat(&audio_format, audioFormat);
|
||||
if(shoutOutput) openAudioOutput(shoutOutput, audioFormat);
|
||||
return openAudioOutput(aoOutput, audioFormat);
|
||||
if(audioFormat) copyAudioFormat(&audio_format, audioFormat);
|
||||
if(shoutOutput) openAudioOutput(shoutOutput, &audio_format);
|
||||
return openAudioOutput(aoOutput, &audio_format);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user