X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=c0a66c87c7f149b4799f4b558904b39db2dbe29f;hb=refs%2Fchanges%2F10%2F29010%2F1;hp=8df333d9de7a55d9be4e9f388d798092b6a11354;hpb=cea026b06a9073916b0c21d61cda0965e0bf3d82;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 8df333d..c0a66c8 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -60,10 +60,6 @@
 #include "remote.h"
 #endif
 
-#ifdef HAVE_WALTHAM
-#include <waltham-transmitter/transmitter_api.h>
-#endif
-
 static int cached_tm_mday = -1;
 static struct weston_log_scope *log_scope;
 
@@ -419,7 +415,7 @@ parse_transform(const char *transform, uint32_t *out)
 	return -1;
 }
 
-static int
+int
 parse_activation_area(const char *geometry, struct ivi_output *output)
 {
 	int n;
@@ -707,38 +703,6 @@ heads_changed(struct wl_listener *listener, void *arg)
 	}
 }
 
-#ifdef HAVE_WALTHAM
-static int
-load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
-{
-	struct weston_compositor *compositor = ivi->compositor;
-	int (*module_init)(struct weston_compositor *wc);
-
-	module_init = weston_load_module("waltham-transmitter.so",
-					 "wet_module_init");
-	if (!module_init)
-		return -1;
-
-	if (module_init(compositor) < 0)
-		return -1;
-
-	ivi->waltham_transmitter_api = weston_get_transmitter_api(compositor);
-	if (!ivi->waltham_transmitter_api) {
-		weston_log("Failed to load waltham-transmitter plugin.\n");
-		return -1;
-	}
-
-	weston_log("waltham-transmitter plug-in loaded\n");
-	return 0;
-}
-#else
-static int
-load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
-{
-	return -1;
-}
-#endif
-
 #ifdef HAVE_REMOTING
 static int
 drm_backend_remoted_output_configure(struct weston_output *output,
@@ -915,62 +879,6 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 	}
 }
 
-static void
-ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
-{
-	struct weston_config_section *transmitter_section = NULL;
-	const char *sect_name;
-	struct weston_config *config = ivi->config;
-
-	while (weston_config_next_section(config, &transmitter_section, &sect_name)) {
-		if (strcmp(sect_name, "transmitter-output"))
-			continue;
-
-		struct ivi_output *ivi_output = NULL;
-		bool output_found = false;
-		char *_name = NULL;
-
-		weston_config_section_get_string(transmitter_section,
-				"name", &_name, NULL);
-		wl_list_for_each(ivi_output, &ivi->outputs, link) {
-			if (!strcmp(ivi_output->name, _name)) {
-				output_found = true;
-				break;
-			}
-		}
-
-		if (output_found) {
-			free(_name);
-			continue;
-		}
-
-		ivi_output = zalloc(sizeof(*ivi_output));
-		if (!ivi_output) {
-			free(_name);
-			continue;
-		}
-
-		ivi_output->ivi = ivi;
-		ivi_output->name = _name;
-		ivi_output->config = transmitter_section;
-
-		if (remote_output_init(ivi_output, ivi->compositor,
-					transmitter_section, ivi->remoting_api)) {
-			free(ivi_output->name);
-			free(ivi_output);
-			continue;
-		}
-
-		ivi_output->type = OUTPUT_WALTHAM;
-		ivi_output->output_destroy.notify = handle_output_destroy;
-		weston_output_add_destroy_listener(ivi_output->output,
-				&ivi_output->output_destroy);
-
-		wl_list_insert(&ivi->outputs, &ivi_output->link);
-		ivi_output_configure_app_id(ivi_output);
-	}
-}
-
 static int
 load_remoting_plugin(struct ivi_compositor *ivi, struct weston_config *config)
 {
@@ -1050,7 +958,6 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 	}
 
 	load_remoting_plugin(ivi, ivi->config);
-	load_waltham_plugin(ivi, ivi->config);
 
 error:
 	free(config.gbm_format);
@@ -1791,6 +1698,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	int version = 0;
 	int no_config = 0;
 	int debug = 0;
+	bool list_debug_scopes = false;
 	char *config_file = NULL;
 	struct weston_log_context *log_ctx = NULL;
 	struct weston_log_subscriber *logger;
@@ -1809,6 +1717,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 		{ WESTON_OPTION_STRING, "config", 'c', &config_file },
 		{ WESTON_OPTION_STRING, "modules", 0, &option_modules },
 		{ WESTON_OPTION_STRING, "debug-scopes", 'l', &debug_scopes },
+		{ WESTON_OPTION_STRING, "list-debug-scopes", 'L', &list_debug_scopes },
 	};
 
 	wl_list_init(&ivi.outputs);
@@ -1937,6 +1846,22 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	if (ivi_shell_init(&ivi) < 0)
 		goto error_compositor;
 
+	if (list_debug_scopes) {
+		struct weston_log_scope *nscope = NULL;
+
+		weston_log("Printing available debug scopes:\n");
+
+		while ((nscope = weston_log_scopes_iterate(ivi.compositor, nscope))) {
+			weston_log("\tscope name: %s, desc: %s",
+					weston_log_scope_get_name(nscope),
+					weston_log_scope_get_description(nscope));
+		}
+
+		weston_log("\n");
+
+		goto error_compositor;
+	}
+
 	add_bindings(ivi.compositor);
 
 	weston_compositor_flush_heads_changed(ivi.compositor);
@@ -1944,9 +1869,6 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	if (ivi.remoting_api)
 		ivi_enable_remote_outputs(&ivi);
 
-	if (ivi.waltham_transmitter_api)
-		ivi_enable_waltham_outputs(&ivi);
-
 	if (create_listening_socket(display, socket_name) < 0)
 		goto error_compositor;