summaryrefslogtreecommitdiffstats
path: root/src/modules/module-lirc.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-06-13 22:08:14 +0000
committerLennart Poettering <lennart@poettering.net>2007-06-13 22:08:14 +0000
commitbe4a8828360b3607414c3ebfd836494e6490267d (patch)
tree765c44df62326769c1356483f79f5d300ddab9b3 /src/modules/module-lirc.c
parent69115687ad1604ddfa9fa7cd86eb286e6bb5ea9a (diff)
A lot of more work to get the lock-free stuff in place
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1474 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-lirc.c')
-rw-r--r--src/modules/module-lirc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
index c8adbc8b..452fa1f3 100644
--- a/src/modules/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -121,7 +121,7 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
pa_log("failed to get sink '%s'", u->sink_name);
else {
int i;
- pa_cvolume cv = *pa_sink_get_volume(s, PA_MIXER_HARDWARE);
+ pa_cvolume cv = *pa_sink_get_volume(s);
#define DELTA (PA_VOLUME_NORM/20)
@@ -134,7 +134,7 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
cv.values[i] = PA_VOLUME_NORM;
}
- pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
+ pa_sink_set_volume(s, &cv);
break;
case DOWN:
@@ -145,20 +145,20 @@ static void io_callback(pa_mainloop_api *io, PA_GCC_UNUSED pa_io_event *e, PA_GC
cv.values[i] = PA_VOLUME_MUTED;
}
- pa_sink_set_volume(s, PA_MIXER_HARDWARE, &cv);
+ pa_sink_set_volume(s, &cv);
break;
case MUTE:
- pa_sink_set_mute(s, PA_MIXER_HARDWARE, 0);
+ pa_sink_set_mute(s, 0);
break;
case RESET:
- pa_sink_set_mute(s, PA_MIXER_HARDWARE, 1);
+ pa_sink_set_mute(s, 1);
break;
case MUTE_TOGGLE:
- pa_sink_set_mute(s, PA_MIXER_HARDWARE, !pa_sink_get_mute(s, PA_MIXER_HARDWARE));
+ pa_sink_set_mute(s, !pa_sink_get_mute(s));
break;
case INVALID: