diff options
| author | Vladimir Kokarev <matrix47@gmail.com> | 2009-09-19 19:43:24 +0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-11-05 04:56:47 +0100 |
| commit | d2c59354d554f136739be7bbcd326f1d254f778e (patch) | |
| tree | 01ada5237cb00c14333028717e10b9917109af95 /src/pulse/volume.c | |
| parent | 53b046d5c9593d848270e85017c2999a61256e0e (diff) | |
volume: add pa_cvolume_inc_clamp function
added function to increase volume not exceeding specified limit
simply changed PA_VOLUME_MAX to 'limit' in pa_cvolume_inc
pa_cvolume_inc now calls pa_cvolume_inc_clamp with PA_VOLUME_MAX limit
Diffstat (limited to 'src/pulse/volume.c')
| -rw-r--r-- | src/pulse/volume.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 2d2bba25..59e9a189 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -885,7 +885,7 @@ pa_cvolume* pa_cvolume_merge(pa_cvolume *dest, const pa_cvolume *a, const pa_cvo return dest; } -pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc) { +pa_cvolume* pa_cvolume_inc_clamp(pa_cvolume *v, pa_volume_t inc, pa_volume_t limit) { pa_volume_t m; pa_assert(v); @@ -895,14 +895,18 @@ pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc) { m = pa_cvolume_max(v); - if (m >= PA_VOLUME_MAX - inc) - m = PA_VOLUME_MAX; + if (m >= limit - inc) + m = limit; else m += inc; return pa_cvolume_scale(v, m); } +pa_cvolume* pa_cvolume_inc(pa_cvolume *v, pa_volume_t inc){ + return pa_cvolume_inc_clamp(v, inc, PA_VOLUME_MAX); +} + pa_cvolume* pa_cvolume_dec(pa_cvolume *v, pa_volume_t dec) { pa_volume_t m; |