1 From 49d8943b151a73be3dd726561a720c0f4bfdccac Mon Sep 17 00:00:00 2001
2 From: Sangchul Lee <sangchul1011@gmail.com>
3 Date: Sat, 27 Aug 2016 21:33:18 +0900
4 Subject: [PATCH 4/6] sink-input: Code cleanup regarding volume ramping
6 Remove unused parameter of pa_sink_input_set_volume_ramp().
7 Use bool instead of pa_bool_t.
9 Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
11 src/pulsecore/sink-input.c | 7 ++-----
12 src/pulsecore/sink-input.h | 2 +-
13 2 files changed, 3 insertions(+), 6 deletions(-)
15 diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
16 index cc8953f..e1968e0 100644
17 --- a/src/pulsecore/sink-input.c
18 +++ b/src/pulsecore/sink-input.c
19 @@ -931,7 +931,6 @@ void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink bytes */, pa
21 bool nvfs = need_volume_factor_sink;
26 pa_memblock_ref(wchunk.memblock);
27 @@ -972,7 +971,7 @@ void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink bytes */, pa
28 if (pa_cvolume_ramp_active(&i->thread_info.ramp)) {
29 pa_memchunk_make_writable(&wchunk, 0);
30 pa_volume_ramp_memchunk(&wchunk, &i->sink->sample_spec, &(i->thread_info.ramp));
31 - } else if ((tmp = pa_cvolume_ramp_target_active(&(i->thread_info.ramp)))) {
32 + } else if ((pa_cvolume_ramp_target_active(&(i->thread_info.ramp)))) {
33 pa_memchunk_make_writable(&wchunk, 0);
34 pa_cvolume_ramp_get_targets(&i->thread_info.ramp, &target);
35 pa_volume_memchunk(&wchunk, &i->sink->sample_spec, &target);
36 @@ -1372,9 +1371,7 @@ int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key) {
37 void pa_sink_input_set_volume_ramp(
39 const pa_cvolume_ramp *ramp,
44 pa_sink_input_assert_ref(i);
45 pa_assert_ctl_context();
46 pa_assert(PA_SINK_INPUT_IS_LINKED(i->state));
47 diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
48 index 6e1b211..92f61c3 100644
49 --- a/src/pulsecore/sink-input.h
50 +++ b/src/pulsecore/sink-input.h
51 @@ -378,7 +378,7 @@ void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume, bool s
52 void pa_sink_input_add_volume_factor(pa_sink_input *i, const char *key, const pa_cvolume *volume_factor);
53 int pa_sink_input_remove_volume_factor(pa_sink_input *i, const char *key);
54 pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i, pa_cvolume *volume, bool absolute);
55 -void pa_sink_input_set_volume_ramp(pa_sink_input *i, const pa_cvolume_ramp *ramp, pa_bool_t send_msg, pa_bool_t save);
56 +void pa_sink_input_set_volume_ramp(pa_sink_input *i, const pa_cvolume_ramp *ramp, bool send_msg);
58 void pa_sink_input_set_mute(pa_sink_input *i, bool mute, bool save);