summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/envelope.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-12-10 15:43:58 +0800
committerLennart Poettering <lennart@poettering.net>2010-01-05 22:46:13 +0100
commit937c587e7720ee27b36fe736a2aa1cfd233270ec (patch)
tree2a27eb73a340d0175a667eba34d2b773b82df75f /src/pulsecore/envelope.c
parent6faf38313e5f313cbcfe5c78af1dd310131798d2 (diff)
fix a number of warnings
most of them were due to missing #ifdefs or wrong printf format type for [s]size_t.
Diffstat (limited to 'src/pulsecore/envelope.c')
-rw-r--r--src/pulsecore/envelope.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pulsecore/envelope.c b/src/pulsecore/envelope.c
index 0eca8115..75e189cb 100644
--- a/src/pulsecore/envelope.c
+++ b/src/pulsecore/envelope.c
@@ -597,7 +597,7 @@ void pa_envelope_apply(pa_envelope *e, pa_memchunk *chunk) {
fs = pa_frame_size(&e->sample_spec);
n = chunk->length;
- pa_log_debug("Envelop position %d applying factor %d=%f, sample spec is %d, chunk's length is %d, fs is %d\n", e->x, linear_get_int(e, v), ((float) linear_get_int(e,v))/0x10000, e->sample_spec.format, n, fs);
+ pa_log_debug("Envelop position %zu applying factor %d=%f, sample spec is %d, chunk's length is %zu, fs is %zu\n", e->x, linear_get_int(e, v), ((float) linear_get_int(e,v))/0x10000, e->sample_spec.format, n, fs);
switch (e->sample_spec.format) {
@@ -965,11 +965,10 @@ void pa_envelope_restart(pa_envelope* e) {
}
pa_bool_t pa_envelope_is_finished(pa_envelope* e) {
- pa_assert(e);
-
int v;
pa_bool_t finished;
+ pa_assert(e);
envelope_begin_read(e, &v);
finished = (e->x >= e->points[v].x[e->points[v].n_points-1]);
envelope_commit_read(e, v);
@@ -978,11 +977,10 @@ pa_bool_t pa_envelope_is_finished(pa_envelope* e) {
}
int32_t pa_envelope_length(pa_envelope *e) {
- pa_assert(e);
-
int v;
size_t size;
+ pa_assert(e);
envelope_begin_read(e, &v);
size = e->points[v].x[e->points[v].n_points-1] - e->points[v].x[0];
envelope_commit_read(e, v);