From 588b6d8bfa1b2efdebf8c424c86f6069cceafa41 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Sun, 17 Nov 2024 15:26:17 -0500
Subject: Rough subtitles implementation, improve buffers

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 src/fruits/cmsrv/cmsrv.c                       |  6 ++++++
 src/fruits/cmsrv/ui.c                          | 10 +++++++---
 src/fruits/cmv/cmv.c                           |  4 ++++
 src/fruits/ctv/ctv.c                           |  5 +++++
 src/fruits/droid/ctv/gradle/libs.versions.toml |  2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'src/fruits')

diff --git a/src/fruits/cmsrv/cmsrv.c b/src/fruits/cmsrv/cmsrv.c
index c6f4546..511484d 100644
--- a/src/fruits/cmsrv/cmsrv.c
+++ b/src/fruits/cmsrv/cmsrv.c
@@ -127,7 +127,9 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     al_set_print(log_callback, &s);
 
+#ifdef CAMU_HAVE_FFMPEG
     camu_ff_set_default_log_callback();
+#endif
 
     aki_event_loop_init(&s.loop);
 
@@ -162,6 +164,10 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     cmsrv_ui_close(&s.ui);
 
+#ifdef CAMU_HAVE_FFMPEG
+    camu_ff_free_default_log_callback();
+#endif
+
     aki_common_close();
 
     return EXIT_SUCCESS;
diff --git a/src/fruits/cmsrv/ui.c b/src/fruits/cmsrv/ui.c
index 1a52641..e10db5e 100644
--- a/src/fruits/cmsrv/ui.c
+++ b/src/fruits/cmsrv/ui.c
@@ -1,8 +1,9 @@
 #include <al/lib.h>
+#include <al/log.h>
 
 #include "ui.h"
 
-#define LOG_RATIO 1.3
+#define LOG_RATIO 2.1
 
 static s32 resize_cb(struct ncplane *p)
 {
@@ -99,7 +100,10 @@ static void layout_lists(struct cmsrv_ui *ui, struct ncplane *parent)
 static void erase_lists(struct cmsrv_ui *ui)
 {
     struct ncplane *n = ui->lists.n;
-    if (n) ncplane_erase(n);
+    if (n) {
+        ncplane_erase(n);
+        notcurses_render(ui->nc);
+    }
 }
 
 static void putnwstr_maxwidth_yx(struct ncplane *n, u32 y, u32 x, u32 maxwidth, wstr *w)
@@ -118,7 +122,7 @@ static void render_lists(struct cmsrv_ui *ui)
     u32 max_width = ncplane_dim_x(n);
     u32 max_height = ncplane_dim_y(n);
     u32 current_line = 0;
-    s32 entries_per_list = 10;
+    s32 entries_per_list = max_height;
 
     struct lia_list *list;
     al_array_foreach(ui->server->lists, i, list) {
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 96b6f75..0fe33ad 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -61,7 +61,9 @@ s32 wmain(s32 argc, wchar_t **argv)
 
     signal(SIGINT, sigint_handler);
 
+#ifdef CAMU_HAVE_FFMPEG
     camu_ff_set_default_log_callback();
+#endif
 
     aki_event_loop_init(&c.loop);
 
@@ -132,7 +134,9 @@ s32 wmain(s32 argc, wchar_t **argv)
 out:
     aki_event_loop_destroy(&c.loop);
 
+#ifdef CAMU_HAVE_FFMPEG
     camu_ff_free_default_log_callback();
+#endif
 
     stl_global_close();
     aki_common_close();
diff --git a/src/fruits/ctv/ctv.c b/src/fruits/ctv/ctv.c
index 75936eb..5f4a819 100644
--- a/src/fruits/ctv/ctv.c
+++ b/src/fruits/ctv/ctv.c
@@ -49,6 +49,11 @@ static void onSurfaceCreated(GLFMDisplay *display, s32 width, s32 height)
     struct ctv *c = (struct ctv *)glfmGetUserData(display);
     (void)width;
     (void)height;
+    GLFMRenderingAPI api = glfmGetRenderingAPI(display);
+    al_log_info("window_glfm", "Created GLES context of version %s.",
+        api == GLFMRenderingAPIOpenGLES32 ? "3.2" :
+        api == GLFMRenderingAPIOpenGLES31 ? "3.1" :
+        api == GLFMRenderingAPIOpenGLES3 ? "3.0" : "2.0");
     if (!c->created) {
         c->scr.callback = screen_callback;
         c->scr.userdata = c;
diff --git a/src/fruits/droid/ctv/gradle/libs.versions.toml b/src/fruits/droid/ctv/gradle/libs.versions.toml
index 0b1b89c..c474f95 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.7.1"
+agp = "8.7.2"
 
 [libraries]
 
-- 
cgit v1.2.3-101-g0448