forge (steel) v1.1.3

PKGBUILD

@@ -1,12 +1,12 @@
 pkgname=forge-steel
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="Fusion Of Real Time Generative Effects"
 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
 depends=('glfw>=1:3', 'v4l-utils>=1.32', 'alsa-lib>=1.2', 'libglvnd>=1.7')
 url="https://git.klemek.fr/klemek/forge-steel"
 source=("${pkgname}-steel-${pkgver}.tar.gz::https://git.klemek.fr/klemek/forge-steel/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('cf4b280fba47d649ab33596d43872a70dd443ed6d15dc587b9dac4e5db294e06')
+sha256sums=('536370c14aaac35729b29270cecca01a6c966bcae306fa2ec20f8a514a3ed8bd')
 srcdir=build
 backup=("usr/share/${pkgname}")
 

README.md

@@ -196,7 +196,7 @@ options:
   -nar, --no-auto-random      do not randomize state (default)
   -arc, --auto-random-cycle   auto random cycle length (default: 4)
   -vi, --video-in             path to video capture device (multiple allowed)
-  -vb, --video-buffers        number of video buffers to use (default: 2)
+  -vb, --video-buffers        number of video buffers to use (default: 1)
   -vs, --video-size           video capture desired height (default: internal texture height)
   -vr, --video-reconnect      auto-reconnect video (default)
   -nvr, --no-video-reconnect  do not auto-reconnect video

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([forge], [steel-1.1.2], [klemek.dev@proton.me])
+AC_INIT([forge], [steel-1.1.3], [klemek.dev@proton.me])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
 

src/args.c

@@ -66,7 +66,7 @@ static void print_help(int status_code) {
       "  -vi, --video-in             path to video capture device (multiple "
       "allowed)\n"
       "  -vb, --video-buffers        number of video buffers to use (default: "
-      "2)\n"
+      "1)\n"
       "  -vs, --video-size           video capture desired height (default: "
       "internal texture height)\n"
       "  -vr, --video-reconnect      auto-reconnect video (default)\n"
@@ -141,7 +141,7 @@ void args_parse(Parameters *params, int argc, char **argv) {
   params->auto_random_cycle = 4;
 #ifdef VIDEO_IN
   params->video_in.length = 0;
-  params->video_buffers = 2;
+  params->video_buffers = 1;
   params->video_size = 0;
   params->video_reconnect = true;
   strlcpy(params->video_fourcc, "YUYV", 5);

src/tempo.c

@@ -7,7 +7,13 @@
 #include "config.h"
 #include "tempo.h"
 
-static long now_ms() { return 1000 * clock() / CLOCKS_PER_SEC; }
+static long now_ms() {
+  struct timespec ts;
+  if (clock_gettime(CLOCK_REALTIME, &ts) != 0) {
+    return 0;
+  }
+  return 1000 * ts.tv_sec + ts.tv_nsec / 1e6;
+}
 
 static void reset_tap_chain(Tempo *tempo, long t) {
   tempo->last_reset = t;

src/timer.c

@@ -1,3 +1,4 @@
+#include <bits/time.h>
 #include <limits.h>
 #include <time.h>
 
@@ -8,7 +9,7 @@
 void timer_init(Timer *timer, const unsigned int target) {
   timer->counter = 0;
   timer->target = target;
-  timer->start = clock();
+  clock_gettime(CLOCK_REALTIME, &timer->start);
 }
 
 bool timer_inc(Timer *timer) {
@@ -17,13 +18,16 @@ bool timer_inc(Timer *timer) {
 }
 
 double timer_reset(Timer *timer) {
-  clock_t stop;
+  struct timespec stop;
   double secs;
   double per_secs;
 
-  stop = clock();
+  if (clock_gettime(CLOCK_REALTIME, &stop) != 0) {
+    return 0.0;
+  }
 
-  secs = (double)(stop - timer->start) / CLOCKS_PER_SEC;
+  secs = (double)(stop.tv_sec - timer->start.tv_sec) +
+         (double)(stop.tv_nsec - timer->start.tv_nsec) / 1e9;
   per_secs = (double)timer->counter / secs;
 
   timer->start = stop;

src/types.h

@@ -280,7 +280,7 @@ typedef struct StateBackgroundWriteArgs {
 // timer.c
 
 typedef struct Timer {
-  clock_t start;
+  struct timespec start;
   unsigned int counter;
   unsigned int target;
 } Timer;

src/video.c

@@ -428,6 +428,8 @@ void *video_background_read(void *args) {
              video_capture->name);
     video_capture->disconnected = true;
     context->input_formats[input_index] = 0;
+    context->input_resolutions[input_index][0] = 0;
+    context->input_resolutions[input_index][1] = 0;
   }
   free(process_args);
   pthread_exit(NULL);