4 files changed, 3 insertions, 72 deletions
diff --git a/libk3b/plugin/libsamplerate/Makefile.am b/libk3b/plugin/libsamplerate/Makefile.am
deleted file mode 100644
index 3154ce2..0000000
--- a/libk3b/plugin/libsamplerate/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was automatically generated from the Makefile.am
-# DO NOT EDIT!
-
-noinst_LTLIBRARIES = libsamplerate.la
-#include_HEADERS = samplerate.h
-
-EXTRA_DIST = config.h.in Version_script.in
-
-COEFF_HDRS = high_qual_coeffs.h mid_qual_coeffs.h fastest_coeffs.h
-
-noinst_HEADERS = common.h float_cast.h $(COEFF_HDRS)
-
-SRC_SOURCES = samplerate.c src_sinc.c src_zoh.c src_linear.c
-				
-libsamplerate_la_SOURCES = $(SRC_SOURCES)
-#libsamplerate_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
-libsamplerate_la_LIBADD  = -lm
-
-# Disable autoheader. 
-#AUTOHEADER=echo
diff --git a/libk3b/plugin/libsamplerate/configure.in.in b/libk3b/plugin/libsamplerate/configure.in.in
deleted file mode 100644
index 06a8f55..0000000
--- a/libk3b/plugin/libsamplerate/configure.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-LIBS="-lm $all_libraries"
-
-AC_CHECK_DECL(lrint,
-          AC_DEFINE(HAVE_LRINT,1,[Define if lrint is supported]),
-          AC_DEFINE(HAVE_LRINT,0,[Define if lrint is not supported]),
-          [#include <math.h>]
-)
-
-AC_CHECK_DECL(lrintf,
-          AC_DEFINE(HAVE_LRINTF,1,[Define if lrintf is supported]),
-          AC_DEFINE(HAVE_LRINTF,0,[Define if lrintf is not supported]),
-          [#include <math.h>]
-)
diff --git a/libk3b/plugin/libsamplerate/float_cast.h b/libk3b/plugin/libsamplerate/float_cast.h
index af362e3..533b837 100644
--- a/libk3b/plugin/libsamplerate/float_cast.h
+++ b/libk3b/plugin/libsamplerate/float_cast.h
@@ -106,42 +106,6 @@
 		return intgr ;
 	}
 
-#elif (defined (__MWERKS__) && defined (macintosh))
-
-	/* This MacOS 9 solution was provided by Stephane Letz */
-
-	#undef   HAVE_LRINT_REPLACEMENT
-	#define  HAVE_LRINT_REPLACEMENT 1
-	#include   <math.h>
-
-	#undef	lrint
-	#undef	lrintf
-
-	#define	lrint   double2int
-	#define	lrintf  float2int
-
-	inline int
-	float2int (register float in)
-	{	long res [2] ;
-
-		asm
-		{	fctiw	in,in
-		  	stfd	 in,res
-	  	}
-		return res [1] ;
-	} /* float2int */
-
-	inline int
-	double2int (register double in)
-	{	long res [2] ;
-
-		asm
-		{	fctiw	in,in
-			stfd	 in,res
-	  	}
-		return res [1] ;
-	} /* double2int */
-
 #elif (defined (__MACH__) && defined (__APPLE__))
 
 	/* For Apple MacOSX. */
@@ -157,7 +121,7 @@
 	#define lrintf	float2int
 
 	inline static long int
-	float2int (register float in)
+	float2int (float in)
 	{	int res [2] ;
 
 		__asm__ __volatile__
@@ -172,7 +136,7 @@
 	} /* lrintf */
 
 	inline static long int
-	double2int (register double in)
+	double2int (double in)
 	{	int res [2] ;
 
 		__asm__ __volatile__
diff --git a/libk3b/plugin/libsamplerate/samplerate.h b/libk3b/plugin/libsamplerate/samplerate.h
index dfc4448..e345d85 100644
--- a/libk3b/plugin/libsamplerate/samplerate.h
+++ b/libk3b/plugin/libsamplerate/samplerate.h
@@ -99,7 +99,7 @@ int src_set_ratio (SRC_STATE *state, double new_ratio) ;
 int src_reset (SRC_STATE *state) ;
 
 /*
-** Return TRUE if ratio is a valid conversion ratio, FALSE
+** Return true if ratio is a valid conversion ratio, false
 ** otherwise.
 */