summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sample-util.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-08-20 10:56:20 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2009-08-20 11:31:04 +0200
commitf09b51198f43d79b22cb92b5223d01a7ab339d9f (patch)
tree25d2d3946a24c0d893bb28ec775a4b7486145d8f /src/pulsecore/sample-util.c
parent3cc1278dcf44c9fb93bfd2725a2f75de1958cf23 (diff)
whitespace fixes
Diffstat (limited to 'src/pulsecore/sample-util.c')
-rw-r--r--src/pulsecore/sample-util.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index 677f914a..6e97e5a9 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -752,12 +752,13 @@ void pa_volume_memchunk(
return;
}
- ptr = (uint8_t*) pa_memblock_acquire(c->memblock) + c->index;
-
do_volume = pa_get_volume_func (spec->format);
pa_assert(do_volume);
-
+
calc_volume_table[spec->format] ((void *)linear, volume);
+
+ ptr = (uint8_t*) pa_memblock_acquire(c->memblock) + c->index;
+
do_volume (ptr, (void *)linear, spec->channels, c->length);
pa_memblock_release(c->memblock);
@@ -944,12 +945,12 @@ void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const vo
for (; n > 0; n--) {
float f;
- f = *s;
+ f = *s;
*d = PA_CLAMP_UNLIKELY(f, -1.0f, 1.0f);
s = (const float*) ((const uint8_t*) s + sstr);
d = (float*) ((uint8_t*) d + dstr);
- }
+ }
} else {
pa_assert(format == PA_SAMPLE_FLOAT32RE);