ericonr/sndio
1
0
Fork 0
mirror of https://github.com/ericonr/sndio.git synced 2024-02-18 04:45:21 -06:00
Code Issues Projects Releases Wiki Activity

use mixer_incrvol() instead of mixer_setvol()

Browse Source
This commit is contained in:
Alexandre Ratchov 2014-08-10 19:53:08 +02:00
parent aaa1898b8c
commit 4280ad82da
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xvolkeys/xvolkeys.c
View File

@ -36,6 +36,11 @@
*/ */
#define MODMASK (Mod1Mask | ControlMask) #define MODMASK (Mod1Mask | ControlMask)
/*
* volume increment
*/
#define VOL_INC 9
void mixer_setvol(unsigned int); void mixer_setvol(unsigned int);
void mixer_ondesc(void *, struct siomix_desc *, int); void mixer_ondesc(void *, struct siomix_desc *, int);
void mixer_onctl(void *, unsigned int, unsigned int); void mixer_onctl(void *, unsigned int, unsigned int);
@ -63,15 +68,18 @@ KeySym *inc_map, *dec_map;
* send master volume message and to the server * send master volume message and to the server
*/ */
void void
mixer_setvol(unsigned int vol) mixer_incrvol(int incr)
{ {
int vol;
if (!mixer_connect())
return;
vol = master_val + incr;
if (vol > SIOMIX_INTMAX) if (vol > SIOMIX_INTMAX)
vol = SIOMIX_INTMAX; vol = SIOMIX_INTMAX;
if (vol < 0) if (vol < 0)
vol = 0; vol = 0;
if (!mixer_connect()) if (master_val != (unsigned int)vol) {
return;
if (master_val != vol) {
master_val = vol; master_val = vol;
if (hdl && master_found) { if (hdl && master_found) {
if (verbose) { if (verbose) {
@ -296,10 +304,10 @@ main(int argc, char **argv)
continue; continue;
if (xev.xkey.keycode == inc_code && if (xev.xkey.keycode == inc_code &&
inc_map[xev.xkey.state & ShiftMask] == KEY_INC) { inc_map[xev.xkey.state & ShiftMask] == KEY_INC) {
mixer_setvol(master_val + 9); mixer_incrvol(VOL_INC);
} else if (xev.xkey.keycode == dec_code && } else if (xev.xkey.keycode == dec_code &&
dec_map[xev.xkey.state & ShiftMask] == KEY_DEC) { dec_map[xev.xkey.state & ShiftMask] == KEY_DEC) {
mixer_setvol(master_val - 9); mixer_incrvol(-VOL_INC);
} }
} }
nfds = (hdl != NULL) ? siomix_pollfd(hdl, pfds, 0) : 0; nfds = (hdl != NULL) ? siomix_pollfd(hdl, pfds, 0) : 0;