From 13ad2b4dc2a11ab7bad3703cdca050dd55243b6b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 20 Oct 2011 02:25:40 +0200 Subject: pcm_mix: return bool, make unimplemented format non-fatal Let the caller deal with a failure. --- src/pcm_mix.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/pcm_mix.h') diff --git a/src/pcm_mix.h b/src/pcm_mix.h index 10a07168f..0e58d01ee 100644 --- a/src/pcm_mix.h +++ b/src/pcm_mix.h @@ -22,6 +22,7 @@ #include "audio_format.h" +#include #include /* @@ -37,8 +38,11 @@ * @param portion1 a number between 0.0 and 1.0 specifying the portion * of the first buffer in the mix; portion2 = (1.0 - portion1). The value * NaN is used by the MixRamp code to specify that simple addition is required. + * + * @return true on success, false if the format is not supported */ -void +G_GNUC_WARN_UNUSED_RESULT +bool pcm_mix(void *buffer1, const void *buffer2, size_t size, enum sample_format format, float portion1); -- cgit v1.2.3