diff options
| -rw-r--r-- | src/audio_format.c | 19 | ||||
| -rw-r--r-- | src/audio_format.h | 19 |
2 files changed, 21 insertions, 17 deletions
diff --git a/src/audio_format.c b/src/audio_format.c index 799e0dd8..458ec3b1 100644 --- a/src/audio_format.c +++ b/src/audio_format.c @@ -28,6 +28,25 @@ #define REVERSE_ENDIAN_SUFFIX "_be" #endif +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 char * sample_format_to_string(enum sample_format format) { diff --git a/src/audio_format.h b/src/audio_format.h index 8c2906d5..43bfe2d6 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 |