From 1fb3fbb4de11984c708b4b6355b172cda2b94d43 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 10 Oct 2011 09:06:28 +0200 Subject: audio_format: un-inline audio_format_mask_apply() This function is not critical for performance, and the inline expansion looks too expensive. --- src/audio_format.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/audio_format.h') diff --git a/src/audio_format.h b/src/audio_format.h index 8c2906d5f..43bfe2d6a 100644 --- a/src/audio_format.h +++ b/src/audio_format.h @@ -221,24 +221,9 @@ static inline bool audio_format_equals(const struct audio_format *a, a->reverse_endian == b->reverse_endian; } -static inline void +void audio_format_mask_apply(struct audio_format *af, - const struct audio_format *mask) -{ - assert(audio_format_valid(af)); - assert(audio_format_mask_valid(mask)); - - if (mask->sample_rate != 0) - af->sample_rate = mask->sample_rate; - - if (mask->format != SAMPLE_FORMAT_UNDEFINED) - af->format = mask->format; - - if (mask->channels != 0) - af->channels = mask->channels; - - assert(audio_format_valid(af)); -} + const struct audio_format *mask); G_GNUC_CONST static inline unsigned -- cgit v1.2.3