modify lirc module to use pa_sink_mute() for muting and unmuting

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@924 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-17 21:07:46 +00:00
parent 53a285e756
commit 38cb138115

View file

@ -88,7 +88,14 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
pa_xfree(c); pa_xfree(c);
while (lirc_code2char(u->config, code, &name) == 0 && name) { while (lirc_code2char(u->config, code, &name) == 0 && name) {
enum { INVALID, UP, DOWN, MUTE, RESET, MUTE_TOGGLE } volchange = INVALID; enum {
INVALID,
UP,
DOWN,
MUTE,
RESET,
MUTE_TOGGLE
} volchange = INVALID;
pa_log_info(__FILE__": translated IR code '%s'", name); pa_log_info(__FILE__": translated IR code '%s'", name);
@ -111,51 +118,56 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
if (!(s = pa_namereg_get(u->module->core, u->sink_name, PA_NAMEREG_SINK, 1))) if (!(s = pa_namereg_get(u->module->core, u->sink_name, PA_NAMEREG_SINK, 1)))
pa_log(__FILE__": failed to get sink '%s'", u->sink_name); pa_log(__FILE__": failed to get sink '%s'", u->sink_name);
else { else {
pa_volume_t v = pa_cvolume_avg(pa_sink_get_volume(s, PA_MIXER_HARDWARE)); int i;
pa_cvolume cv; pa_cvolume cv = *pa_sink_get_volume(s, PA_MIXER_HARDWARE);
#define DELTA (PA_VOLUME_NORM/20) #define DELTA (PA_VOLUME_NORM/20)
switch (volchange) { switch (volchange) {
case UP: case UP:
v += PA_VOLUME_NORM/20; for (i = 0; i < cv.channels; i++) {
cv.values[i] += DELTA;
if (cv.values[i] > PA_VOLUME_NORM)
cv.values[i] = PA_VOLUME_NORM;
}
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break; break;
case DOWN: case DOWN:
if (v > DELTA) for (i = 0; i < cv.channels; i++) {
v -= DELTA; if (cv.values[i] >= DELTA)
cv.values[i] -= DELTA;
else else
v = PA_VOLUME_MUTED; cv.values[i] = PA_VOLUME_MUTED;
}
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
break; break;
case MUTE: case MUTE:
v = PA_VOLUME_MUTED; pa_sink_set_mute(s, PA_MIXER_HARDWARE, 0);
break; break;
case RESET: case RESET:
v = PA_VOLUME_NORM; pa_sink_set_mute(s, PA_MIXER_HARDWARE, 1);
break; break;
case MUTE_TOGGLE: { case MUTE_TOGGLE:
if (v > 0) { pa_sink_set_mute(s, PA_MIXER_HARDWARE, !pa_sink_get_mute(s, PA_MIXER_HARDWARE));
u->mute_toggle_save = v; break;
v = PA_VOLUME_MUTED;
} else case INVALID:
v = u->mute_toggle_save;
}
default:
; ;
} }
pa_cvolume_set(&cv, PA_CHANNELS_MAX, v);
pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
} }
} }
} }
} }
free(code); pa_xfree(code);
return; return;