summaryrefslogtreecommitdiff
path: root/src/compositor.h
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-06-01 11:14:02 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-06-01 11:14:38 -0400
commitc1be8e59de2e68764da4790064f337e788dfaf89 (patch)
tree01a169db44bd8cd841925fb201063959ac6fbd63 /src/compositor.h
parentbaf43592855c78b36dee33cb0d8e325388ae2dd5 (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.h')
-rw-r--r--src/compositor.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor.h b/src/compositor.h
index e00dfe3..23beb5f 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -624,7 +624,7 @@ weston_compositor_get_time(void);
int
weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
- int argc, char *argv[]);
+ int argc, char *argv[], const char *config_file);
void
weston_compositor_shutdown(struct weston_compositor *ec);
void
@@ -722,7 +722,8 @@ void
weston_surface_destroy(struct weston_surface *surface);
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);
int
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode);