From 7f1cccb3ea2c94d27b1964530405c953d474bfd0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 9 Sep 2008 10:04:42 +0200 Subject: 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. --- src/output_control.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/output_control.c') diff --git a/src/output_control.c b/src/output_control.c index 8a5e14e0..3459a904 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); } -- cgit v1.2.3