Use aml v1

Author: any1

meson.build

@@ -56,7 +56,7 @@ xkbcommon = dependency('xkbcommon', version: '>=1.0.0')
 wayland_client = dependency('wayland-client')
 jansson = dependency('jansson')
 
-aml_version = ['>=0.3.0', '<0.4.0']
+aml_version = ['>=1.0.0', '<2.0.0']
 neatvnc_version = ['>=0.10', '<1.0.0']
 
 neatvnc_project = subproject(

src/ctl-server.c

@@ -700,10 +700,10 @@ static void recv_ready(struct ctl_client* client)
 		client_enqueue_internal_error(client, details);
 }
 
-static void on_ready(void* obj)
+static void on_ready(struct aml_handler* handler)
 {
-	struct ctl_client* client = aml_get_userdata(obj);
-	uint32_t events = aml_get_revents(obj);
+	struct ctl_client* client = aml_get_userdata(handler);
+	uint32_t events = aml_get_revents(handler);
 	nvnc_trace("Client %p ready: 0x%x", client, events);
 
 	if (events & AML_EVENT_WRITE)
@@ -712,10 +712,10 @@ static void on_ready(void* obj)
 		recv_ready(client);
 }
 
-static void on_connection(void* obj)
+static void on_connection(struct aml_handler* handler)
 {
 	nvnc_log(NVNC_LOG_DEBUG, "New connection");
-	struct ctl* server = aml_get_userdata(obj);
+	struct ctl* server = aml_get_userdata(handler);
 
 	struct ctl_client* client = calloc(1, sizeof(*client));
 	if (!client) {

src/data-control.c

@@ -73,7 +73,7 @@ static void destroy_send_context(struct send_context* ctx)
 	free(ctx);
 }
 
-static void on_receive(void* handler)
+static void on_receive(struct aml_handler* handler)
 {
 	struct receive_context* ctx = aml_get_userdata(handler);
 	int fd = aml_get_fd(handler);
@@ -101,7 +101,7 @@ static void on_receive(void* handler)
 	destroy_receive_context(ctx);
 }
 
-static void on_send(void* handler)
+static void on_send(struct aml_handler* handler)
 {
 	struct send_context* ctx = aml_get_userdata(handler);
 	int fd = aml_get_fd(handler);

src/ext-image-copy-capture.c

@@ -224,11 +224,10 @@ static void ext_image_copy_capture_schedule_capture(struct ext_image_copy_captur
 #endif
 }
 
-static void ext_image_copy_capture_schedule_from_timer(void* obj)
+static void ext_image_copy_capture_schedule_from_timer(struct aml_timer* timer)
 {
-	struct ext_image_copy_capture* self = aml_get_userdata(obj);
+	struct ext_image_copy_capture* self = aml_get_userdata(timer);
 	assert(self);
-
 	ext_image_copy_capture_schedule_capture(self);
 }
 
@@ -708,8 +707,8 @@ static struct screencopy* ext_image_copy_capture_create(struct wl_output* output
 	self->wl_output = output;
 	self->render_cursors = render_cursor;
 
-	self->timer = aml_timer_new(0, ext_image_copy_capture_schedule_from_timer, self,
-			NULL);
+	self->timer = aml_timer_new(0,
+			ext_image_copy_capture_schedule_from_timer, self, NULL);
 	assert(self->timer);
 
 	self->pool = wv_buffer_pool_create(NULL);
@@ -741,8 +740,8 @@ static struct screencopy* ext_image_copy_capture_create_cursor(struct wl_output*
 	self->wl_output = output;
 	self->wl_seat = seat;
 
-	self->timer = aml_timer_new(0, ext_image_copy_capture_schedule_from_timer, self,
-			NULL);
+	self->timer = aml_timer_new(0,
+			ext_image_copy_capture_schedule_from_timer, self, NULL);
 	assert(self->timer);
 
 	self->pool = wv_buffer_pool_create(NULL);

src/main.c

@@ -491,9 +491,9 @@ static void wayland_detach(struct wayvnc* self)
 		ctl_server_event_detached(self->ctl);
 }
 
-void on_wayland_event(void* obj)
+void on_wayland_event(struct aml_handler* handler)
 {
-	struct wayvnc* self = aml_get_userdata(obj);
+	struct wayvnc* self = aml_get_userdata(handler);
 
 	int rc MAYBE_UNUSED = wl_display_prepare_read(self->display);
 	assert(rc == 0);
@@ -602,7 +602,7 @@ void wayvnc_exit(struct wayvnc* self)
 	self->do_exit = true;
 }
 
-void on_signal(void* obj)
+void on_signal(struct aml_signal* obj)
 {
 	nvnc_log(NVNC_LOG_INFO, "Received termination signal.");
 	struct wayvnc* self = aml_get_userdata(obj);
@@ -1168,7 +1168,7 @@ int wayvnc_start_capture_immediate(struct wayvnc* self)
 	return rc;
 }
 
-static void on_capture_restart_timer(void* obj)
+static void on_capture_restart_timer(struct aml_timer* obj)
 {
 	struct wayvnc* self = aml_get_userdata(obj);
 	aml_unref(self->capture_retry_timer);
@@ -1345,7 +1345,7 @@ int check_cfg_sanity(struct cfg* cfg)
 	return 0;
 }
 
-static void on_perf_tick(void* obj)
+static void on_perf_tick(struct aml_ticker* obj)
 {
 	struct wayvnc* self = aml_get_userdata(obj);
 
@@ -2205,9 +2205,6 @@ int main(int argc, char* argv[])
 		self.selected_seat = seat;
 	}
 
-	if (aml_unstable_abi_version != AML_UNSTABLE_API)
-		nvnc_log(NVNC_LOG_PANIC, "libaml is incompatible with this build of wayvnc!");
-
 	enum socket_type default_socket_type = SOCKET_TYPE_TCP;
 	if (use_unix_socket)
 		default_socket_type = SOCKET_TYPE_UNIX;

src/screencopy.c

@@ -287,10 +287,9 @@ static int screencopy__start_capture(struct wlr_screencopy* self)
 	return 0;
 }
 
-static void screencopy__poll(void* obj)
+static void screencopy__poll(struct aml_timer* handler)
 {
-	struct wlr_screencopy* self = aml_get_userdata(obj);
-
+	struct wlr_screencopy* self = aml_get_userdata(handler);
 	screencopy__start_capture(self);
 }