[address@hidden: gtick patches]

[Jérémy Zurcher]

----- Forwarded message from Jérémy Zurcher <jeremy@asynk.ch> -----

From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Fri, 23 Oct 2020 17:57:28 +0200
Subject: gtick patches
To: stigge@antcom.de

Hi,

here are 2 small patches for gtick.

the first one fixes glitches on the visual tick when gettimeofday goes
faster then sync sent from the dsp (usually at high bpm).

the second one is a gettext update.

take care,

Jérémy

>From 83b76bbf15314f68a251db01c379c70ae0c09356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 23 Oct 2020 17:51:59 +0200
Subject: [PATCH 1/2] Fix visualtick glitches

---
 src/visualtick.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/visualtick.c b/src/visualtick.c
index 50ddfe4..ea4afd9 100644
--- a/src/visualtick.c
+++ b/src/visualtick.c
@@ -324,8 +324,6 @@ gboolean visualtick_update(metro_t* metro) {
   double pos;
   struct timeval current_time;
   struct timeval timediff;
-  int meter;
-  double integer;
   int width;
   int height;
   double red;
@@ -340,18 +338,13 @@ gboolean visualtick_update(metro_t* metro) {
   if (metro->state == STATE_RUNNING) {
     gettimeofday(&current_time, NULL);
     timeval_subtract(&timediff, &current_time, &metro->visualtick_sync_time);
-    pos = (double) metro->visualtick_sync_pos +
-             (timediff.tv_usec * 0.000001 + timediff.tv_sec) *
-             GTK_ADJUSTMENT(metro->speed_adjustment)->value / 60.0;
-    meter = gui_get_meter(metro);
-    pos = modf(pos / meter, &integer) * meter;
-
-    pos = modf(pos, &integer);
+    pos = (timediff.tv_usec * 0.000001 + timediff.tv_sec) * 
GTK_ADJUSTMENT(metro->speed_adjustment)->value / 60.0;
+    if (pos >= 1.0) pos = 0.99999;
     red0 = gtk_toggle_button_get_active(
-       GTK_TOGGLE_BUTTON(metro->accentbuttons[(int) integer])) ?
+       GTK_TOGGLE_BUTTON(metro->accentbuttons[(int) 
metro->visualtick_sync_pos])) ?
          1 : 0;
     red1 = gtk_toggle_button_get_active(
-       GTK_TOGGLE_BUTTON(metro->accentbuttons[((int) integer + 1) % meter])) ?
+       GTK_TOGGLE_BUTTON(metro->accentbuttons[((int) 
metro->visualtick_sync_pos + 1) % gui_get_meter(metro)])) ?
          1 : 0;
     red = red0 * (1.0 - pos) + red1 * pos;
     green = 1.0 - red;
-- 
2.29.0


>From 24ed6f15adcd48f3a0bfefe4ab8859ee6d0f8eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 23 Oct 2020 17:52:32 +0200
Subject: [PATCH 2/2] Update gettext support

---
 Makefile.am  | 2 +-
 configure.ac | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bb11038..928e48f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc intl po src testsuite
+SUBDIRS = doc po src testsuite
 
 EXTRA_DIST = config.rpath \
             autogen.sh \
diff --git a/configure.ac b/configure.ac
index add44a0..1d1c129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,8 @@ else
 fi
 
 # GNU gettext
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.19.8)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.20)
 
 # directory containing configuration support files
 # defaults to package root
@@ -98,7 +98,6 @@ AC_SUBST(DMALLOC_LIBS)
 
 AC_CONFIG_FILES([Makefile
                 doc/Makefile
-                intl/Makefile
                 po/Makefile.in
                 src/Makefile
                 testsuite/Makefile])
-- 
2.29.0



----- End forwarded message -----
-----------------------
Jérémy Zurcher
rue des Charmilles 7
1400 Yverdon-les-bains
http://asynk.ch
+41 (0) 79 599 84 27