compositor: Parse config file in main(), only keep weston config object

[profile/ivi/weston-ivi-shell.git] / src / compositor.h

diff --git a/src/compositor.h b/src/compositor.h
index b871fe4..e3a798e 100644 (file)
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -556,8 +556,6 @@ struct weston_compositor {
        struct xkb_rule_names xkb_names;
        struct xkb_context *xkb_context;
        struct weston_xkb_info xkb_info;
-
-       int config_fd;
 };
 
 struct weston_buffer_reference {
@@ -1011,7 +1009,7 @@ weston_compositor_get_time(void);
 
 int
 weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
-                      int *argc, char *argv[], int config_fd);
+                      int *argc, char *argv[], struct weston_config *config);
 void
 weston_compositor_shutdown(struct weston_compositor *ec);
 void
@@ -1149,7 +1147,7 @@ noop_renderer_init(struct weston_compositor *ec);
 
 struct weston_compositor *
 backend_init(struct wl_display *display, int *argc, char *argv[],
-            int config_fd);
+            struct weston_config *config);
 
 int
 module_init(struct weston_compositor *compositor,