diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-01-13 21:33:11 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-01-13 21:33:11 +0100 |
| commit | 4b1679e06d3b4ed98ed8e934db8c0fe99877a56c (patch) | |
| tree | a5acf07ac7ca5190863dc12aba3d67b8b08a0b8b /src/pulsecore | |
| parent | ba255bfc42c4637b5a541b419112b30cf21e8fb5 (diff) | |
| parent | f1d1447e104c4f609c0e8c528b56ea6afa540b95 (diff) | |
Merge remote branch 'tanuk/fixes'
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/idxset.h | 2 | ||||
| -rw-r--r-- | src/pulsecore/sink-input.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/idxset.h b/src/pulsecore/idxset.h index d1e68c5c..2d01fb47 100644 --- a/src/pulsecore/idxset.h +++ b/src/pulsecore/idxset.h @@ -65,7 +65,7 @@ int pa_idxset_put(pa_idxset*s, void *p, uint32_t *idx); /* Get the entry by its idx */ void* pa_idxset_get_by_index(pa_idxset*s, uint32_t idx); -/* Get the entry by its data. The idx is returned in *index */ +/* Get the entry by its data. The index is returned in *idx */ void* pa_idxset_get_by_data(pa_idxset*s, const void *p, uint32_t *idx); /* Similar to pa_idxset_get_by_index(), but removes the entry from the idxset. */ diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index a4902909..c75d4176 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -1769,7 +1769,7 @@ static void sink_input_rewind_ramp_info(pa_sink_input *i, size_t nbytes) { if (!i->thread_info.ramp_info.envelope_dead) { int32_t envelope_length; - pa_assert(i->thread_info.ramp_info.envelope); + pa_assert(i->thread_info.ramp_info.envelope); envelope_length = pa_envelope_length(i->thread_info.ramp_info.envelope); |