summaryrefslogtreecommitdiffstats
path: root/polyp/sample-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-01-10 17:51:06 +0000
committerLennart Poettering <lennart@poettering.net>2006-01-10 17:51:06 +0000
commitf7a99e90470526bb28cc0c225f96490110094aed (patch)
treecbcc4f2df6d66e180fd65ee50488545786d094f1 /polyp/sample-util.c
parent80ae72ce45dbc23ddc360749924110dcc752491e (diff)
Merge Pierre's changes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/sample-util.c')
-rw-r--r--polyp/sample-util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/polyp/sample-util.c b/polyp/sample-util.c
index d521afe4..bf8be34e 100644
--- a/polyp/sample-util.c
+++ b/polyp/sample-util.c
@@ -161,7 +161,7 @@ size_t pa_mix(struct pa_mix_info channels[], unsigned nchannels, void *data, siz
size_t d;
for (d = 0;; d += sizeof(float)) {
- float_t sum = 0;
+ pa_volume_t sum = 0;
unsigned c;
if (d >= length)