summaryrefslogtreecommitdiff
path: root/src/screen
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen')
-rw-r--r--src/screen/screen.c42
-rw-r--r--src/screen/screen.h6
2 files changed, 24 insertions, 24 deletions
diff --git a/src/screen/screen.c b/src/screen/screen.c
index 5b5d175..17f4e3b 100644
--- a/src/screen/screen.c
+++ b/src/screen/screen.c
@@ -1,5 +1,5 @@
#include <al/log.h>
-#include <aki/thread.h>
+#include <nnwt/thread.h>
#include "view.h"
#include "screen.h"
@@ -79,11 +79,11 @@ static bool mouse_button_callback(void *userdata, u8 state, u8 button)
switch (state) {
case STELA_BUTTON_PRESSED:
scr->flags |= CAMU_SCREEN_DRAGGING;
- scr->last_click_ts = aki_get_timestamp();
+ scr->last_click_ts = nn_get_timestamp();
break;
case STELA_BUTTON_RELEASED:
scr->flags &= ~CAMU_SCREEN_DRAGGING;
- if (scr->last_click_ts && aki_get_timestamp() - scr->last_click_ts <= 300000) {
+ if (scr->last_click_ts && nn_get_timestamp() - scr->last_click_ts <= 300000) {
if (scr->flags & CAMU_SCREEN_MODIFIER) {
f64 percent = scr->last_mouse_x / scr->width;
percent = CLAMP(percent, 0.0, 100.0);
@@ -285,7 +285,7 @@ bool camu_screen_init(struct camu_screen *scr, void *context)
al_array_init(scr->add_queue);
al_array_init(scr->rem_queue);
al_atomic_store(u8)(&scr->queued, 0, AL_ATOMIC_RELAXED);
- aki_mutex_init(&scr->mutex);
+ nn_mutex_init(&scr->mutex);
#endif
scr->last_mouse_x = 0.0;
scr->last_mouse_y = 0.0;
@@ -294,7 +294,7 @@ bool camu_screen_init(struct camu_screen *scr, void *context)
}
#ifdef STELA_EVENT_BUFFER
-static aki_thread_result AKI_THREADCALL event_thread(void *userdata)
+static nn_thread_result NNWT_THREADCALL event_thread(void *userdata)
{
struct camu_screen *scr = (struct camu_screen *)userdata;
while (scr->window->poll(scr->window, true) && al_atomic_load(s32)(&scr->state, AL_ATOMIC_RELAXED) != CAMU_SCREEN_STOPPED) {
@@ -313,7 +313,7 @@ bool camu_screen_create_window(struct camu_screen *scr, const char *name)
scr->width = scr->window->width;
scr->height = scr->window->height;
#ifdef STELA_EVENT_BUFFER
- aki_thread_create(&scr->thread, event_thread, scr);
+ nn_thread_create(&scr->thread, event_thread, scr);
#endif
return true;
}
@@ -407,11 +407,11 @@ static void run_queue_internal(struct camu_screen *scr)
void camu_screen_add_buffer(struct camu_screen *scr, struct camu_video_buffer *buf)
{
#ifdef CAMU_SCREEN_THREADED
- aki_mutex_lock(&scr->mutex);
+ nn_mutex_lock(&scr->mutex);
struct camu_video_buffer *rbuf;
al_array_foreach(scr->add_queue, i, rbuf) {
if (rbuf == buf) {
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
return;
}
}
@@ -422,13 +422,13 @@ void camu_screen_add_buffer(struct camu_screen *scr, struct camu_video_buffer *b
if (queue_empty) {
al_atomic_store(u8)(&scr->queued, 0, AL_ATOMIC_RELAXED);
}
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
return;
}
}
al_array_push(scr->add_queue, buf);
al_atomic_store(u8)(&scr->queued, 1, AL_ATOMIC_RELAXED);
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
#else
add_buffer_internal(scr, buf);
#endif
@@ -438,11 +438,11 @@ void camu_screen_add_buffer(struct camu_screen *scr, struct camu_video_buffer *b
void camu_screen_remove_buffer(struct camu_screen *scr, struct camu_video_buffer *buf)
{
#ifdef CAMU_SCREEN_THREADED
- aki_mutex_lock(&scr->mutex);
+ nn_mutex_lock(&scr->mutex);
struct camu_video_buffer *rbuf;
al_array_foreach(scr->rem_queue, i, rbuf) {
if (rbuf == buf) {
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
return;
}
}
@@ -453,13 +453,13 @@ void camu_screen_remove_buffer(struct camu_screen *scr, struct camu_video_buffer
if (queue_empty) {
al_atomic_store(u8)(&scr->queued, 0, AL_ATOMIC_RELAXED);
}
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
return;
}
}
al_array_push(scr->rem_queue, buf);
al_atomic_store(u8)(&scr->queued, 1, AL_ATOMIC_RELAXED);
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
#else
remove_buffer_internal(scr, buf);
#endif
@@ -469,21 +469,21 @@ void camu_screen_remove_buffer(struct camu_screen *scr, struct camu_video_buffer
#ifdef CAMU_SCREEN_THREADED
void camu_screen_run_queue(struct camu_screen *scr)
{
- aki_mutex_lock(&scr->mutex);
+ nn_mutex_lock(&scr->mutex);
run_queue_internal(scr);
al_atomic_store(u8)(&scr->queued, 0, AL_ATOMIC_RELAXED);
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
}
void camu_screen_clear(struct camu_screen *scr)
{
- aki_mutex_lock(&scr->mutex);
+ nn_mutex_lock(&scr->mutex);
struct camu_screen_video *video;
al_array_foreach_ptr(scr->videos, i, video) {
struct camu_video_buffer *buf = video->buf;
al_atomic_store(u8)(&buf->ref, 0, AL_ATOMIC_RELAXED);
}
- aki_mutex_unlock(&scr->mutex);
+ nn_mutex_unlock(&scr->mutex);
}
#endif
@@ -498,7 +498,7 @@ bool camu_screen_poll(struct camu_screen *scr, bool block)
{
#ifdef STELA_EVENT_BUFFER
if (block) {
- aki_thread_sleep(AKI_TS_FROM_USEC(1000000/CAMU_SCREEN_POLL_HZ));
+ nn_thread_sleep(NNWT_TS_FROM_USEC(1000000/CAMU_SCREEN_POLL_HZ));
}
stl_window_read_events(scr->window);
#else
@@ -534,12 +534,12 @@ void camu_screen_close(struct camu_screen *scr)
#ifdef CAMU_SCREEN_THREADED
al_array_free(scr->add_queue);
al_array_free(scr->rem_queue);
- aki_mutex_destroy(&scr->mutex);
+ nn_mutex_destroy(&scr->mutex);
#endif
al_array_free(scr->videos);
al_atomic_store(s32)(&scr->state, CAMU_SCREEN_STOPPED, AL_ATOMIC_RELAXED);
#ifdef STELA_EVENT_BUFFER
- aki_thread_join(&scr->thread);
+ nn_thread_join(&scr->thread);
#endif
scr->window->free(&scr->window);
}
diff --git a/src/screen/screen.h b/src/screen/screen.h
index 349d41f..80f888c 100644
--- a/src/screen/screen.h
+++ b/src/screen/screen.h
@@ -3,7 +3,7 @@
#include <al/array.h>
#include <al/atomic.h>
#ifdef CAMU_SCREEN_THREADED
-#include <aki/thread.h>
+#include <nnwt/thread.h>
#endif
#include <stl/window.h>
@@ -53,7 +53,7 @@ struct camu_screen {
u32 flags;
struct stl_window *window;
#ifdef STELA_EVENT_BUFFER
- struct aki_thread thread;
+ struct nn_thread thread;
#endif
struct camu_renderer *renderer;
s32 width;
@@ -66,7 +66,7 @@ struct camu_screen {
array(struct camu_video_buffer *) add_queue;
array(struct camu_video_buffer *) rem_queue;
atomic(u8) queued;
- struct aki_mutex mutex;
+ struct nn_mutex mutex;
#endif
void (*callback)(void *, u8, void *);
void *userdata;
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 16:59:14 +0000