diff options
author | Paul Adenot <[email protected]> | 2016-03-24 16:42:27 +0100 |
---|---|---|
committer | Paul Adenot <[email protected]> | 2016-03-24 16:45:18 +0100 |
commit | a820f6bf5bb7f0e27d00d2388a074e575c6f3319 (patch) | |
tree | 5afea1bedb28e212d6370b476bc07aec970acaa3 | |
parent | 80356a005db1a5a6cf01fd76f8f337f6b4119997 (diff) | |
download | cubeb-a820f6bf5bb7f0e27d00d2388a074e575c6f3319.tar.gz cubeb-a820f6bf5bb7f0e27d00d2388a074e575c6f3319.zip |
Fix warning in cubeb_resampler.cpp by adding parenthesis.
-rw-r--r-- | src/cubeb_resampler.cpp | 8 | ||||
-rw-r--r-- | src/cubeb_resampler_internal.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cubeb_resampler.cpp b/src/cubeb_resampler.cpp index 378d729..215749d 100644 --- a/src/cubeb_resampler.cpp +++ b/src/cubeb_resampler.cpp @@ -37,10 +37,10 @@ to_speex_quality(cubeb_resampler_quality q) long noop_resampler::fill(void * input_buffer, long * input_frames_count, void * output_buffer, long output_frames) { - assert(input_buffer && output_buffer && - *input_frames_count >= output_frames || - !input_buffer && (!input_frames_count || *input_frames_count == 0) || - !output_buffer && output_frames == 0); + assert((input_buffer && output_buffer && + *input_frames_count >= output_frames) || + (!input_buffer && (!input_frames_count || *input_frames_count == 0)) || + (!output_buffer && output_frames == 0)); if (output_buffer == nullptr) { output_frames = *input_frames_count; diff --git a/src/cubeb_resampler_internal.h b/src/cubeb_resampler_internal.h index f451968..6895911 100644 --- a/src/cubeb_resampler_internal.h +++ b/src/cubeb_resampler_internal.h @@ -448,7 +448,7 @@ cubeb_resampler_create_internal(cubeb_stream * stream, std::unique_ptr<delay_line<T>> input_delay = nullptr; std::unique_ptr<delay_line<T>> output_delay = nullptr; - assert(input_params || output_params && + assert((input_params || output_params) && "need at least one valid parameter pointer."); /* All the streams we have have a sample rate that matches the target |