Merge pull request #126

A few small changes

Author: sundermann

.github/workflows/build.yml

@@ -4,8 +4,8 @@ on:
   push:
 
 env:
-  TOOLCHAIN_URL: https://github.com/openlgtv/buildroot-nc4/releases/download/webos-d7ed7ee/arm-webos-linux-gnueabi_sdk-buildroot.tar.gz
-  TOOLCHAIN_SHA256: 32816626e99fb34922a49d0c639f7c8a30356fffb222372d4823027f1382f640
+  TOOLCHAIN_URL: https://github.com/openlgtv/buildroot-nc4/releases/download/webos-b17b4cc/arm-webos-linux-gnueabi_sdk-buildroot.tar.gz
+  TOOLCHAIN_SHA256: 1f69af43caac4b6898d8f0323c975be60af04abdd1e1c144773072b28c961c20
   TOOLCHAIN_DIR: /opt/arm-webos-linux-gnueabi_sdk-buildroot
   TOOLCHAIN_FILE: /opt/arm-webos-linux-gnueabi_sdk-buildroot/share/buildroot/toolchainfile.cmake
 

README.md

@@ -66,6 +66,28 @@ The calculator is your friend ;)
 
 You can find them defined here: [Source code file](https://github.com/webosbrew/hyperion-webos/blob/master/src/quirks.h)
 
+## Building
+
+You will need [buildroot-nc4](https://github.com/openlgtv/buildroot-nc4)
+(or, theoretically, some other webOS toolchain).
+
+Set `TOOLCHAIN_FILE` to the path of buildroot-nc4's `toolchainfile.cmake`.
+For example:
+
+```sh
+export TOOLCHAIN_FILE='/opt/arm-webos-linux-gnueabi_sdk-buildroot/share/buildroot/toolchainfile.cmake'
+```
+
+Then run the following commands:
+
+```sh
+git clone --recursive https://github.com/webosbrew/hyperion-webos.git
+mkdir hyperion-webos/build
+cd hyperion-webos/build
+cmake .. -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}"
+make hyperion-webos gm_backend halgal_backend dile_vt_backend vtcapture_backend
+```
+
 ## Running
 
 `hyperion-webos` together with `*_backend.so` libraries need to be copied onto

src/log.c

@@ -8,7 +8,7 @@ uint64_t start = 0;
 PmLogContext context;
 LogLevel current_log_level = Info;
 
-void log_init()
+void log_init(void)
 {
     PmLogGetContext("hyperion-webos", &context);
 }

src/log.h

@@ -14,9 +14,9 @@ typedef enum {
     Debug = 7,
 } LogLevel;
 
-void log_init();
+void log_init(void);
 void log_set_level(LogLevel level);
-void log_printf(LogLevel level, const char* module, const char* fmt, ...);
+void log_printf(LogLevel level, const char* module, const char* fmt, ...) __attribute__((format(printf, 3, 4)));
 
 #define LOG(level, ...) log_printf(level, __func__, __VA_ARGS__)
 #define ERR(...) LOG(Error, __VA_ARGS__)

src/main.c

@@ -1,25 +1,30 @@
+#include <errno.h>
 #include <getopt.h>
 #include <glib.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "log.h"
 #include "service.h"
 #include "settings.h"
 #include "version.h"
 
-GMainLoop* loop;
+GMainLoop* loop = NULL;
 
 settings_t settings;
 service_t service;
 bool using_cli = false;
 int print_version = 0;
 
-void int_handler(int signum __attribute__((unused)))
+static void int_handler(int signum __attribute__((unused)))
 {
     INFO("SIGINT detected, stopping...");
     g_main_loop_quit(loop);
 }
 
-static struct option long_options[] = {
+static const struct option long_options[] = {
     { "width", required_argument, 0, 'x' },
     { "height", required_argument, 0, 'y' },
     { "address", required_argument, 0, 'a' },
@@ -188,7 +193,10 @@ int main(int argc, char* argv[])
         return 0;
     }
 
-    signal(SIGINT, int_handler);
+    if (signal(SIGINT, int_handler) == SIG_ERR) {
+        WARN("Setting SIGINT handler failed: %s", strerror(errno));
+    }
+
     loop = g_main_loop_new(NULL, false);
 
     if ((ret = service_init(&service, &settings)) != 0) {

src/service.c

@@ -18,7 +18,7 @@
 //
 // SECURITY_COMPATIBILITY flag present in CMakeList disables deprecation notices, see:
 // https://github.com/webosose/luna-service2/blob/b74b1859372597fcd6f0f7d9dc3f300acbf6ed6c/include/public/luna-service2/lunaservice.h#L49-L53
-bool LSRegisterPubPriv(const char* name, LSHandle** sh,
+extern bool LSRegisterPubPriv(const char* name, LSHandle** sh,
     bool public_bus,
     LSError* lserror) __attribute__((weak));
 
@@ -105,8 +105,8 @@ void service_init_backends(service_t* service)
     config.fps = settings->fps;
     config.quirks = settings->quirks;
 
-    char* ui_backends[] = { "libgm_backend.so", "libhalgal_backend.so", NULL };
-    char* video_backends[] = { "libvtcapture_backend.so", "libdile_vt_backend.so", NULL };
+    const char* const ui_backends[] = { "libgm_backend.so", "libhalgal_backend.so", NULL };
+    const char* const video_backends[] = { "libvtcapture_backend.so", "libdile_vt_backend.so", NULL };
     char backend_name[FILENAME_MAX] = { 0 };
 
     if (!service->ui_backend_initialized) {
@@ -115,7 +115,7 @@ void service_init_backends(service_t* service)
         if (settings->no_gui) {
             INFO("UI capture disabled");
         } else {
-            if (settings->ui_backend == NULL || strcmp(settings->ui_backend, "") == 0 || strcmp(settings->ui_backend, "auto") == 0) {
+            if (settings->ui_backend == NULL || settings->ui_backend[0] == '\0' || strcmp(settings->ui_backend, "auto") == 0) {
                 INFO("Autodetecting UI backend...");
                 if (unicapture_try_backends(&config, &service->ui_backend, ui_backends) == 0) {
                     service->unicapture.ui_capture = &service->ui_backend;
@@ -137,7 +137,7 @@ void service_init_backends(service_t* service)
         if (settings->no_video) {
             INFO("Video capture disabled");
         } else {
-            if (settings->video_backend == NULL || strcmp(settings->video_backend, "") == 0 || strcmp(settings->video_backend, "auto") == 0) {
+            if (settings->video_backend == NULL || settings->video_backend[0] == '\0' || strcmp(settings->video_backend, "auto") == 0) {
                 INFO("Autodetecting video backend...");
                 if (unicapture_try_backends(&config, &service->video_backend, video_backends) == 0) {
                     service->unicapture.video_capture = &service->video_backend;
@@ -331,11 +331,12 @@ bool service_method_set_settings(LSHandle* sh, LSMessage* msg, void* data)
         }
     }
 
-    if (service_destroy(service) == 0) {
-        service_init(service, service->settings);
+    bool destroyed = service_destroy(service) == 0;
+
+    service_init(service, service->settings);
+
+    if (destroyed) {
         service_start(service);
-    } else {
-        service_init(service, service->settings);
     }
 
     jvalue_ref jobj = jobject_create();
@@ -524,17 +525,14 @@ int service_register(service_t* service, GMainLoop* loop)
 
     LSErrorInit(&lserror);
 
+    DBG("Try register with LSRegister");
+    bool registered = LSRegister(SERVICE_NAME, &handle, &lserror);
+
     bool registeredLegacy = false;
-    bool registered = false;
 
-    if (&LSRegisterPubPriv != 0) {
-        DBG("Try register on LSRegister");
-        registered = LSRegister(SERVICE_NAME, &handle, &lserror);
-        DBG("Try legacy register on LSRegisterPubPriv");
+    if (&LSRegisterPubPriv != NULL) {
+        DBG("Try legacy register with LSRegisterPubPriv");
         registeredLegacy = LSRegisterPubPriv(SERVICE_NAME, &handlelegacy, true, &lserror);
-    } else {
-        DBG("Try register on LSRegister");
-        registered = LSRegister(SERVICE_NAME, &handle, &lserror);
     }
 
     if (!registered && !registeredLegacy) {

src/unicapture.c

@@ -15,7 +15,7 @@
         return -2;                                  \
     }
 
-int unicapture_init_backend(cap_backend_config_t* config, capture_backend_t* backend, char* name)
+int unicapture_init_backend(cap_backend_config_t* config, capture_backend_t* backend, const char* name)
 {
     char* error;
     void* handle = dlopen(name, RTLD_LAZY);
@@ -61,7 +61,7 @@ int unicapture_init_backend(cap_backend_config_t* config, capture_backend_t* bac
     return ret;
 }
 
-int unicapture_try_backends(cap_backend_config_t* config, capture_backend_t* backend, char** candidates)
+int unicapture_try_backends(cap_backend_config_t* config, capture_backend_t* backend, const char* const* candidates)
 {
     int ret = 0;
     for (int i = 0; candidates[i] != NULL; i++) {

src/unicapture.h

@@ -112,8 +112,8 @@ typedef struct _unicapture_state {
 extern "C" {
 #endif
 void unicapture_init(unicapture_state_t* state);
-int unicapture_try_backends(cap_backend_config_t* config, capture_backend_t* backend, char** candidates);
-int unicapture_init_backend(cap_backend_config_t* config, capture_backend_t* backend, char* name);
+int unicapture_try_backends(cap_backend_config_t* config, capture_backend_t* backend, const char* const* candidates);
+int unicapture_init_backend(cap_backend_config_t* config, capture_backend_t* backend, const char* name);
 int unicapture_start(unicapture_state_t* state);
 int unicapture_stop(unicapture_state_t* state);
 #ifdef __cplusplus