From c8c0af300dde117a839f2d5d6b777694d7f118e9 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 28 Apr 2025 14:11:28 -0400 Subject: Minor restructure and dependency updates Signed-off-by: Andrew Opalach --- src/fruits/cmc/ui/widgets/now_playing.c | 2 +- src/fruits/cmv/cmv.c | 9 +++++---- src/fruits/ctv/ctv.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/fruits') diff --git a/src/fruits/cmc/ui/widgets/now_playing.c b/src/fruits/cmc/ui/widgets/now_playing.c index d30590c..845a572 100644 --- a/src/fruits/cmc/ui/widgets/now_playing.c +++ b/src/fruits/cmc/ui/widgets/now_playing.c @@ -1,7 +1,7 @@ #include #include "../../../../liana/list.h" -#include "../../../../sink/util.h" +#include "../../../../util/print_time.h" #include "../../cmc.h" diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c index 7fc6baa..2dda139 100644 --- a/src/fruits/cmv/cmv.c +++ b/src/fruits/cmv/cmv.c @@ -4,9 +4,9 @@ #include #include "../../util/color_palette.h" -#include "../../sink/desktop.h" -#include "../../server/common.h" #include "../../codec/ffmpeg/common.h" +#include "../../libsink/desktop.h" +#include "../../server/common.h" #ifndef CAMU_SINK_ONLY #include "../../server/server.h" #endif @@ -167,7 +167,7 @@ s32 window_system_main(u32 argc, str *argv, void *extra) } #endif - if (!camu_desktop_init(&c.desktop, "cmv")) { + if (!camu_desktop_open(&c.desktop, "cmv")) { return EXIT_FAILURE; } #ifndef CAMU_SINK_ONLY @@ -176,7 +176,8 @@ s32 window_system_main(u32 argc, str *argv, void *extra) c.desktop.userdata = &c; } #endif - if (!camu_desktop_connect(&c.desktop, &c.loop, type, &addr, CAMU_PORT)) { + str *name = local ? &al_str_c("local") : &al_str_c("desktop"); + if (!camu_desktop_connect(&c.desktop, name, &c.loop, type, &addr, CAMU_PORT)) { return EXIT_FAILURE; } diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c index 804cbed..5becb88 100644 --- a/src/fruits/ctv/ctv.c +++ b/src/fruits/ctv/ctv.c @@ -2,7 +2,7 @@ #include #include "../../libsink/sink.h" -#include "../../sink/desktop.h" +#include "../../libsink/desktop.h" #ifdef CAMU_HAVE_FFMPEG #include "../../codec/ffmpeg/common.h" #endif @@ -26,7 +26,7 @@ static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata) prefs->audio_lang = CAMU_LANG_ENGLISH; prefs->subtitle_lang = CAMU_LANG_ENGLISH; - if (!camu_desktop_connect(&c->desktop, &c->loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT)) { + if (!camu_desktop_connect(&c->desktop, &al_str_c("ctv"), &c->loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT)) { return 0; } @@ -56,7 +56,7 @@ s32 stl_platform_main(u32 argc, str *argv) camu_ff_common_init(); #endif - if (!camu_desktop_init(&c.desktop, "ctv")) { + if (!camu_desktop_open(&c.desktop, "ctv")) { return 0; } -- cgit v1.2.3-101-g0448