demux->p_sys = p_sys;
/* Connect to X server */
- char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+ char *display = var_InheritString (obj, "x11-display");
int snum;
xcb_connection_t *conn = xcb_connect (display, &snum);
free (display);
goto error;
/* Window properties */
- p_sys->x = var_CreateGetInteger (obj, "screen-left");
- p_sys->y = var_CreateGetInteger (obj, "screen-top");
- p_sys->w = var_CreateGetInteger (obj, "screen-width");
- p_sys->h = var_CreateGetInteger (obj, "screen-height");
- p_sys->follow_mouse = var_CreateGetBool (obj, "screen-follow-mouse");
+ p_sys->x = var_InheritInteger (obj, "screen-left");
+ p_sys->y = var_InheritInteger (obj, "screen-top");
+ p_sys->w = var_InheritInteger (obj, "screen-width");
+ p_sys->h = var_InheritInteger (obj, "screen-height");
+ p_sys->follow_mouse = var_InheritBool (obj, "screen-follow-mouse");
/* Initializes format */
- p_sys->rate = var_CreateGetFloat (obj, "screen-fps");
+ p_sys->rate = var_InheritFloat (obj, "screen-fps");
if (!p_sys->rate)
goto error;
p_sys->interval = (float)CLOCK_FREQ / p_sys->rate;
{
vlc_probe_t *probe = (vlc_probe_t *)obj;
- char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+ char *display = var_InheritString (obj, "x11-display");
xcb_connection_t *conn = xcb_connect (display, NULL);
free (display);
if (xcb_connection_has_error (conn))
sd->p_sys = p_sys;
/* Connect to X server */
- char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+ char *display = var_InheritString (obj, "x11-display");
int snum;
xcb_connection_t *conn = xcb_connect (display, &snum);
free (display);
/** Check MIT-SHM shared memory support */
void CheckSHM (vlc_object_t *obj, xcb_connection_t *conn, bool *restrict pshm)
{
- bool shm = var_CreateGetBool (obj, "x11-shm") > 0;
+ bool shm = var_InheritBool (obj, "x11-shm") > 0;
if (shm)
{
xcb_shm_query_version_cookie_t ck;
xcb_change_window_attributes (conn, wnd, XCB_CW_EVENT_MASK, &value);
/* Try to subscribe to click events */
/* (only one X11 client can get them, so might not work) */
- if (var_CreateGetBool (obj, "mouse-events"))
+ if (var_InheritBool (obj, "mouse-events"))
{
value |= XCB_EVENT_MASK_BUTTON_PRESS
| XCB_EVENT_MASK_BUTTON_RELEASE;
return VLC_ENOMEM;
/* Connect to X */
- char *display = var_CreateGetNonEmptyString (wnd, "x11-display");
+ char *display = var_InheritString (wnd, "x11-display");
int snum;
xcb_connection_t *conn = xcb_connect (display, &snum);
wnd->sys = p_sys;
p_sys->conn = conn;
- if (var_CreateGetBool (obj, "keyboard-events"))
+ if (var_InheritBool (obj, "keyboard-events"))
p_sys->keys = CreateKeyHandler (obj, conn);
else
p_sys->keys = NULL;
xcb_atom_t utf8 = get_atom (conn, utf8_string_ck);
xcb_atom_t net_wm_name = get_atom (conn, net_wm_name_ck);
- char *title = var_CreateGetNonEmptyString (wnd, "video-title");
+ char *title = var_InheritString (wnd, "video-title");
if (title)
{
set_string (conn, window, utf8, net_wm_name, title);
/* Make the window visible */
xcb_map_window (conn, window);
- if (var_CreateGetBool (obj, "video-wallpaper"))
+ if (var_InheritBool (obj, "video-wallpaper"))
{
vout_window_SetState (wnd, VOUT_WINDOW_STATE_BELOW);
vout_window_SetFullScreen (wnd, true);
{
vout_window_t *wnd = (vout_window_t *)obj;
- xcb_window_t window = var_CreateGetInteger (obj, "drawable-xid");
+ xcb_window_t window = var_InheritInteger (obj, "drawable-xid");
if (window == 0)
return VLC_EGENERIC;
var_Destroy (obj, "drawable-xid");
p_sys->root = geo->root;
free (geo);
- if (var_CreateGetBool (obj, "keyboard-events"))
+ if (var_InheritBool (obj, "keyboard-events"))
{
p_sys->keys = CreateKeyHandler (obj, conn);
if (p_sys->keys != NULL)
vout_display_t *vd = (vout_display_t *)obj;
vout_display_sys_t *p_sys = malloc (sizeof (*p_sys));
- if (!var_CreateGetBool (obj, "overlay"))
+ if (!var_InheritBool (obj, "overlay"))
return VLC_EGENERIC;
if (p_sys == NULL)
return VLC_ENOMEM;
if (adaptors == NULL)
goto error;
- int forced_adaptor = var_CreateGetInteger (obj, "xvideo-adaptor");
+ int forced_adaptor = var_InheritInteger (obj, "xvideo-adaptor");
/* */
video_format_t fmt = vd->fmt;