summaryrefslogtreecommitdiff
path: root/src/fruits
diff options
context:
space:
mode:
Diffstat (limited to 'src/fruits')
-rw-r--r--src/fruits/cmc/cmc.c45
-rw-r--r--src/fruits/cmc/cmc.h2
-rw-r--r--src/fruits/cmc/ui/ui.c10
-rw-r--r--src/fruits/cmc/ui/ui.h8
-rw-r--r--src/fruits/cmsrv/cmsrv.c94
-rw-r--r--src/fruits/cmsrv/ui.c12
-rw-r--r--src/fruits/cmv/cmv.c70
-rw-r--r--src/fruits/common.h17
-rw-r--r--src/fruits/ctv/ctv.c17
9 files changed, 167 insertions, 108 deletions
diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c
index 3c62ba8..35f2d9b 100644
--- a/src/fruits/cmc/cmc.c
+++ b/src/fruits/cmc/cmc.c
@@ -1,8 +1,11 @@
-#include <aki/common.h>
-#include <aki/event_loop.h>
+#include <nnwt/common.h>
+#include <nnwt/event_loop.h>
+#include <nnwt/packet.h>
#include "../../portal/src/packet_ext.h"
-#include "../../server/common.c"
+#include "../../server/common.h"
+
+#include "../common.h"
#include "cmc.h"
@@ -23,16 +26,16 @@ static struct cmc_search *get_search_by_id(struct cmc *c, s32 id)
return NULL;
}
-static void parse_user_state(struct cmc *c, struct aki_packet *packet)
+static void parse_user_state(struct cmc *c, struct nn_packet *packet)
{
- u32 size = aki_packet_read_u32(packet);
+ u32 size = nn_packet_read_u32(packet);
for (u32 i = 0; i < size; i++) {
struct cmc_search *search = al_alloc_object(struct cmc_search);
- search->id = aki_packet_read_s32(packet);
+ search->id = nn_packet_read_s32(packet);
str s;
- aki_packet_read_str(packet, &s);
+ nn_packet_read_str(packet, &s);
al_str_clone(&search->module, &s);
- aki_packet_read_str(packet, &s);
+ nn_packet_read_str(packet, &s);
al_str_clone(&search->query, &s);
al_array_init(search->pages);
al_array_push(c->searches, search);
@@ -44,12 +47,12 @@ static void client_callback(void *userdata, u8 op, void *opaque)
struct cmc *c = (struct cmc *)userdata;
switch (op) {
case CAMU_CLIENT_LOGIN: {
- struct aki_packet *packet = (struct aki_packet *)opaque;
+ struct nn_packet *packet = (struct nn_packet *)opaque;
switch (c->command) {
case CLI_OPEN_UI:
parse_user_state(c, packet);
if (!cmc_ui_init(&c->ui, &c->loop, c)) {
- aki_event_loop_break_one(&c->loop);
+ nn_event_loop_break_one(&c->loop);
}
break;
case CLI_ADD: {
@@ -82,22 +85,22 @@ static void client_callback(void *userdata, u8 op, void *opaque)
break;
}
case CAMU_CLIENT_PAGE_RESULTS: {
- struct aki_packet *packet = (struct aki_packet *)opaque;
- s32 id = aki_packet_read_s32(packet);
+ struct nn_packet *packet = (struct nn_packet *)opaque;
+ s32 id = nn_packet_read_s32(packet);
struct cmc_search *search = get_search_by_id(c, id);
if (!search) return;
struct cmc_search_page *page = al_alloc_object(struct cmc_search_page);
- page->num = aki_packet_read_u32(packet);
- u32 posts = aki_packet_read_u32(packet);
+ page->num = nn_packet_read_u32(packet);
+ u32 posts = nn_packet_read_u32(packet);
for (u32 i = 0; i < posts; i++) {
struct camu_post post;
- aki_packet_read_post(packet, &post);
+ nn_packet_read_post(packet, &post);
camu_post_cache_push(&c->cache, &post);
}
- u32 ids = aki_packet_read_u32(packet);
+ u32 ids = nn_packet_read_u32(packet);
for (u32 i = 0; i < ids; i++) {
str unique_id;
- aki_packet_read_str(packet, &unique_id);
+ nn_packet_read_str(packet, &unique_id);
str s;
al_str_clone(&s, &unique_id);
al_array_push(page->list, s);
@@ -154,9 +157,9 @@ s32 main(s32 argc, char *argv[])
s32 wmain(s32 argc, wchar_t **argv)
#endif
{
- if (!aki_common_init()) return EXIT_FAILURE;
+ if (!nn_common_init()) return EXIT_FAILURE;
- aki_event_loop_init(&c.loop);
+ nn_event_loop_init(&c.loop);
al_array_init(c.args);
if (!parse_cmd(argc, argv)) return EXIT_FAILURE;
@@ -166,11 +169,11 @@ s32 wmain(s32 argc, wchar_t **argv)
c.client.callback = client_callback;
c.client.userdata = &c;
- if (!camu_client_login(&c.client, &c.loop, CAMU_LOCAL_TYPE, CAMU_LOCAL_ADDR, CAMU_PORT, al_str_c("andrew"))) {
+ if (!camu_client_login(&c.client, &c.loop, CAMU_TEST_TYPE, CAMU_TEST_ADDR, CAMU_PORT, al_str_c("andrew"))) {
return EXIT_FAILURE;
}
- aki_event_loop_run(&c.loop);
+ nn_event_loop_run(&c.loop);
cmc_ui_close(&c.ui);
diff --git a/src/fruits/cmc/cmc.h b/src/fruits/cmc/cmc.h
index 353bd87..96de27b 100644
--- a/src/fruits/cmc/cmc.h
+++ b/src/fruits/cmc/cmc.h
@@ -22,7 +22,7 @@ struct cmc_search {
};
struct cmc {
- struct aki_event_loop loop;
+ struct nn_event_loop loop;
u8 command;
array(str) args;
struct camu_client client;
diff --git a/src/fruits/cmc/ui/ui.c b/src/fruits/cmc/ui/ui.c
index 58d630f..b4c196d 100644
--- a/src/fruits/cmc/ui/ui.c
+++ b/src/fruits/cmc/ui/ui.c
@@ -27,7 +27,7 @@ static void input_poll_callback(void *userdata, s32 revents)
if (input.evtype == NCTYPE_PRESS || input.evtype == NCTYPE_UNKNOWN) {
switch (input.id) {
case 'q':
- aki_event_loop_break_one(ui->loop);
+ nn_event_loop_break_one(ui->loop);
break;
}
}
@@ -44,7 +44,7 @@ static void input_poll_callback(void *userdata, s32 revents)
} while (1);
}
-bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c)
+bool cmc_ui_init(struct cmc_ui *ui, struct nn_event_loop *loop, struct cmc *c)
{
al_memset(ui, 0, sizeof(struct cmc_ui));
ui->c = c;
@@ -57,9 +57,9 @@ bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c)
struct ncplane *stdplane = notcurses_stdplane(ui->nc);
ncplane_set_resizecb(stdplane, resize_cb);
ncplane_set_userptr(stdplane, ui);
- aki_poll_init(&ui->input_poll, input_poll_callback, ui);
- aki_poll_set(&ui->input_poll, notcurses_inputready_fd(ui->nc), AKI_POLL_READ);
- aki_poll_start(&ui->input_poll, ui->loop);
+ nn_poll_init(&ui->input_poll, input_poll_callback, ui);
+ nn_poll_set(&ui->input_poll, notcurses_inputready_fd(ui->nc), NNWT_POLL_READ);
+ nn_poll_start(&ui->input_poll, ui->loop);
ui->pane = CMC_PANE_SEARCH;
return true;
}
diff --git a/src/fruits/cmc/ui/ui.h b/src/fruits/cmc/ui/ui.h
index 1a49985..1c3b9d9 100644
--- a/src/fruits/cmc/ui/ui.h
+++ b/src/fruits/cmc/ui/ui.h
@@ -1,7 +1,7 @@
#pragma once
#include <al/types.h>
-#include <aki/event_loop.h>
+#include <nnwt/event_loop.h>
#include <notcurses/notcurses.h>
enum {
@@ -11,11 +11,11 @@ enum {
struct cmc;
struct cmc_ui {
struct notcurses *nc;
- struct aki_event_loop *loop;
+ struct nn_event_loop *loop;
u32 term_cols;
u32 term_rows;
bool pending_layout;
- struct aki_poll input_poll;
+ struct nn_poll input_poll;
u8 pane;
struct {
struct ncplane *n;
@@ -24,7 +24,7 @@ struct cmc_ui {
struct cmc *c;
};
-bool cmc_ui_init(struct cmc_ui *ui, struct aki_event_loop *loop, struct cmc *c);
+bool cmc_ui_init(struct cmc_ui *ui, struct nn_event_loop *loop, struct cmc *c);
void cmc_ui_close(struct cmc_ui *ui);
void cmc_sp_init(struct cmc_ui *ui);
diff --git a/src/fruits/cmsrv/cmsrv.c b/src/fruits/cmsrv/cmsrv.c
index 5eb9fee..53555d3 100644
--- a/src/fruits/cmsrv/cmsrv.c
+++ b/src/fruits/cmsrv/cmsrv.c
@@ -1,32 +1,34 @@
#define CAMU_LOCAL_SOCKET
#include <al/log.h>
-#include <aki/common.h>
+#include <nnwt/common.h>
#ifdef CAMU_LOCAL_SOCKET
-#include <aki/line_processor.h>
+#include <nnwt/line_processor.h>
#endif
-#include <aki/timer.h>
+#include <nnwt/timer.h>
#include "../../server/server.h"
#include "../../server/common.h"
#include "../../cache/handlers/cdio.h"
#include "../../codec/ffmpeg/common.h"
+#include "../common.h"
+
#include "ui.h"
struct cmsrv {
- struct aki_event_loop loop;
- struct aki_signal quit_signal;
+ struct nn_event_loop loop;
+ struct nn_signal quit_signal;
struct camu_server server;
#ifdef CAMU_LOCAL_SOCKET
struct {
- struct aki_socket sock;
- struct aki_line_processor cli;
+ struct nn_socket sock;
+ struct nn_line_processor cli;
} local;
#endif
struct cmsrv_ui ui;
- struct aki_poll input_poll;
- struct aki_timer render_timer;
+ struct nn_poll input_poll;
+ struct nn_timer render_timer;
};
#ifdef CAMU_LOCAL_SOCKET
@@ -49,25 +51,34 @@ static u8 server_line_callback(void *userdata, str *line)
} else if (al_str_eq(line, al_str_c(";CLEAR"))) {
lia_list_clear(list);
} else {
- struct aki_packet *packet = aki_packet_create();
+ struct nn_packet *packet = nn_packet_create();
+#ifdef CAMU_HAVE_PORTAL
if (al_str_at(line, 0) == ';' || camu_is_url(line, 0)) {
- aki_packet_write_u8(packet, CAMU_RESOURCE_SIMPLE_SEARCH);
+ nn_packet_write_u8(packet, CAMU_RESOURCE_SIMPLE_SEARCH);
+#elif defined NAUNET_HAS_CURL
+ if (camu_is_url(line, 0)) {
+ nn_packet_write_u8(packet, CAMU_RESOURCE_HTTP);
+#endif
+#if CACHE_HAVE_CDIO
+ } else if (al_str_cmp(line, al_str_c("cdda://"), 0, 7) == 0) {
+ nn_packet_write_u8(packet, CAMU_RESOURCE_CDIO);
+#endif
} else {
- aki_packet_write_u8(packet, CAMU_RESOURCE_FILE);
+ nn_packet_write_u8(packet, CAMU_RESOURCE_FILE);
}
- aki_packet_write_str(packet, line);
+ nn_packet_write_str(packet, line);
camu_server_local_add(&s->server, packet);
}
- return AKI_LINE_PROCESSOR_CONTINUE;
+ return NNWT_LINE_PROCESSOR_CONTINUE;
}
#endif
-static void render_timer_callback(void *userdata, struct aki_timer *timer)
+static void render_timer_callback(void *userdata, struct nn_timer *timer)
{
struct cmsrv *s = (struct cmsrv *)userdata;
(void)timer;
cmsrv_ui_render(&s->ui);
- aki_timer_again(&s->render_timer);
+ nn_timer_again(&s->render_timer);
}
static void input_poll_callback(void *userdata, s32 revents)
@@ -80,7 +91,7 @@ static void input_poll_callback(void *userdata, s32 revents)
if (input.evtype == NCTYPE_PRESS || input.evtype == NCTYPE_UNKNOWN) {
switch (input.id) {
case 'q':
- aki_event_loop_break_one(&s->loop);
+ nn_event_loop_break_one(&s->loop);
break;
case '1':
cmsrv_ui_set_pane(&s->ui, CMSRV_UI_LISTS);
@@ -99,13 +110,13 @@ static void input_poll_callback(void *userdata, s32 revents)
static void quit_signal_callback(void *userdata)
{
struct cmsrv *s = (struct cmsrv *)userdata;
- aki_event_loop_break_one(&s->loop);
+ nn_event_loop_break_one(&s->loop);
}
-static s32 log_callback(void *userdata, char *message, const char *color)
+static s32 log_callback(void *userdata, u8 level, char *message)
{
struct cmsrv *s = (struct cmsrv *)userdata;
- (void)color;
+ (void)level;
cmsrv_ui_push_message(&s->ui, message);
return al_strlen(message);
}
@@ -115,7 +126,7 @@ static struct cmsrv s = { 0 };
static void sigint_handler(s32 signum)
{
(void)signum;
- aki_signal_send(&s.quit_signal);
+ nn_signal_send(&s.quit_signal);
}
#ifndef _WIN32
@@ -126,7 +137,7 @@ s32 wmain(s32 argc, wchar_t **argv)
{
(void)argc;
(void)argv;
- if (!aki_common_init() || !cmsrv_ui_init(&s.ui, &s.server)) return EXIT_FAILURE;
+ if (!nn_common_init() || !cmsrv_ui_init(&s.ui, &s.server)) return EXIT_FAILURE;
signal(SIGINT, sigint_handler);
@@ -136,36 +147,35 @@ s32 wmain(s32 argc, wchar_t **argv)
camu_ff_set_default_log_callback();
#endif
- aki_event_loop_init(&s.loop);
+ nn_event_loop_init(&s.loop);
- aki_signal_init(&s.quit_signal, &s.loop, quit_signal_callback, &s);
- aki_signal_start(&s.quit_signal);
+ nn_signal_init(&s.quit_signal, &s.loop, quit_signal_callback, &s);
+ nn_signal_start(&s.quit_signal);
- if (!camu_server_init(&s.server, CAMU_LOCAL_TYPE, &s.loop)) return EXIT_FAILURE;
- camu_server_listen(&s.server, CAMU_LOCAL_ADDR, CAMU_PORT);
+ if (!camu_server_init(&s.server, CAMU_TEST_TYPE, &s.loop)) return EXIT_FAILURE;
+ camu_server_listen(&s.server, CAMU_TEST_ADDR, CAMU_PORT);
#ifdef CAMU_LOCAL_SOCKET
- s.local.sock.type = AKI_SOCKET_UNIX;
- aki_socket_init(&s.local.sock);
- aki_socket_set_blocking(&s.local.sock, false);
+ s.local.sock.type = NNWT_SOCKET_UNIX;
+ nn_socket_init(&s.local.sock, NNWT_SOCKET_NONBLOCKING);
s.local.cli.callback = server_line_callback;
s.local.cli.userdata = &s;
- aki_line_processor_init(&s.local.cli, al_str_c("\n"));
- aki_line_processor_open_socket(&s.local.cli, &s.local.sock);
- if (aki_socket_bind(&s.local.sock, CAMU_UNIX_LOCAL, 0) && aki_socket_listen(&s.local.sock)) {
- aki_line_processor_run(&s.local.cli, &s.loop);
+ nn_line_processor_init(&s.local.cli, al_str_c("\n"));
+ nn_line_processor_open_socket(&s.local.cli, &s.local.sock);
+ if (nn_socket_bind(&s.local.sock, CAMU_TEST_CONTROL_PATH, 0) && nn_socket_listen(&s.local.sock)) {
+ nn_line_processor_run(&s.local.cli, &s.loop);
}
#endif
- aki_poll_init(&s.input_poll, input_poll_callback, &s);
- aki_poll_set(&s.input_poll, cmsrv_ui_get_input_fd(&s.ui), AKI_POLL_READ);
- aki_poll_start(&s.input_poll, &s.loop);
+ nn_poll_init(&s.input_poll, input_poll_callback, &s);
+ nn_poll_set(&s.input_poll, cmsrv_ui_get_input_fd(&s.ui), NNWT_POLL_READ);
+ nn_poll_start(&s.input_poll, &s.loop);
- aki_timer_init(&s.render_timer, &s.loop, render_timer_callback, &s);
- aki_timer_set_repeat(&s.render_timer, AKI_TS_FROM_USEC(100000));
- aki_timer_again(&s.render_timer);
+ nn_timer_init(&s.render_timer, &s.loop, render_timer_callback, &s);
+ nn_timer_set_repeat(&s.render_timer, NNWT_TS_FROM_USEC(100000));
+ nn_timer_again(&s.render_timer);
- aki_event_loop_run(&s.loop);
+ nn_event_loop_run(&s.loop);
cmsrv_ui_close(&s.ui);
@@ -173,7 +183,7 @@ s32 wmain(s32 argc, wchar_t **argv)
camu_ff_free_default_log_callback();
#endif
- aki_common_close();
+ nn_common_close();
return EXIT_SUCCESS;
}
diff --git a/src/fruits/cmsrv/ui.c b/src/fruits/cmsrv/ui.c
index 0c26881..5d35380 100644
--- a/src/fruits/cmsrv/ui.c
+++ b/src/fruits/cmsrv/ui.c
@@ -1,6 +1,8 @@
#include <al/lib.h>
#include <al/log.h>
+#include "../../server/common.h"
+
#include "ui.h"
#define LOG_RATIO 1.5
@@ -145,7 +147,15 @@ static void render_lists(struct cmsrv_ui *ui)
ncplane_putchar_yx(n, y, 1, '>');
x += 2;
}
- putnwstr_maxwidth_yx(n, y, x, max_width - x, &entry->name);
+ wstr *name = &entry->name;
+#ifdef CAMU_HAVE_PORTAL
+ struct camu_resource *resource = (struct camu_resource *)entry->opaque;
+ if (resource->type == CAMU_RESOURCE_PORTAL) {
+ struct camu_resource_portal *portal = (struct camu_resource_portal *)resource;
+ name = &portal->post->title;
+ }
+#endif
+ putnwstr_maxwidth_yx(n, y, x, max_width - x, name);
if (++current_line >= max_height) break;
}
}
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 0fe33ad..8509485 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -1,18 +1,21 @@
#include <al/log.h>
-#include <aki/event_loop.h>
-#include <aki/thread.h>
+#include <nnwt/event_loop.h>
+#include <nnwt/thread.h>
#include "../../sink/desktop.h"
#include "../../server/common.h"
#include "../../codec/ffmpeg/common.h"
#ifndef CAMU_SINK_ONLY
#include "../../server/server.h"
-#else
-#include "../../server/common.c"
#endif
+#include "../../server/common.h"
+
+#include "../common.h"
+
+static str *CMV_UNIX_PATH = al_str_c("/tmp/cmv_sock");
struct cmv {
- struct aki_event_loop loop;
+ struct nn_event_loop loop;
struct camu_desktop desktop;
#ifndef CAMU_SINK_ONLY
struct camu_server server;
@@ -28,10 +31,10 @@ static void exit_callback(void *userdata, struct camu_desktop *desktop)
}
#endif
-static aki_thread_result AKI_THREADCALL event_loop_thread(void *userdata)
+static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata)
{
struct cmv *c = (struct cmv *)userdata;
- aki_event_loop_run(&c->loop);
+ nn_event_loop_run(&c->loop);
return 0;
}
@@ -53,7 +56,7 @@ s32 main(s32 argc, char *argv[])
s32 wmain(s32 argc, wchar_t **argv)
#endif
{
- if (!aki_common_init() || !stl_global_init(false)) {
+ if (!nn_common_init() || !stl_global_init(false)) {
return EXIT_FAILURE;
}
@@ -65,22 +68,26 @@ s32 wmain(s32 argc, wchar_t **argv)
camu_ff_set_default_log_callback();
#endif
- aki_event_loop_init(&c.loop);
+ nn_event_loop_init(&c.loop);
u8 type;
str *addr;
#ifndef CAMU_SINK_ONLY
bool local = argc > 1;
if (local) {
- type = AKI_SOCKET_UNIX; addr = CAMU_UNIX_LOCAL;
+#ifndef _WIN32
+ type = NNWT_SOCKET_UNIX; addr = CMV_UNIX_PATH;
+#else
+ type = NNWT_SOCKET_TCP; addr = CAMU_LOCALHOST;
+#endif
if (!camu_server_init(&c.server, type, &c.loop)) failure();
if (!camu_server_listen(&c.server, addr, CAMU_PORT)) failure();
} else {
- type = CAMU_LOCAL_TYPE;
- addr = CAMU_LOCAL_ADDR;
+ type = CAMU_TEST_TYPE;
+ addr = CAMU_TEST_ADDR;
}
#else
- type = AKI_SOCKET_TCP; addr = CAMU_SERVER_IP;
+ type = NNWT_SOCKET_TCP; addr = CAMU_SERVER_IP;
#endif
#ifndef CAMU_SINK_ONLY
@@ -90,18 +97,29 @@ s32 wmain(s32 argc, wchar_t **argv)
str arg = *al_str_cr(argv[i]);
#else
str arg;
- al_wstr_to_str(al_wstr_cr(argv[i]), &arg);
+ if (!al_wstr_to_str(al_wstr_cr(argv[i]), &arg)) {
+ al_log_error("cmv", "Failed to parse argument #%i.", i);
+ continue;
+ }
+#endif
+ struct nn_packet *packet = nn_packet_create();
+#ifdef CAMU_HAVE_PORTAL
+ if (al_str_at(&arg, 0) == ';' || camu_is_url(&arg, 0)) {
+ nn_packet_write_u8(packet, CAMU_RESOURCE_SIMPLE_SEARCH);
+#elif defined NAUNET_HAS_CURL
+ if (camu_is_url(&arg, 0)) {
+ nn_packet_write_u8(packet, CAMU_RESOURCE_HTTP);
+#endif
+#if CACHE_HAVE_CDIO
+ } else if (al_str_cmp(&arg, al_str_c("cdda://"), 0, 7) == 0) {
+ nn_packet_write_u8(packet, CAMU_RESOURCE_CDIO);
#endif
- struct aki_packet *packet = aki_packet_create();
- if (al_str_at(&arg, 0) == ';') {
- aki_packet_write_u8(packet, CAMU_RESOURCE_PORTAL);
- aki_packet_write_str(packet, al_str_substr(&arg, 1, arg.len));
} else {
- aki_packet_write_u8(packet, CAMU_RESOURCE_FILE);
- aki_packet_write_str(packet, &arg);
+ nn_packet_write_u8(packet, CAMU_RESOURCE_FILE);
}
+ nn_packet_write_str(packet, &arg);
camu_server_local_add(&c.server, packet);
- aki_packet_free(packet);
+ nn_packet_free(packet);
}
}
#else
@@ -118,13 +136,13 @@ s32 wmain(s32 argc, wchar_t **argv)
#endif
if (!camu_desktop_connect(&c.desktop, type, &c.loop, addr, CAMU_PORT)) failure();
- struct aki_thread thread0;
- aki_thread_create(&thread0, event_loop_thread, &c);
+ struct nn_thread thread0;
+ nn_thread_create(&thread0, event_loop_thread, &c);
while (camu_desktop_tick(&c.desktop)) {}
camu_desktop_stop(&c.desktop);
- aki_thread_join(&thread0);
+ nn_thread_join(&thread0);
camu_desktop_free(&c.desktop);
#ifndef CAMU_SINK_ONLY
camu_server_free(&c.server);
@@ -132,14 +150,14 @@ s32 wmain(s32 argc, wchar_t **argv)
ret = EXIT_SUCCESS;
out:
- aki_event_loop_destroy(&c.loop);
+ nn_event_loop_destroy(&c.loop);
#ifdef CAMU_HAVE_FFMPEG
camu_ff_free_default_log_callback();
#endif
stl_global_close();
- aki_common_close();
+ nn_common_close();
return ret;
}
diff --git a/src/fruits/common.h b/src/fruits/common.h
new file mode 100644
index 0000000..c7b432a
--- /dev/null
+++ b/src/fruits/common.h
@@ -0,0 +1,17 @@
+#include <al/str.h>
+#include <nnwt/socket.h>
+
+AL_UNUSED_VARIABLE_PUSH
+
+static str *CAMU_DB_PATH = al_str_c("/home/andrew/c/camu/data/camu_db_test");
+
+static str *CAMU_TEST_IP = al_str_c("108.52.160.112");
+static str *CAMU_LOCALHOST = al_str_c("127.0.0.1");
+
+static str *CAMU_TEST_PATH = al_str_c("/tmp/camu_sock");
+static str *CAMU_TEST_CONTROL_PATH = al_str_c("/tmp/camu_control_sock");
+
+AL_UNUSED_VARIABLE_POP
+
+#define CAMU_TEST_TYPE NNWT_SOCKET_TCP
+#define CAMU_TEST_ADDR CAMU_TEST_IP
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);
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 16:52:39 +0000