From 197d41a3e23cab35848f623c6133baccc62aacbe Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 26 Aug 2026 17:56:52 -0400 Subject: OSD stuff and Android fixes Signed-off-by: Andrew Opalach --- src/fruits/ctv/ctv.c | 74 ---------------------------------------------- src/fruits/ctv/meson.build | 4 --- 2 files changed, 78 deletions(-) delete mode 100644 src/fruits/ctv/ctv.c delete mode 100644 src/fruits/ctv/meson.build (limited to 'src/fruits/ctv') diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c deleted file mode 100644 index 2878600..0000000 --- a/src/fruits/ctv/ctv.c +++ /dev/null @@ -1,74 +0,0 @@ -#include -#include - -#include "../../libsink/sink.h" -#include "../../libsink/desktop.h" -#ifdef CAMU_HAVE_FFMPEG -#include "../../codec/ffmpeg/common.h" -#endif - -#include "../common.h" - -struct ctv { - struct nn_event_loop loop; - struct camu_desktop desktop; - struct nn_thread thread; -}; - -static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata) -{ - struct ctv *c = (struct ctv *)userdata; - nn_thread_set_name("event_loop"); - - nn_event_loop_init(&c->loop); - - struct camu_sink *sink = &c->desktop.sink; - sink->local = true; - - struct lia_prefs *prefs = &sink->prefs; -#ifdef CAMU_HAVE_SUBTITLES - prefs->enabled = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO) | (1 << CAMU_STREAM_SUBTITLE); -#else - prefs->enabled = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO); -#endif - prefs->language.audio = CAMU_LANG_JAPANESE; - prefs->language.subtitles = CAMU_LANG_ENGLISH; - - if (!camu_desktop_connect(&c->desktop, &al_str_c("ctv"), &c->loop, NNWT_SOCKET_TCP, &al_str_c(""), CAMU_PORT)) { - return 0; - } - - nn_event_loop_run(&c->loop); - - return 0; -} - -static s32 log_callback(void *userdata, u8 level, char *message) -{ - (void)userdata; - (void)level; - __android_log_print(ANDROID_LOG_DEBUG, "CTV", "%*.*s", 0, AL_LOG_MESSAGE_SIZE, message); - return al_strnlen(message, AL_LOG_MESSAGE_SIZE); -} - -static struct ctv c = { 0 }; - -s32 stl_platform_main(u32 argc, str *argv) -{ - (void)argc; - (void)argv; - - al_set_print(log_callback, NULL); - -#ifdef CAMU_HAVE_FFMPEG - camu_ff_common_init(); -#endif - - if (!camu_desktop_open(&c.desktop, "ctv")) { - return 0; - } - - nn_thread_create(&c.thread, event_loop_thread, &c); - - return EXIT_SUCCESS; -} diff --git a/src/fruits/ctv/meson.build b/src/fruits/ctv/meson.build deleted file mode 100644 index bf6f9e5..0000000 --- a/src/fruits/ctv/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -ctv_src = ['ctv.c'] -ctv_deps = [common_deps, desktop] -# https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358 -shared_library('ctv', ctv_src, dependencies: ctv_deps, link_args: ['-Wl,-Bsymbolic', '-static-libstdc++']) -- cgit v1.2.3-101-g0448