summaryrefslogtreecommitdiff
path: root/src/fruits/ctv
diff options
context:
space:
mode:
Diffstat (limited to 'src/fruits/ctv')
-rw-r--r--src/fruits/ctv/ctv.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c
index 5f4a819..c7bd250 100644
--- a/src/fruits/ctv/ctv.c
+++ b/src/fruits/ctv/ctv.c
@@ -11,12 +11,12 @@
#include "../../server/common.c"
struct ctv {
- struct aki_event_loop loop;
+ struct nn_event_loop loop;
struct camu_screen scr;
struct camu_renderer *renderer;
struct camu_mixer mixer;
struct camu_sink sink;
- struct aki_thread thread;
+ struct nn_thread thread;
bool created;
};
@@ -37,10 +37,10 @@ static void screen_callback(void *userdata, u8 op, void *opaque)
(void)opaque;
}
-static aki_thread_result AKI_THREADCALL event_loop_thread(void *userdata)
+static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata)
{
struct ctv *c = (struct ctv *)userdata;
- aki_event_loop_run(&c->loop);
+ nn_event_loop_run(&c->loop);
return 0;
}
@@ -66,14 +66,14 @@ static void onSurfaceCreated(GLFMDisplay *display, s32 width, s32 height)
c->mixer.audio->configure_stream(c->mixer.audio, NULL);
camu_mixer_pick_format(&c->mixer, &c->mixer.fmt);
- aki_event_loop_init(&c->loop);
+ nn_event_loop_init(&c->loop);
camu_sink_init(&c->sink, &c->loop, &c->mixer, c->renderer);
c->sink.callback = sink_callback;
c->sink.userdata = c;
- camu_sink_connect(&c->sink, AKI_SOCKET_TCP, CAMU_SERVER_IP, CAMU_PORT, al_str_c("ctv"));
+ camu_sink_connect(&c->sink, NNWT_SOCKET_TCP, CAMU_SERVER_IP, CAMU_PORT, al_str_c("ctv"));
- aki_thread_create(&c->thread, event_loop_thread, c);
+ nn_thread_create(&c->thread, event_loop_thread, c);
c->created = true;
}
@@ -92,9 +92,10 @@ static void onDraw(GLFMDisplay *display)
}
}
-static s32 log_callback(void *userdata, char *message)
+static s32 log_callback(void *userdata, u8 level, char *message)
{
(void)userdata;
+ (void)level;
__android_log_print(ANDROID_LOG_DEBUG, "CTV", "%s", message);
s32 ret = al_strlen(message);
al_free(message);