transmitter: Avoid multiple module load error

Change-Id: I6febcc9b9633364d1d3f1ef5c0edebd57665117a
Signed-off-by: Naoko Tanibata <tnaoko@jp.adit-jv.com>

diff --git a/waltham-transmitter/transmitter-plugin/output.c b/waltham-transmitter/transmitter-plugin/output.c
index b98e170..f5b1c21 100644 (file)
--- a/waltham-transmitter/transmitter-plugin/output.c
+++ b/waltham-transmitter/transmitter-plugin/output.c
@@ -333,10 +333,7 @@ transmitter_remote_create_output(struct weston_transmitter_remote *remote,
        output->remote = remote;
        wl_list_insert(&remote->output_list, &output->link);
 
-       /* Loading a waltham renderer library */
-       waltham_renderer = weston_load_module("waltham-renderer.so","waltham_renderer_interface");
-
-       if (waltham_renderer->display_create(output) < 0) {
+       if (txr->waltham_renderer->display_create(output) < 0) {
                weston_log("Failed to create waltham renderer display \n");
                return -1;
        }

diff --git a/waltham-transmitter/transmitter-plugin/plugin.c b/waltham-transmitter/transmitter-plugin/plugin.c
index f643bd8..3a61011 100644 (file)
--- a/waltham-transmitter/transmitter-plugin/plugin.c
+++ b/waltham-transmitter/transmitter-plugin/plugin.c
@@ -924,6 +924,13 @@ wet_module_init(struct weston_compositor *compositor, int *argc, char *argv[])
                goto fail;
        }
 
+       /* Loading a waltham renderer library */
+       txr->waltham_renderer = weston_load_module("waltham-renderer.so","waltham_renderer_interface");
+       if (txr->waltham_renderer == NULL) {
+               weston_log("Failed to load waltham-renderer\n");
+               goto fail;
+       }
+
        weston_log("Transmitter initialized.\n");
 
        txr->loop = wl_display_get_event_loop(compositor->wl_display);

diff --git a/waltham-transmitter/transmitter-plugin/plugin.h b/waltham-transmitter/transmitter-plugin/plugin.h
index a473dab..892ba7a 100644 (file)
--- a/waltham-transmitter/transmitter-plugin/plugin.h
+++ b/waltham-transmitter/transmitter-plugin/plugin.h
@@ -106,6 +106,8 @@ struct weston_transmitter {
        struct wl_listener stream_listener;
        struct wl_signal connected_signal;
        struct wl_event_loop *loop;
+
+       struct waltham_renderer_interface *waltham_renderer;
 };
 
 struct weston_transmitter_remote {