diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-04-13 04:41:51 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-04-13 04:41:51 +0200 |
commit | 270a6981f745a05354e09d72a7b6c3dfd4af72d3 (patch) | |
tree | 8be96f8cfe417ae5569ab6f00d2909bef77c529e | |
parent | 6d218e96348b2873b20b91ef2e785333ceb65fe3 (diff) |
lirc, mmkbd: extend controllable volume range to PA_VOLUME_MAX
-rw-r--r-- | src/modules/module-lirc.c | 10 | ||||
-rw-r--r-- | src/modules/module-mmkbd-evdev.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c index d1ee2624..1a318a5f 100644 --- a/src/modules/module-lirc.c +++ b/src/modules/module-lirc.c @@ -127,10 +127,10 @@ static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event switch (volchange) { case UP: for (i = 0; i < cv.channels; i++) { - cv.values[i] += DELTA; - - if (cv.values[i] > PA_VOLUME_NORM) - cv.values[i] = PA_VOLUME_NORM; + if (cv.values[i] < PA_VOLUME_MAX - DELTA) + cv.values[i] += DELTA; + else + cv.values[i] = PA_VOLUME_MAX; } pa_sink_set_volume(s, &cv, TRUE, TRUE); @@ -138,7 +138,7 @@ static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event case DOWN: for (i = 0; i < cv.channels; i++) { - if (cv.values[i] >= DELTA) + if (cv.values[i] > DELTA) cv.values[i] -= DELTA; else cv.values[i] = PA_VOLUME_MUTED; diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c index 2f87dd22..ced3a592 100644 --- a/src/modules/module-mmkbd-evdev.c +++ b/src/modules/module-mmkbd-evdev.c @@ -120,10 +120,10 @@ static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event switch (volchange) { case UP: for (i = 0; i < cv.channels; i++) { - cv.values[i] += DELTA; - - if (cv.values[i] > PA_VOLUME_NORM) - cv.values[i] = PA_VOLUME_NORM; + if (cv.values[i] < PA_VOLUME_MAX - DELTA) + cv.values[i] += DELTA; + else + cv.values[i] = PA_VOLUME_MAX; } pa_sink_set_volume(s, &cv, TRUE, TRUE); @@ -131,7 +131,7 @@ static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event case DOWN: for (i = 0; i < cv.channels; i++) { - if (cv.values[i] >= DELTA) + if (cv.values[i] > DELTA) cv.values[i] -= DELTA; else cv.values[i] = PA_VOLUME_MUTED; |