diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-06-01 11:14:02 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-06-01 11:14:38 -0400 |
| commit | c1be8e59de2e68764da4790064f337e788dfaf89 (patch) | |
| tree | 01a169db44bd8cd841925fb201063959ac6fbd63 /src/compositor-android.c | |
| parent | baf43592855c78b36dee33cb0d8e325388ae2dd5 (diff) | |
Pass config_file through to weston_compositor_init
This allows us to do config parsing there.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/compositor-android.c')
| -rw-r--r-- | src/compositor-android.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/compositor-android.c b/src/compositor-android.c index 91bbf74..3343481 100644 --- a/src/compositor-android.c +++ b/src/compositor-android.c @@ -403,7 +403,8 @@ android_compositor_destroy(struct weston_compositor *base) } static struct weston_compositor * -android_compositor_create(struct wl_display *display, int argc, char *argv[]) +android_compositor_create(struct wl_display *display, int argc, char *argv[], + const char *config_file) { struct android_compositor *compositor; struct android_output *output; @@ -425,7 +426,8 @@ android_compositor_create(struct wl_display *display, int argc, char *argv[]) if (android_init_egl(compositor, output) < 0) return NULL; - if (weston_compositor_init(&compositor->base, display, argc, argv) < 0) + if (weston_compositor_init(&compositor->base, display, argc, argv, + config_file) < 0) return NULL; android_compositor_add_output(compositor, output); @@ -438,7 +440,8 @@ android_compositor_create(struct wl_display *display, int argc, char *argv[]) } WL_EXPORT struct weston_compositor * -backend_init(struct wl_display *display, int argc, char *argv[]) +backend_init(struct wl_display *display, int argc, char *argv[], + const char *config_file) { - return android_compositor_create(display, argc, argv); + return android_compositor_create(display, argc, argv, config_file); } |