diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-10 09:06:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-10 10:13:43 +0200 |
| commit | 1fb3fbb4de11984c708b4b6355b172cda2b94d43 (patch) | |
| tree | 896c646016e179da80bad254b9d286b342f0a3e6 /src/audio_format.h | |
| parent | 2c38d19af27ad001876b606950efc0598dd067fb (diff) | |
| download | mpd-1fb3fbb4de11984c708b4b6355b172cda2b94d43.tar.gz mpd-1fb3fbb4de11984c708b4b6355b172cda2b94d43.tar.xz mpd-1fb3fbb4de11984c708b4b6355b172cda2b94d43.zip | |
audio_format: un-inline audio_format_mask_apply()
This function is not critical for performance, and the inline
expansion looks too expensive.
Diffstat (limited to 'src/audio_format.h')
| -rw-r--r-- | src/audio_format.h | 19 |
1 files changed, 2 insertions, 17 deletions
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 |