Minor restructure and dependency updates

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 5 insertions, 4 deletions

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 <nnwt/thread.h>
 
 #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;
     }