summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sample-util.h
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-10-02 17:24:44 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-10-02 17:24:44 +0300
commit019331d25b6af107fb8cacc3ada552e7567a64bf (patch)
treed5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/pulsecore/sample-util.h
parent587131917f9129c8347c789febb7e755dfb091de (diff)
parentafd1b6d355ef1a41cb3592485855e273a5de69c1 (diff)
Merge branch 'master' into dbus-work
Conflicts: src/daemon/daemon-conf.c
Diffstat (limited to 'src/pulsecore/sample-util.h')
-rw-r--r--src/pulsecore/sample-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h
index 34df5cf3..d0235d60 100644
--- a/src/pulsecore/sample-util.h
+++ b/src/pulsecore/sample-util.h
@@ -91,6 +91,8 @@ typedef void (*pa_do_volume_func_t) (void *samples, void *volumes, unsigned chan
pa_do_volume_func_t pa_get_volume_func(pa_sample_format_t f);
void pa_set_volume_func(pa_sample_format_t f, pa_do_volume_func_t func);
+size_t pa_convert_size(size_t size, const pa_sample_spec *from, const pa_sample_spec *to);
+
#define PA_CHANNEL_POSITION_MASK_LEFT \
(PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT) \
| PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_LEFT) \