diff options
Diffstat (limited to 'clients/weston-info.c')
-rw-r--r-- | clients/weston-info.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/clients/weston-info.c b/clients/weston-info.c index 49d64fef..9d42599a 100644 --- a/clients/weston-info.c +++ b/clients/weston-info.c @@ -34,7 +34,7 @@ #include "shared/helpers.h" #include "shared/os-compatibility.h" -#include "presentation_timing-client-protocol.h" +#include "presentation-time-client-protocol.h" typedef void (*print_info_t)(void *info); typedef void (*destroy_info_t)(void *info); @@ -105,7 +105,7 @@ struct seat_info { struct presentation_info { struct global_info global; - struct presentation *presentation; + struct wp_presentation *presentation; clockid_t clk_id; }; @@ -595,7 +595,7 @@ destroy_presentation_info(void *info) { struct presentation_info *prinfo = info; - presentation_destroy(prinfo->presentation); + wp_presentation_destroy(prinfo->presentation); } static const char * @@ -630,7 +630,7 @@ print_presentation_info(void *info) } static void -presentation_handle_clock_id(void *data, struct presentation *presentation, +presentation_handle_clock_id(void *data, struct wp_presentation *presentation, uint32_t clk_id) { struct presentation_info *prinfo = data; @@ -638,7 +638,7 @@ presentation_handle_clock_id(void *data, struct presentation *presentation, prinfo->clk_id = clk_id; } -static const struct presentation_listener presentation_listener = { +static const struct wp_presentation_listener presentation_listener = { presentation_handle_clock_id }; @@ -647,15 +647,16 @@ add_presentation_info(struct weston_info *info, uint32_t id, uint32_t version) { struct presentation_info *prinfo = xzalloc(sizeof *prinfo); - init_global_info(info, &prinfo->global, id, "presentation", version); + init_global_info(info, &prinfo->global, id, + wp_presentation_interface.name, version); prinfo->global.print = print_presentation_info; prinfo->global.destroy = destroy_presentation_info; prinfo->clk_id = -1; prinfo->presentation = wl_registry_bind(info->registry, id, - &presentation_interface, 1); - presentation_add_listener(prinfo->presentation, &presentation_listener, - prinfo); + &wp_presentation_interface, 1); + wp_presentation_add_listener(prinfo->presentation, + &presentation_listener, prinfo); info->roundtrip_needed = true; } |