summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-22 21:51:30 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-22 21:51:30 +0000
commitf6fc410a96c7b0ca8e393d20ffe5771da5b55604 (patch)
tree7bb246ae9d9c44c2df08e4036897e9dc1b5ee7ca /src
parentec65ca6ae758610a46c95fbf589729fb15cf1daf (diff)
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
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@778 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/modules/module-x11-bell.c13
-rw-r--r--src/modules/module-x11-publish.c27
2 files changed, 17 insertions, 23 deletions
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index 27ceb7f9..fe1711a5 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -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);
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index cee9cb3f..7408b930 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -66,7 +66,6 @@ static const char* const valid_modargs[] = {
struct userdata {
pa_core *core;
pa_x11_wrapper *x11_wrapper;
- Display *display;
char *id;
uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH];
int auth_cookie_in_property;
@@ -123,28 +122,26 @@ 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);
-
if (!(l = pa_property_get(c, PA_NATIVE_SERVER_PROPERTY_NAME)))
goto fail;
s = pa_strlist_tostring(l);
- pa_x11_set_prop(u->display, "POLYP_SERVER", s);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SERVER", s);
pa_xfree(s);
if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un)))
goto fail;
u->id = pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid());
- pa_x11_set_prop(u->display, "POLYP_ID", u->id);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID", u->id);
if ((t = pa_modargs_get_value(ma, "source", NULL)))
- pa_x11_set_prop(u->display, "POLYP_SOURCE", t);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SOURCE", t);
if ((t = pa_modargs_get_value(ma, "sink", NULL)))
- pa_x11_set_prop(u->display, "POLYP_SINK", t);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SINK", t);
- pa_x11_set_prop(u->display, "POLYP_COOKIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx)));
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_COOKIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx)));
pa_modargs_free(ma);
return 0;
@@ -168,15 +165,15 @@ void pa__done(pa_core *c, pa_module*m) {
char t[256];
/* Yes, here is a race condition */
- if (!pa_x11_get_prop(u->display, "POLYP_ID", t, sizeof(t)) || strcmp(t, u->id))
+ if (!pa_x11_get_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID", t, sizeof(t)) || strcmp(t, u->id))
pa_log_warn(__FILE__": Polypaudio information vanished from X11!");
else {
- pa_x11_del_prop(u->display, "POLYP_ID");
- pa_x11_del_prop(u->display, "POLYP_SERVER");
- pa_x11_del_prop(u->display, "POLYP_SINK");
- pa_x11_del_prop(u->display, "POLYP_SOURCE");
- pa_x11_del_prop(u->display, "POLYP_COOKIE");
- XSync(u->display, False);
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SERVER");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SINK");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SOURCE");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_COOKIE");
+ XSync(pa_x11_wrapper_get_display(u->x11_wrapper), False);
}
}