1 files changed, 12 insertions, 34 deletions

diff --git a/src/pcm/PcmUtils.hxx b/src/pcm/PcmUtils.hxx
index febe12d7b..9c741e55b 100644
--- a/src/pcm/PcmUtils.hxx
+++ b/src/pcm/PcmUtils.hxx
@@ -26,53 +26,31 @@
 
 #include <stdint.h>
 
-/**
- * Add a byte count to the specified pointer.  This is a utility
- * function to convert a source pointer and a byte count to an "end"
- * pointer for use in loops.
- */
-template<typename T>
-static inline const T *
-pcm_end_pointer(const T *p, size_t size)
-{
-	return (const T *)((const uint8_t *)p + size);
-}
+enum class SampleFormat : uint8_t;
+template<SampleFormat F> struct SampleTraits;
 
 /**
  * Check if the value is within the range of the provided bit size,
  * and caps it if necessary.
  */
-template<typename T, typename U, unsigned bits>
+template<SampleFormat F, class Traits=SampleTraits<F>>
 gcc_const
-static inline T
-PcmClamp(U x)
+static inline typename Traits::value_type
+PcmClamp(typename Traits::long_type x)
 {
-	constexpr U MIN_VALUE = -(U(1) << (bits - 1));
-	constexpr U MAX_VALUE = (U(1) << (bits - 1)) - 1;
+	typedef typename Traits::value_type T;
 
 	typedef std::numeric_limits<T> limits;
-	static_assert(MIN_VALUE >= limits::min(), "out of range");
-	static_assert(MAX_VALUE <= limits::max(), "out of range");
+	static_assert(Traits::MIN >= limits::min(), "out of range");
+	static_assert(Traits::MAX <= limits::max(), "out of range");
 
-	if (gcc_unlikely(x < MIN_VALUE))
-		return T(MIN_VALUE);
+	if (gcc_unlikely(x < Traits::MIN))
+		return T(Traits::MIN);
 
-	if (gcc_unlikely(x > MAX_VALUE))
-		return T(MAX_VALUE);
+	if (gcc_unlikely(x > Traits::MAX))
+		return T(Traits::MAX);
 
 	return T(x);
 }
 
-/**
- * Check if the values in this buffer are within the range of the
- * provided bit size, and clamps them whenever necessary.
- */
-template<typename T, typename U, unsigned bits>
-static inline void
-PcmClampN(T *dest, const U *src, unsigned n)
-{
-	while (n-- > 0)
-		*dest++ = PcmClamp<T, U, bits>(*src++);
-}
-
 #endif