Weston 9.0 compatibility changes

[src/agl-compositor.git] / src / compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index d335c60..4ac0d95 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -301,14 +301,14 @@ static int
 parse_transform(const char *transform, uint32_t *out)
 {
        static const struct { const char *name; uint32_t token; } transforms[] = {
-               { "normal",     WL_OUTPUT_TRANSFORM_NORMAL },
-               { "90",         WL_OUTPUT_TRANSFORM_90 },
-               { "180",        WL_OUTPUT_TRANSFORM_180 },
-               { "270",        WL_OUTPUT_TRANSFORM_270 },
-               { "flipped",    WL_OUTPUT_TRANSFORM_FLIPPED },
-               { "flipped-90", WL_OUTPUT_TRANSFORM_FLIPPED_90 },
-               { "flipped-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
-               { "flipped-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
+               { "normal",             WL_OUTPUT_TRANSFORM_NORMAL },
+               { "rotate-90",          WL_OUTPUT_TRANSFORM_90 },
+               { "rotate-180",         WL_OUTPUT_TRANSFORM_180 },
+               { "rotate-270",         WL_OUTPUT_TRANSFORM_270 },
+               { "flipped",            WL_OUTPUT_TRANSFORM_FLIPPED },
+               { "flipped-rotate-90",  WL_OUTPUT_TRANSFORM_FLIPPED_90 },
+               { "flipped-rotate-180", WL_OUTPUT_TRANSFORM_FLIPPED_180 },
+               { "flipped-rotate-270", WL_OUTPUT_TRANSFORM_FLIPPED_270 },
        };
 
        for (size_t i = 0; i < ARRAY_LENGTH(transforms); i++)
@@ -1649,15 +1649,15 @@ int wet_main(int argc, char *argv[])
                goto exit_signals;
        }
 
-       log_ctx = weston_log_ctx_compositor_create();
+       log_ctx = weston_log_ctx_create();
        if (!log_ctx) {
                fprintf(stderr, "Failed to initialize weston debug framework.\n");
                goto exit_signals;
        }
 
-        log_scope = weston_compositor_add_log_scope(log_ctx, "log",
-                                                   "agl-compositor log\n",
-                                                   NULL, NULL, NULL);
+        log_scope = weston_log_ctx_add_log_scope(log_ctx, "log",
+                                                "agl-compositor log\n",
+                                                NULL, NULL, NULL);
 
        log_file_open(log);
        weston_log_set_handler(vlog, vlog_continue);
@@ -1774,15 +1774,13 @@ error_compositor:
        free(modules);
        modules = NULL;
 
-       weston_compositor_tear_down(ivi.compositor);
+       weston_compositor_destroy(ivi.compositor);
 
-       weston_compositor_log_scope_destroy(log_scope);
+       weston_log_scope_destroy(log_scope);
        log_scope = NULL;
 
-       weston_log_ctx_compositor_destroy(ivi.compositor);
-       weston_compositor_destroy(ivi.compositor);
-
-       weston_log_subscriber_destroy_log(logger);
+       weston_log_subscriber_destroy(logger);
+       weston_log_ctx_destroy(log_ctx);
 
        ivi_policy_destroy(ivi.policy);