mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-20 06:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MR 3421 fix: use addon destroy event for dst destroy

Browse source
This commit is contained in:
Alexander Courtis 2022-01-22 15:41:42 +11:00
parent b8245dcbf3
commit ca50ac6441
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
types/wlr_mirror.c
View file

@ -62,7 +62,6 @@ struct wlr_mirror_state {
struct wl_listener output_dst_enable; struct wl_listener output_dst_enable;
struct wl_listener output_dst_frame; struct wl_listener output_dst_frame;
struct wl_listener output_dst_destroy;
struct wlr_mirror_stats stats; struct wlr_mirror_stats stats;
}; };
@ -345,8 +344,8 @@ static void output_dst_handle_enable(struct wl_listener *listener, void *data) {
} }
} }
static void output_dst_handle_destroy(struct wl_listener *listener, void *data) { static void output_dst_addon_handle_destroy(struct wlr_addon *addon) {
struct wlr_mirror_state *state = wl_container_of(listener, state, output_dst_destroy); struct wlr_mirror_state *state = wl_container_of(addon, state, output_dst_addon);
struct wlr_mirror *mirror = state->mirror; struct wlr_mirror *mirror = state->mirror;
wlr_log(WLR_DEBUG, "Mirror dst '%s' destroyed", state->output_dst->name); wlr_log(WLR_DEBUG, "Mirror dst '%s' destroyed", state->output_dst->name);
@ -354,10 +353,6 @@ static void output_dst_handle_destroy(struct wl_listener *listener, void *data)
wlr_mirror_destroy(mirror); wlr_mirror_destroy(mirror);
} }
static void output_dst_addon_handle_destroy(struct wlr_addon *addon) {
// wlr_mirror_v1_destroy finishes addon, following output_dst_handle_destroy
}
static const struct wlr_addon_interface output_dst_addon_impl = { static const struct wlr_addon_interface output_dst_addon_impl = {
.name = "wlr_mirror_output_dst", .name = "wlr_mirror_output_dst",
.destroy = output_dst_addon_handle_destroy, .destroy = output_dst_addon_handle_destroy,
@ -404,10 +399,6 @@ struct wlr_mirror *wlr_mirror_create(struct wlr_mirror_params *params) {
wl_signal_add(&state->output_dst->events.enable, &state->output_dst_enable); wl_signal_add(&state->output_dst->events.enable, &state->output_dst_enable);
state->output_dst_enable.notify = output_dst_handle_enable; state->output_dst_enable.notify = output_dst_handle_enable;
wl_list_init(&state->output_dst_destroy.link);
wl_signal_add(&state->output_dst->events.destroy, &state->output_dst_destroy);
state->output_dst_destroy.notify = output_dst_handle_destroy;
wlr_log(WLR_DEBUG, "Mirror creating dst '%s'", state->output_dst->name); wlr_log(WLR_DEBUG, "Mirror creating dst '%s'", state->output_dst->name);
// srcs events // srcs events
@ -466,7 +457,6 @@ void wlr_mirror_destroy(struct wlr_mirror *mirror) {
// dst output events // dst output events
wl_list_remove(&state->output_dst_enable.link); wl_list_remove(&state->output_dst_enable.link);
wl_list_remove(&state->output_dst_frame.link); wl_list_remove(&state->output_dst_frame.link);
wl_list_remove(&state->output_dst_destroy.link);
// all src output events // all src output events
struct wlr_mirror_output_src *src, *next; struct wlr_mirror_output_src *src, *next;