summaryrefslogtreecommitdiff
path: root/remoting
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-08-28 16:59:36 +0300
committerDaniel Stone <daniels@collabora.com>2020-09-04 10:36:48 +0000
commitc4076ef88ab805c54b20c07b2f08e73912fc3483 (patch)
treea0b8aa1feb741c94f661d834cafef9ab3bcb9ace /remoting
parenta5570695c56b63a5e4b6b7e2b0c268f8bd4dedd1 (diff)
downloadweston-c4076ef88ab805c54b20c07b2f08e73912fc3483.tar.gz
plug-ins: Migrate pipewire and remoting plug-ins headers to public header
directory Weston is also a user of the plug-ins, so make use of it. With this change we unconditionally install the plug-in headers even though libweston might not be built with support for them. Suggested-by: Pekka Paalanen <pekka.paalanen@collabora.com> Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Diffstat (limited to 'remoting')
-rw-r--r--remoting/meson.build1
-rw-r--r--remoting/remoting-plugin.c2
-rw-r--r--remoting/remoting-plugin.h78
3 files changed, 1 insertions, 80 deletions
diff --git a/remoting/meson.build b/remoting/meson.build
index ac9fa511..ed7ff479 100644
--- a/remoting/meson.build
+++ b/remoting/meson.build
@@ -29,5 +29,4 @@ if get_option('remoting')
install_dir: dir_module_libweston
)
env_modmap += 'remoting-plugin.so=@0@;'.format(plugin_remoting.full_path())
- install_headers('remoting-plugin.h', subdir: dir_include_libweston_install)
endif
diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c
index 85b6bcfd..a1d994ea 100644
--- a/remoting/remoting-plugin.c
+++ b/remoting/remoting-plugin.c
@@ -43,7 +43,7 @@
#include <gst/video/gstvideometa.h>
#include <drm_fourcc.h>
-#include "remoting-plugin.h"
+#include <libweston/remoting-plugin.h>
#include <libweston/backend-drm.h>
#include "shared/helpers.h"
#include "shared/timespec-util.h"
diff --git a/remoting/remoting-plugin.h b/remoting/remoting-plugin.h
deleted file mode 100644
index fdd429c5..00000000
--- a/remoting/remoting-plugin.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2018 Renesas Electronics Corp.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors: IGEL Co., Ltd.
- */
-
-#ifndef REMOTING_PLUGIN_H
-#define REMOTING_PLUGIN_H
-
-#include <libweston/libweston.h>
-#include <libweston/plugin-registry.h>
-
-#define WESTON_REMOTING_API_NAME "weston_remoting_api_v1"
-
-struct weston_remoting_api {
- /** Create remoted outputs
- *
- * Returns 0 on success, -1 on failure.
- */
- struct weston_output *(*create_output)(struct weston_compositor *c,
- char *name);
-
- /** Check if output is remoted */
- bool (*is_remoted_output)(struct weston_output *output);
-
- /** Set mode */
- int (*set_mode)(struct weston_output *output, const char *modeline);
-
- /** Set gbm format */
- void (*set_gbm_format)(struct weston_output *output,
- const char *gbm_format);
-
- /** Set seat */
- void (*set_seat)(struct weston_output *output, const char *seat);
-
- /** Set the destination Host(IP Address) */
- void (*set_host)(struct weston_output *output, char *ip);
-
- /** Set the port number */
- void (*set_port)(struct weston_output *output, int port);
-
- /** Set the pipeline for gstreamer */
- void (*set_gst_pipeline)(struct weston_output *output,
- char *gst_pipeline);
-};
-
-static inline const struct weston_remoting_api *
-weston_remoting_get_api(struct weston_compositor *compositor)
-{
- const void *api;
- api = weston_plugin_api_get(compositor, WESTON_REMOTING_API_NAME,
- sizeof(struct weston_remoting_api));
-
- return (const struct weston_remoting_api *)api;
-}
-
-#endif /* REMOTING_PLUGIN_H */