[ros-diffs] [janderwald] 50796: - Fix kmixer linking

[janderwald]

Author: janderwald
Date: Fri Feb 18 12:09:10 2011
New Revision: 50796

URL: http://svn.reactos.org/svn/reactos?rev=50796&view=rev
Log:
- Fix kmixer linking

Modified:
    branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/libsamplerate/src_linear.c

Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt?rev=50796&r1=50795&r2=50796&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt 
[iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt 
[iso-8859-1] Fri Feb 18 12:09:10 2011
@@ -6,3 +6,4 @@
     src_zoh.c)
 
 add_library(libsamplerate ${SOURCE})
+add_dependencies(libsamplerate psdk)

Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/src_linear.c
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libsamplerate/src_linear.c?rev=50796&r1=50795&r2=50796&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] 
(original)
+++ branches/cmake-bringup/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] 
Fri Feb 18 12:09:10 2011
@@ -30,6 +30,9 @@
 #include "float_cast.h"
 #include "common.h"
 
+#include <windows.h>
+#include <debug.h>
+
 static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ;
 static void linear_reset (SRC_PRIVATE *psrc) ;
 
@@ -107,8 +110,8 @@
                        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++)