mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -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; int xkb_event_base;
char *sink_name; char *sink_name;
char *scache_item; char *scache_item;
Display *display;
pa_x11_wrapper *x11_wrapper; pa_x11_wrapper *x11_wrapper;
pa_x11_client *x11_client; pa_x11_client *x11_client;
@ -75,7 +74,7 @@ static int ring_bell(struct userdata *u, int percent) {
return -1; 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; 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)))) if (!(u->x11_wrapper = pa_x11_wrapper_get(c, pa_modargs_get_value(ma, "display", NULL))))
goto fail; goto fail;
u->display = pa_x11_wrapper_get_display(u->x11_wrapper);
major = XkbMajorVersion; major = XkbMajorVersion;
minor = XkbMinorVersion; minor = XkbMinorVersion;
@ -132,15 +129,15 @@ int pa__init(pa_core *c, pa_module*m) {
minor = XkbMinorVersion; 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"); pa_log(__FILE__": XkbQueryExtension() failed");
goto fail; 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; auto_ctrls = auto_values = XkbAudibleBellMask;
XkbSetAutoResetControls(u->display, XkbAudibleBellMask, &auto_ctrls, &auto_values); XkbSetAutoResetControls(pa_x11_wrapper_get_display(u->x11_wrapper), XkbAudibleBellMask, &auto_ctrls, &auto_values);
XkbChangeEnabledControls(u->display, XkbUseCoreKbd, XkbAudibleBellMask, 0); 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); u->x11_client = pa_x11_client_new(u->x11_wrapper, x11_event_callback, u);

27
src/modules/module-x11-publish.c
View file

@ -66,7 +66,6 @@ static const char* const valid_modargs[] = {
struct userdata { struct userdata {
pa_core *core; pa_core *core;
pa_x11_wrapper *x11_wrapper; pa_x11_wrapper *x11_wrapper;
Display *display;
char *id; char *id;
uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH]; uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH];
int auth_cookie_in_property; 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)))) if (!(u->x11_wrapper = pa_x11_wrapper_get(c, pa_modargs_get_value(ma, "display", NULL))))
goto fail; goto fail;
u->display = pa_x11_wrapper_get_display(u->x11_wrapper);
if (!(l = pa_property_get(c, PA_NATIVE_SERVER_PROPERTY_NAME))) if (!(l = pa_property_get(c, PA_NATIVE_SERVER_PROPERTY_NAME)))
goto fail; goto fail;
s = pa_strlist_tostring(l); 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); pa_xfree(s);
if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un))) if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un)))
goto fail; goto fail;
u->id = pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid()); 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))) 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))) 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); pa_modargs_free(ma);
return 0; return 0;
@ -168,15 +165,15 @@ void pa__done(pa_core *c, pa_module*m) {
char t[256]; char t[256];
/* Yes, here is a race condition */ /* 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!"); pa_log_warn(__FILE__": Polypaudio information vanished from X11!");
else { else {
pa_x11_del_prop(u->display, "POLYP_ID"); pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID");
pa_x11_del_prop(u->display, "POLYP_SERVER"); pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SERVER");
pa_x11_del_prop(u->display, "POLYP_SINK"); pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SINK");
pa_x11_del_prop(u->display, "POLYP_SOURCE"); pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SOURCE");
pa_x11_del_prop(u->display, "POLYP_COOKIE"); pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_COOKIE");
XSync(u->display, False); XSync(pa_x11_wrapper_get_display(u->x11_wrapper), False);
} }
} }