mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshooter: stop using frame_signal void *data parameter to get weston_output

Browse Source 
Instead of getting weston_output from the frame_signal argument 'void *data',
add weston_output in the private data struct of the users that are listening
to frame_signal. With this change we are able to pass previous_damage as the
data argument.

Signed-off-by: Leandro Ribeiro <leandrohr@riseup.net>
This commit is contained in:
Leandro Ribeiro
2019-11-27 12:43:01 -03:00
parent 2619bfe420
commit dd0d0b0df1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/screenshooter.c
+4 -2
View File
@@ -46,6 +46,7 @@
struct screenshooter_frame_listener { struct screenshooter_frame_listener {
struct wl_listener listener; struct wl_listener listener;
struct weston_buffer *buffer; struct weston_buffer *buffer;
struct weston_output *output;
weston_screenshooter_done_func_t done; weston_screenshooter_done_func_t done;
void *data; void *data;
}; };
@@ -119,7 +120,7 @@ screenshooter_frame_notify(struct wl_listener *listener, void *data)
struct screenshooter_frame_listener *l = struct screenshooter_frame_listener *l =
container_of(listener, container_of(listener,
struct screenshooter_frame_listener, listener); struct screenshooter_frame_listener, listener);
struct weston_output *output = data; struct weston_output *output = l->output;
struct weston_compositor *compositor = output->compositor; struct weston_compositor *compositor = output->compositor;
int32_t stride; int32_t stride;
uint8_t *pixels, *d, *s; uint8_t *pixels, *d, *s;
@@ -202,6 +203,7 @@ weston_screenshooter_shoot(struct weston_output *output,
} }
l->buffer = buffer; l->buffer = buffer;
l->output = output;
l->done = done; l->done = done;
l->data = data; l->data = data;
l->listener.notify = screenshooter_frame_notify; l->listener.notify = screenshooter_frame_notify;
@@ -261,7 +263,7 @@ weston_recorder_frame_notify(struct wl_listener *listener, void *data)
{ {
struct weston_recorder *recorder = struct weston_recorder *recorder =
container_of(listener, struct weston_recorder, frame_listener); container_of(listener, struct weston_recorder, frame_listener);
struct weston_output *output = data; struct weston_output *output = recorder->output;
struct weston_compositor *compositor = output->compositor; struct weston_compositor *compositor = output->compositor;
uint32_t msecs = timespec_to_msec(&output->frame_time); uint32_t msecs = timespec_to_msec(&output->frame_time);
pixman_box32_t *r; pixman_box32_t *r;