Fixes from testing sink change, document things

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

9 files changed, 22 insertions, 17 deletions

diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c
index 1baae8f..d95a2f6 100644
--- a/src/fruits/cmc/cmc.c
+++ b/src/fruits/cmc/cmc.c
@@ -94,6 +94,7 @@ static struct cmc_list *get_list_by_name(struct cmc *c, str *name)
 static void client_callback(void *userdata, u8 op, void *opaque)
 {
     struct cmc *c = (struct cmc *)userdata;
+    // @TODO: String macro.
     switch (op) {
     case CAMU_CLIENT_LOGGED_IN: {
         struct nn_packet *packet = (struct nn_packet *)opaque;
diff --git a/src/fruits/cmc/ui/ui.c b/src/fruits/cmc/ui/ui.c
index bc01a22..b51ec53 100644
--- a/src/fruits/cmc/ui/ui.c
+++ b/src/fruits/cmc/ui/ui.c
@@ -212,7 +212,6 @@ static bool relayout(struct cmc_ui *ui, struct ncplane *stdplane)
 static s32 resize_cb(struct ncplane *p)
 {
     struct cmc_ui *ui = (struct cmc_ui *)ncplane_userptr(p);
-    //al_assert(false);
     ui->layed_out = relayout(ui, notcurses_stdplane(ui->nc));
     if (ui->layed_out) {
         cmc_ui_queue_render(ui);
diff --git a/src/fruits/cmc/ui/util/waveform.c b/src/fruits/cmc/ui/util/waveform.c
index a82aa45..bed34b7 100644
--- a/src/fruits/cmc/ui/util/waveform.c
+++ b/src/fruits/cmc/ui/util/waveform.c
@@ -197,7 +197,7 @@ void cmc_draw_waveform(struct cmc_list_entry *entry, u32 width, u32 height, bool
 //                buf[j][i][0] = 'R';
 //                masks_for_chars[j] &= ~RMS_BIT;
 //            }
-//            u32 len = masks_for_chars[j] == 0 ? 2 : 5;
+//            u32 len = (masks_for_chars[j] == 0) ? 2 : 5;
 //            al_memcpy(buf[j][i] + 1, octant_lut[masks_for_chars[j]], len);
 //            //slen[j] += len;
 //        }
diff --git a/src/fruits/cmsrv/cmsrv.c b/src/fruits/cmsrv/cmsrv.c
index 431c682..8e24701 100644
--- a/src/fruits/cmsrv/cmsrv.c
+++ b/src/fruits/cmsrv/cmsrv.c
@@ -70,7 +70,6 @@ static void render_timer_callback(void *userdata, struct nn_timer *timer)
     struct cmsrv *s = (struct cmsrv *)userdata;
     (void)timer;
     cmsrv_ui_render(&s->ui);
-    nn_timer_again(&s->render_timer);
 }
 
 static void input_poll_callback(void *userdata, s32 revents)
@@ -168,7 +167,6 @@ s32 main(s32 argc, char *argv[])
     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);
-
     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);
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 840eb6a..1fce028 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -8,7 +8,6 @@
 #ifndef CAMU_SINK_ONLY
 #include "../../server/server.h"
 #endif
-#include "../../server/common.h"
 #include "../../util/color_palette.h"
 #ifdef CAMU_HAVE_FFMPEG
 #include "../../codec/ffmpeg/common.h"
@@ -85,11 +84,11 @@ static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *pr
         al_str_clone(&value, &al_str_substr(&sub, 0, index));
         al_str_to_lower(&value);
         if (al_str_at(&value, 0) == 'a') {
-            prefs->enabled_mask |= CAMU_MASK_AUDIO;
+            prefs->enabled_mask |= 1 << CAMU_STREAM_AUDIO;
         } else if (al_str_at(&value, 0) == 'v') {
-            prefs->enabled_mask |= CAMU_MASK_VIDEO;
+            prefs->enabled_mask |= 1 << CAMU_STREAM_VIDEO;
         } else if (al_str_at(&value, 0) == 's') {
-            prefs->enabled_mask |= CAMU_MASK_SUBTITLE;
+            prefs->enabled_mask |= 1 << CAMU_STREAM_SUBTITLE;
         }
         al_str_free(&value);
 
@@ -99,9 +98,9 @@ static bool parse_exe_name_params(str *exe_name, str *addr, struct lia_prefs *pr
     return true;
 def:
 #ifdef CAMU_HAVE_SUBTITLES
-    prefs->enabled_mask = CAMU_MASK_AUDIO | CAMU_MASK_VIDEO | CAMU_MASK_SUBTITLE;
+    prefs->enabled_mask = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO) | (1 << CAMU_STREAM_SUBTITLE);
 #else
-    prefs->enabled_mask = CAMU_MASK_AUDIO | CAMU_MASK_VIDEO;
+    prefs->enabled_mask = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO);
 #endif
     prefs->audio_lang = CAMU_LANG_JAPANESE;
     prefs->subtitle_lang = CAMU_LANG_ENGLISH;
diff --git a/src/fruits/common.h b/src/fruits/common.h
index 1ff1b1e..1f7870d 100644
--- a/src/fruits/common.h
+++ b/src/fruits/common.h
@@ -13,8 +13,12 @@ static str CAMU_TEST_CONTROL_PATH = al_str_c("/tmp/camu_control_sock");
 
 AL_IGNORE_WARNING_END
 
-//#define CAMU_TEST_TYPE NNWT_SOCKET_UNIX
-//#define CAMU_TEST_ADDR CAMU_TEST_PATH
-
+#ifdef NAUNET_ON_WINDOWS
 #define CAMU_TEST_TYPE NNWT_SOCKET_TCP
 #define CAMU_TEST_ADDR CAMU_TEST_IP
+#else
+#define CAMU_TEST_TYPE NNWT_SOCKET_UNIX
+#define CAMU_TEST_ADDR CAMU_TEST_PATH
+//#define CAMU_TEST_TYPE NNWT_SOCKET_TCP
+//#define CAMU_TEST_ADDR CAMU_TEST_IP
+#endif
diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c
index 7357177..45942e6 100644
--- a/src/fruits/ctv/ctv.c
+++ b/src/fruits/ctv/ctv.c
@@ -23,8 +23,12 @@ static nn_thread_result NNWT_THREADCALL event_loop_thread(void *userdata)
     nn_event_loop_init(&c->loop);
 
     struct lia_prefs *prefs = &c->desktop.sink.prefs;
-    prefs->enabled_mask = CAMU_MASK_AUDIO | CAMU_MASK_VIDEO | CAMU_MASK_SUBTITLE;
-    prefs->audio_lang = CAMU_LANG_ENGLISH;
+#ifdef CAMU_HAVE_SUBTITLES
+    prefs->enabled_mask = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO) | (1 << CAMU_STREAM_SUBTITLE);
+#else
+    prefs->enabled_mask = (1 << CAMU_STREAM_AUDIO) | (1 << CAMU_STREAM_VIDEO);
+#endif
+    prefs->audio_lang = CAMU_LANG_JAPANESE;
     prefs->subtitle_lang = CAMU_LANG_ENGLISH;
 
     if (!camu_desktop_connect(&c->desktop, &al_str_c("ctv"), &c->loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT)) {
diff --git a/src/fruits/droid/ctv/gradle/libs.versions.toml b/src/fruits/droid/ctv/gradle/libs.versions.toml
index 12e2469..1125570 100644
--- a/src/fruits/droid/ctv/gradle/libs.versions.toml
+++ b/src/fruits/droid/ctv/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.10.1"
+agp = "8.12.3"
 
 [libraries]
 
diff --git a/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties
index 6c7d7ac..75264fd 100644
--- a/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties
+++ b/src/fruits/droid/ctv/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Oct 30 14:10:25 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists