mirror of
https://github.com/mpv-player/mpv
synced 2025-03-19 01:47:38 +00:00
Revert "wayland: add wayland-display-socket option"
Pointless feature that can be done with environment variables. It was
also implemented incorrectly and broke autoprobing.
This reverts commit 015b676875
.
This commit is contained in:
parent
015b676875
commit
5dc16a4a18
@ -5382,12 +5382,6 @@ The following video options are currently all specific to ``--vo=gpu`` and
|
||||
``--no-audio``, and ``--untimed=yes``. Only works with ``--gpu-context=wayland``
|
||||
and ``--gpu-context=waylandvk``.
|
||||
|
||||
``--wayland-display-socket=<string>``
|
||||
Specify the name of the wayland socket mpv attempts to connect to. By default,
|
||||
mpv will simply pass "NULL" which will then try to connect to the compositor
|
||||
currently in use. Note that this will only have an effect during startup since
|
||||
closing the connection to the wl_display will terminate the client.
|
||||
|
||||
``--wayland-edge-pixels-pointer=<value>``
|
||||
Defines the size of an edge border (default: 10) to initiate client side
|
||||
resize events in the wayland contexts with the mouse. This is only active if
|
||||
|
@ -46,7 +46,6 @@
|
||||
const struct m_sub_options wayland_conf = {
|
||||
.opts = (const struct m_option[]) {
|
||||
{"wayland-disable-vsync", OPT_FLAG(disable_vsync)},
|
||||
{"wayland-display-socket", OPT_STRING(display_socket)},
|
||||
{"wayland-edge-pixels-pointer", OPT_INT(edge_pixels_pointer),
|
||||
M_RANGE(0, INT_MAX)},
|
||||
{"wayland-edge-pixels-touch", OPT_INT(edge_pixels_touch),
|
||||
@ -56,7 +55,6 @@ const struct m_sub_options wayland_conf = {
|
||||
.size = sizeof(struct wayland_opts),
|
||||
.defaults = &(struct wayland_opts) {
|
||||
.disable_vsync = false,
|
||||
.display_socket = NULL,
|
||||
.edge_pixels_pointer = 10,
|
||||
.edge_pixels_touch = 64,
|
||||
},
|
||||
@ -1127,6 +1125,7 @@ int vo_wayland_init(struct vo *vo)
|
||||
struct vo_wayland_state *wl = vo->wl;
|
||||
|
||||
*wl = (struct vo_wayland_state) {
|
||||
.display = wl_display_connect(NULL),
|
||||
.vo = vo,
|
||||
.log = mp_log_new(wl, vo->log, "wayland"),
|
||||
.scaling = 1,
|
||||
@ -1135,16 +1134,8 @@ int vo_wayland_init(struct vo *vo)
|
||||
.cursor_visible = true,
|
||||
.vo_opts_cache = m_config_cache_alloc(wl, vo->global, &vo_sub_opts),
|
||||
};
|
||||
wl->opts = mp_get_config_group(wl, wl->vo->global, &wayland_conf);
|
||||
wl->vo_opts = wl->vo_opts_cache->opts;
|
||||
|
||||
wl->display = wl_display_connect(wl->opts->display_socket);
|
||||
if (!wl->display) {
|
||||
MP_WARN(wl, "Display socket %s not found/unavailable! Falling back to NULL!\n", wl->opts->display_socket);
|
||||
wl->display = wl_display_connect(NULL);
|
||||
}
|
||||
wl->display_fd = wl_display_get_fd(wl->display);
|
||||
|
||||
wl_list_init(&wl->output_list);
|
||||
|
||||
if (!wl->display)
|
||||
@ -1213,6 +1204,8 @@ int vo_wayland_init(struct vo *vo)
|
||||
MP_VERBOSE(wl, "Compositor doesn't support the %s protocol!\n",
|
||||
zwp_idle_inhibit_manager_v1_interface.name);
|
||||
|
||||
wl->opts = mp_get_config_group(wl, wl->vo->global, &wayland_conf);
|
||||
wl->display_fd = wl_display_get_fd(wl->display);
|
||||
mp_make_wakeup_pipe(wl->wakeup_pipe);
|
||||
|
||||
return true;
|
||||
|
@ -27,7 +27,6 @@
|
||||
|
||||
struct wayland_opts {
|
||||
int disable_vsync;
|
||||
char *display_socket;
|
||||
int edge_pixels_pointer;
|
||||
int edge_pixels_touch;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user