diff options
author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2010-10-09 15:38:43 +0530 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2010-10-15 01:10:00 +0530 |
commit | 49101fc540aec9a249e97a9f650be38f9f92f5ac (patch) | |
tree | 6b2049a66cb3f4c43adcb424468ff2deb852df84 /src/modules/module-lirc.c | |
parent | 1d2ef7923d28a74e08a4309b6fa3d36481d2df3b (diff) |
volume: Clamp volume to PA_VOLUME_MAX
This ensures that we always clamp the volume to PA_VOLUME_MAX. While
this currently has no effect, it will be required for making sure we
don't exceed PA_VOLUME_MAX when its value changes in the future.
Diffstat (limited to 'src/modules/module-lirc.c')
-rw-r--r-- | src/modules/module-lirc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c index e9778620..15f3442d 100644 --- a/src/modules/module-lirc.c +++ b/src/modules/module-lirc.c @@ -172,7 +172,7 @@ fail: int pa__init(pa_module*m) { pa_modargs *ma = NULL; struct userdata *u; - pa_volume_t volume_limit = PA_VOLUME_NORM*3/2; + pa_volume_t volume_limit = PA_CLAMP_VOLUME(PA_VOLUME_NORM*3/2); pa_volume_t volume_step = PA_VOLUME_NORM/20; pa_assert(m); @@ -199,8 +199,8 @@ int pa__init(pa_module*m) { u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); u->lirc_fd = -1; u->mute_toggle_save = 0; - u->volume_limit = volume_limit; - u->volume_step = volume_step; + u->volume_limit = PA_CLAMP_VOLUME(volume_limit); + u->volume_step = PA_CLAMP_VOLUME(volume_step); if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "pulseaudio"), 1)) < 0) { pa_log("lirc_init() failed."); |