mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify x11 modules to not cache the Display variable since pa_x11wrap_get_display() is now used as notification that the x11 output buffer needs flushing

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@778 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-22 21:51:30 +00:00
parent ec65ca6ae7
commit f6fc410a96
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-x11-bell.c
View file

@ -52,7 +52,6 @@ struct userdata {
int xkb_event_base;
char *sink_name;
char *scache_item;
Display *display;
pa_x11_wrapper *x11_wrapper;
pa_x11_client *x11_client;
@ -75,7 +74,7 @@ static int ring_bell(struct userdata *u, int percent) {
return -1;
}
pa_scache_play_item(u->core, u->scache_item, s, pa_cvolume_set(&cv, PA_CHANNELS_MAX, percent*PA_VOLUME_NORM/100));
pa_scache_play_item(u->core, u->scache_item, s, pa_cvolume_set(&cv, PA_CHANNELS_MAX, (percent*PA_VOLUME_NORM)/100));
return 0;
}
@ -118,8 +117,6 @@ int pa__init(pa_core *c, pa_module*m) {
if (!(u->x11_wrapper = pa_x11_wrapper_get(c, pa_modargs_get_value(ma, "display", NULL))))
goto fail;
u->display = pa_x11_wrapper_get_display(u->x11_wrapper);
major = XkbMajorVersion;
minor = XkbMinorVersion;
@ -132,15 +129,15 @@ int pa__init(pa_core *c, pa_module*m) {
minor = XkbMinorVersion;
if (!XkbQueryExtension(u->display, NULL, &u->xkb_event_base, NULL, &major, &minor)) {
if (!XkbQueryExtension(pa_x11_wrapper_get_display(u->x11_wrapper), NULL, &u->xkb_event_base, NULL, &major, &minor)) {
pa_log(__FILE__": XkbQueryExtension() failed");
goto fail;
}
XkbSelectEvents(u->display, XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask);
XkbSelectEvents(pa_x11_wrapper_get_display(u->x11_wrapper), XkbUseCoreKbd, XkbBellNotifyMask, XkbBellNotifyMask);
auto_ctrls = auto_values = XkbAudibleBellMask;
XkbSetAutoResetControls(u->display, XkbAudibleBellMask, &auto_ctrls, &auto_values);
XkbChangeEnabledControls(u->display, XkbUseCoreKbd, XkbAudibleBellMask, 0);
XkbSetAutoResetControls(pa_x11_wrapper_get_display(u->x11_wrapper), XkbAudibleBellMask, &auto_ctrls, &auto_values);
XkbChangeEnabledControls(pa_x11_wrapper_get_display(u->x11_wrapper), XkbUseCoreKbd, XkbAudibleBellMask, 0);
u->x11_client = pa_x11_client_new(u->x11_wrapper, x11_event_callback, u);