From fb71d3a960348e23fd295a2304d961e1388c8b10 Mon Sep 17 00:00:00 2001 From: beveloper Date: Wed, 4 Jun 2003 00:53:15 +0000 Subject: [PATCH] fixed copy&paste errors git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3421 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/media-add-ons/mixer/Resampler.cpp | 19 ++++++++++--------- .../media/media-add-ons/mixer/Resampler.h | 2 -- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/add-ons/media/media-add-ons/mixer/Resampler.cpp b/src/add-ons/media/media-add-ons/mixer/Resampler.cpp index bd061683b1..3e7043f9e1 100644 --- a/src/add-ons/media/media-add-ons/mixer/Resampler.cpp +++ b/src/add-ons/media/media-add-ons/mixer/Resampler.cpp @@ -9,6 +9,7 @@ * */ +#include #include "Resampler.h" #include "debug.h" @@ -91,7 +92,7 @@ Resampler::float_to_float(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -142,7 +143,7 @@ Resampler::int32_to_float(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -193,7 +194,7 @@ Resampler::int16_to_float(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -244,7 +245,7 @@ Resampler::int8_to_float(const void *_src, int32 src_sample_offset, int32 src_sa return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -295,7 +296,7 @@ Resampler::uint8_to_float(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -352,7 +353,7 @@ Resampler::float_to_int32(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -421,7 +422,7 @@ Resampler::float_to_int16(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -490,7 +491,7 @@ Resampler::float_to_int8(const void *_src, int32 src_sample_offset, int32 src_sa return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { @@ -559,7 +560,7 @@ Resampler::float_to_uint8(const void *_src, int32 src_sample_offset, int32 src_s return; } - register float delta = float(src_sample_count) / float(dst_sample_offset); + register float delta = float(src_sample_count) / float(dst_sample_count); register float current = 0.0f; if (delta < 1.0) { diff --git a/src/add-ons/media/media-add-ons/mixer/Resampler.h b/src/add-ons/media/media-add-ons/mixer/Resampler.h index 83dda8cbdd..84a55b0868 100644 --- a/src/add-ons/media/media-add-ons/mixer/Resampler.h +++ b/src/add-ons/media/media-add-ons/mixer/Resampler.h @@ -12,8 +12,6 @@ * */ -#include - class Resampler { public: