mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston: move weston_output_enable() into callers

Browse Source 
Move the call out of wet_configure_windowed_output_from_config() and
into its callers.

This allows to migrate each frontend one by one.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Pekka Paalanen
2017-08-17 16:39:48 +03:00
parent e19970fd6c
commit 3717e639ee
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+6 -2
View File
@@ -1007,8 +1007,6 @@ wet_configure_windowed_output_from_config(struct weston_output *output,
return -1; return -1;
} }
weston_output_enable(output);
return 0; return 0;
} }
@@ -1152,6 +1150,8 @@ headless_backend_output_configure(struct wl_listener *listener, void *data)
if (wet_configure_windowed_output_from_config(output, &defaults) < 0) if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
weston_log("Cannot configure output \"%s\".\n", output->name); weston_log("Cannot configure output \"%s\".\n", output->name);
weston_output_enable(output);
} }
static int static int
@@ -1370,6 +1370,8 @@ x11_backend_output_configure(struct wl_listener *listener, void *data)
if (wet_configure_windowed_output_from_config(output, &defaults) < 0) if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
weston_log("Cannot configure output \"%s\".\n", output->name); weston_log("Cannot configure output \"%s\".\n", output->name);
weston_output_enable(output);
} }
static int static int
@@ -1486,6 +1488,8 @@ wayland_backend_output_configure(struct wl_listener *listener, void *data)
if (wet_configure_windowed_output_from_config(output, &defaults) < 0) if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
weston_log("Cannot configure output \"%s\".\n", output->name); weston_log("Cannot configure output \"%s\".\n", output->name);
weston_output_enable(output);
} }
static int static int