diff options
Diffstat (limited to 'src/sink')
| -rw-r--r-- | src/sink/desktop.c | 2 | ||||
| -rw-r--r-- | src/sink/desktop.h | 6 | ||||
| -rw-r--r-- | src/sink/input_simulator.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/sink/desktop.c b/src/sink/desktop.c index ccd2e11..4a1b9ca 100644 --- a/src/sink/desktop.c +++ b/src/sink/desktop.c @@ -101,7 +101,7 @@ bool camu_desktop_init(struct camu_desktop *c, const char *name) return true; } -bool camu_desktop_connect(struct camu_desktop *c, u8 type, struct aki_event_loop *loop, str *addr, u16 port) +bool camu_desktop_connect(struct camu_desktop *c, u8 type, struct nn_event_loop *loop, str *addr, u16 port) { c->loop = loop; camu_sink_init(&c->sink, c->loop, &c->mixer, c->renderer); diff --git a/src/sink/desktop.h b/src/sink/desktop.h index efc1c34..2b3ec94 100644 --- a/src/sink/desktop.h +++ b/src/sink/desktop.h @@ -2,14 +2,14 @@ #include <al/types.h> #include <al/str.h> -#include <aki/event_loop.h> +#include <nnwt/event_loop.h> #include "../libsink/sink.h" #include "../screen/screen.h" struct camu_desktop { - struct aki_event_loop *loop; + struct nn_event_loop *loop; s32 should_quit; struct camu_screen scr; struct camu_renderer *renderer; @@ -20,7 +20,7 @@ struct camu_desktop { }; bool camu_desktop_init(struct camu_desktop *c, const char *name); -bool camu_desktop_connect(struct camu_desktop *c, u8 type, struct aki_event_loop *loop, str *addr, u16 port); +bool camu_desktop_connect(struct camu_desktop *c, u8 type, struct nn_event_loop *loop, str *addr, u16 port); bool camu_desktop_tick(struct camu_desktop *c); void camu_desktop_stop(struct camu_desktop *c); void camu_desktop_free(struct camu_desktop *c); diff --git a/src/sink/input_simulator.c b/src/sink/input_simulator.c index af0105d..773ac95 100644 --- a/src/sink/input_simulator.c +++ b/src/sink/input_simulator.c @@ -1,28 +1,28 @@ #include "../screen/screen.h" #ifdef CAMU_SCREEN_DEBUG_KEY -#include <aki/thread.h> +#include <nnwt/thread.h> #include <al/random.h> #include "input_simulator.h" // This is ignoring all thread-safety. static s32 quit = 1; -static struct aki_thread thread; +static struct nn_thread thread; enum { SKIP, BACKSKIP, - SHUFFLE, TOGGLE_PAUSE, + SHUFFLE, SEEK, MARK, // count }; -static aki_thread_result AKI_THREADCALL input_simulation_thread(void *userdata) +static nn_thread_result NNWT_THREADCALL input_simulation_thread(void *userdata) { struct camu_sink *sink = (struct camu_sink *)userdata; while (!quit) { - aki_thread_sleep(AKI_TS_FROM_USEC(30000)); + nn_thread_sleep(NNWT_TS_FROM_USEC(30000)); switch (al_rand() % MARK) { case SKIP: camu_sink_skip(sink, (al_rand() % 5)); @@ -47,7 +47,7 @@ static aki_thread_result AKI_THREADCALL input_simulation_thread(void *userdata) void camu_input_simulator_run(struct camu_sink *sink) { quit = 0; - aki_thread_create(&thread, input_simulation_thread, sink); + nn_thread_create(&thread, input_simulation_thread, sink); } bool camu_input_simulator_running(void) @@ -58,6 +58,6 @@ bool camu_input_simulator_running(void) void camu_input_simulator_stop(void) { quit = 1; - aki_thread_join(&thread); + nn_thread_join(&thread); } #endif |