output: copy reqAudioFormat to outAudioFormat only if not yet open

If the output device is already open, it may have modified outAudioFormat; in this case, outAudioFormat is still valid, and does not need an overwrite.

output: copy reqAudioFormat to outAudioFormat only if not yet open
85d952c5 · Max Kellermann · 420c879d · 85d952c5
Commit 85d952c5 authored Sep 11, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

output_control.c src/output_control.c +7 -1

No files found.
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -34,7 +34,13 @@ int audio_output_open(struct audio_output *audioOutput,
 	audioOutput->inAudioFormat = *audioFormat;

 	if (audio_format_defined(&audioOutput->reqAudioFormat)) {
-		audioOutput->outAudioFormat = audioOutput->reqAudioFormat;
+		/* copy reqAudioFormat to outAudioFormat only if the
+		   device is not yet open; if it is already open,
+		   plugin->open() may have modified outAudioFormat,
+		   and the value is already ok */
+		if (!audioOutput->open)
+			audioOutput->outAudioFormat =
+				audioOutput->reqAudioFormat;
 	} else {
 		audioOutput->outAudioFormat = audioOutput->inAudioFormat;
 		if (audioOutput->open)