summaryrefslogtreecommitdiffstats
path: root/src/compositor.c
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-05-23 15:48:56 +0300
committerMarius Vlad <marius.vlad@collabora.com>2023-05-31 07:36:15 +0000
commit0ed8064b0de235fa21fb961f0a8789e11ad7f1a4 (patch)
tree318fd5d2a9ace1587ed5d038f3f0034ac258b348 /src/compositor.c
parente0a1dcc5480872fcb1ddafcd8664ef1b92f9446b (diff)
compositor: Remove Waltham support
Waltham hasn't been used in a while, its support has been removed for some time, we've been deprecating it last release so it's time to remove it from the compositor as well. Bug-AGL: SPEC-4669 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Iaf1e467b1228051fd96cac424ac6781d67f9fefa
Diffstat (limited to 'src/compositor.c')
-rw-r--r--src/compositor.c96
1 files changed, 0 insertions, 96 deletions
diff --git a/src/compositor.c b/src/compositor.c
index ef06314..9b0ac5f 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;
@@ -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);
@@ -1962,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;