Skip to content

Commit 2d2ba4c

Browse files
Wayland: switch to wl_proxy_marshal_flags
1 parent 94ad782 commit 2d2ba4c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/detection/displayserver/wayland.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ typedef struct WaylandData
1212
{
1313
const FFinstance* instance;
1414
FFlist* results;
15-
FF_LIBRARY_SYMBOL(wl_proxy_marshal_constructor_versioned)
15+
FF_LIBRARY_SYMBOL(wl_proxy_marshal_flags)
1616
FF_LIBRARY_SYMBOL(wl_proxy_add_listener)
1717
FF_LIBRARY_SYMBOL(wl_proxy_destroy)
1818
const struct wl_interface* ffwl_output_interface;
@@ -64,11 +64,11 @@ static void waylandOutputModeListener(void* data, struct wl_output* output, uint
6464

6565
static void waylandGlobalAddListener(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version)
6666
{
67-
if(strcmp(interface, "wl_output") == 0)
68-
{
69-
WaylandData* wldata = (WaylandData*) data;
67+
WaylandData* wldata = data;
7068

71-
struct wl_output* output = (struct wl_output*) wldata->ffwl_proxy_marshal_constructor_versioned((struct wl_proxy *) registry, WL_REGISTRY_BIND, wldata->ffwl_output_interface, version, name, wldata->ffwl_output_interface->name, version, NULL);
69+
if(strcmp(interface, wldata->ffwl_output_interface->name) == 0)
70+
{
71+
struct wl_output* output = (struct wl_output*) wldata->ffwl_proxy_marshal_flags((struct wl_proxy *) registry, WL_REGISTRY_BIND, wldata->ffwl_output_interface, version, 0, name, wldata->ffwl_output_interface->name, version, NULL);
7272
if(output == NULL)
7373
return;
7474

@@ -89,7 +89,7 @@ bool detectWayland(const FFinstance* instance, FFDisplayServerResult* result)
8989

9090
WaylandData data;
9191

92-
FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_marshal_constructor_versioned, wl_proxy_marshal_constructor_versioned, false)
92+
FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_marshal_flags, wl_proxy_marshal_flags, false)
9393
FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_add_listener, wl_proxy_add_listener, false)
9494
FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_output_interface, wl_output_interface, false)
9595
FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_destroy, wl_proxy_destroy, false)

0 commit comments

Comments
 (0)