aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-09 10:04:42 +0200
committerMax Kellermann <max@duempel.org>2008-09-09 10:04:42 +0200
commit7f1cccb3ea2c94d27b1964530405c953d474bfd0 (patch)
tree85e9b51210a70e686b5c689fd13ac72707bf4f8b /src/output_control.c
parentf9316fbbbef04206be703ff3e7a2e175a958bff3 (diff)
downloadmpd-7f1cccb3ea2c94d27b1964530405c953d474bfd0.tar.gz
mpd-7f1cccb3ea2c94d27b1964530405c953d474bfd0.tar.xz
mpd-7f1cccb3ea2c94d27b1964530405c953d474bfd0.zip
audio: replaced copyAudioFormat() with simple assignment
The "!src" check in copyAudioFormat() used to hide bugs - one should never pass NULL to it. There is one caller which might pass NULL, add a check in this caller. Instead of doing mempcy(), we can simply assign the structures, which looks more natural.
Diffstat (limited to 'src/output_control.c')
-rw-r--r--src/output_control.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/output_control.c b/src/output_control.c
index 8a5e14e00..3459a9047 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -32,14 +32,12 @@ int audio_output_open(struct audio_output *audioOutput,
return 0;
}
- copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
+ audioOutput->inAudioFormat = *audioFormat;
if (audioOutput->convertAudioFormat) {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->reqAudioFormat);
+ audioOutput->outAudioFormat = audioOutput->reqAudioFormat;
} else {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->inAudioFormat);
+ audioOutput->outAudioFormat = audioOutput->inAudioFormat;
if (audioOutput->open)
audio_output_close(audioOutput);
}