X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=4a2ffca342e57eebe8eda7f44f647d5b839712ed;hb=bdd8dd718496dc8e4330209c46c196442bcf7d3e;hp=2cefcd6576b1e70e41eca49085025cc45075821c;hpb=51a77a42b4003d25fbf8193ae6122fd95fd1489a;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 2cefcd6..4a2ffca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,6 +57,10 @@
 #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;
 
@@ -74,6 +78,11 @@ handle_output_destroy(struct wl_listener *listener, void *data)
 	output = wl_container_of(listener, output, output_destroy);
 	assert(output->output == data);
 
+	if (output->fullscreen_view.fs->view) {
+		weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+		output->fullscreen_view.fs->view = NULL;
+	}
+
 	output->output = NULL;
 	wl_list_remove(&output->output_destroy.link);
 }
@@ -558,6 +567,38 @@ 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,
@@ -712,6 +753,7 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
 		ivi_output->config = remote_section;
+		ivi_output->type = OUTPUT_REMOTE;
 
 		if (remote_output_init(ivi_output, ivi->compositor,
 				       remote_section, ivi->remoting_api)) {
@@ -729,6 +771,58 @@ 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));
+
+		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)
 {
@@ -804,6 +898,7 @@ 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);
@@ -1392,7 +1487,6 @@ int main(int argc, char *argv[])
 	wl_list_init(&ivi.remote_pending_apps);
 	wl_list_init(&ivi.desktop_clients);
 
-
 	/* Prevent any clients we spawn getting our stdin */
 	os_fd_set_cloexec(STDIN_FILENO);
 
@@ -1489,6 +1583,9 @@ int main(int argc, char *argv[])
 	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;