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

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

diff --git a/src/compositor-headless.c b/src/compositor-headless.c
index e4bd1be..e250b98 100644 (file)
--- a/src/compositor-headless.c
+++ b/src/compositor-headless.c
@@ -157,8 +157,9 @@ headless_destroy(struct weston_compositor *ec)
 
 static struct weston_compositor *
 headless_compositor_create(struct wl_display *display,
-                         int width, int height, const char *display_name,
-                         int *argc, char *argv[], int config_fd)
+                          int width, int height, const char *display_name,
+                          int *argc, char *argv[],
+                          struct weston_config *config)
 {
        struct headless_compositor *c;
 
@@ -168,8 +169,7 @@ headless_compositor_create(struct wl_display *display,
 
        memset(c, 0, sizeof *c);
 
-       if (weston_compositor_init(&c->base, display, argc, argv,
-                                  config_fd) < 0)
+       if (weston_compositor_init(&c->base, display, argc, argv, config) < 0)
                goto err_free;
 
        weston_seat_init(&c->fake_seat, &c->base);
@@ -194,7 +194,7 @@ err_free:
 
 WL_EXPORT struct weston_compositor *
 backend_init(struct wl_display *display, int *argc, char *argv[],
-            int config_fd)
+            struct weston_config *config)
 {
        int width = 1024, height = 640;
        char *display_name = NULL;
@@ -208,5 +208,5 @@ backend_init(struct wl_display *display, int *argc, char *argv[],
                      ARRAY_LENGTH(headless_options), argc, argv);
 
        return headless_compositor_create(display, width, height, display_name,
-                                         argc, argv, config_fd);
+                                         argc, argv, config);
 }