From 0970afe8cfe12e07d29cfbf8105d34f06d145028 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Fri, 18 Feb 2011 12:09:10 +0000 Subject: [PATCH] - Fix kmixer linking svn path=/branches/cmake-bringup/; revision=50796 --- lib/3rdparty/libsamplerate/CMakeLists.txt | 1 + lib/3rdparty/libsamplerate/src_linear.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/3rdparty/libsamplerate/CMakeLists.txt b/lib/3rdparty/libsamplerate/CMakeLists.txt index 4c78e3218af..d1864e1f763 100644 --- a/lib/3rdparty/libsamplerate/CMakeLists.txt +++ b/lib/3rdparty/libsamplerate/CMakeLists.txt @@ -6,3 +6,4 @@ list(APPEND SOURCE src_zoh.c) add_library(libsamplerate ${SOURCE}) +add_dependencies(libsamplerate psdk) \ No newline at end of file diff --git a/lib/3rdparty/libsamplerate/src_linear.c b/lib/3rdparty/libsamplerate/src_linear.c index f97ba45db22..ab483bc4450 100644 --- a/lib/3rdparty/libsamplerate/src_linear.c +++ b/lib/3rdparty/libsamplerate/src_linear.c @@ -30,6 +30,9 @@ #include "float_cast.h" #include "common.h" +#include +#include + static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; @@ -107,8 +110,8 @@ linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) src_ratio = psrc->last_ratio + priv->out_gen * (data->src_ratio - psrc->last_ratio) / priv->out_count ; if (SRC_DEBUG && priv->in_used < priv->channels && input_index < 1.0) - { printf ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; - exit (1) ; + { DPRINT1 ("Whoops!!!! in_used : %ld channels : %d input_index : %f\n", priv->in_used, priv->channels, input_index) ; + ASSERT (0) ; } ; for (ch = 0 ; ch < priv->channels ; ch++)