Merge branch 'feature/msys2' into development

.github/workflows/ubuntu.yml

@@ -2,7 +2,7 @@ name: Ubuntu make
 
 on:
   push:
-    branches: [ master, development, automation ]
+    branches: [ master, development, feature/msys2 ]
   pull_request:
     branches: [ master ]
 
@@ -25,7 +25,11 @@ jobs:
       run: make
     - name: packaging
       run: make pack
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: debian
         path: packaging/deb/tascar/*/*.deb
+    - uses: actions/upload-artifact@v4
+      with:
+        name: manual
+        path: manual/manual.pdf

.github/workflows/windows.yml

@@ -0,0 +1,37 @@
+name: Windows/MSYS2 make
+
+on:
+  push:
+    branches: [ master, development, feature/msys2 ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: UCRT64
+        update: true
+        install: git vim zip mingw-w64-ucrt-x86_64-gcc make mingw-w64-ucrt-x86_64-pkgconf mingw-w64-ucrt-x86_64-eigen3 mingw-w64-ucrt-x86_64-jack2 mingw-w64-ucrt-x86_64-liblo mingw-w64-ucrt-x86_64-libsndfile mingw-w64-ucrt-x86_64-gtkmm3 mingw-w64-ucrt-x86_64-gsl mingw-w64-ucrt-x86_64-fftw mingw-w64-ucrt-x86_64-libsamplerate mingw-w64-ucrt-x86_64-xerces-c mingw-w64-ucrt-x86_64-gtksourceviewmm3 mingw-w64-ucrt-x86_64-dlfcn mingw-w64-ucrt-x86_64-matio mingw-w64-ucrt-x86_64-adwaita-icon-theme
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: lineendings
+      run: git config --global core.autocrlf true
+    - name: build
+      run: make
+    - name: test
+      run: make unit-tests
+    - name: packaging
+      run: make packwin
+    - name: checkgit
+      run: git status
+    - uses: actions/upload-artifact@v4
+      with:
+        name: windows
+        path: packaging/win/*.zip

Makefile

@@ -78,6 +78,9 @@ docexamples:
 pack: $(MODULES) $(DOCMODULES) docexamples unit-tests test
 	$(MAKE) -C packaging/deb
 
+packwin:
+	$(MAKE) -C packaging/win
+
 releasepack: checkversiontagged checkmodified $(MODULES) $(DOCMODULES) docexamples unit-tests test
 	$(MAKE) -C packaging/deb
 

packaging/win/Makefile

@@ -0,0 +1,32 @@
+include ../../config.mk
+
+ALL_CSV=$(wildcard *.csv)
+
+PACKVERSION=$(FULLVERSION)-windows
+ifeq "$(DEBUG)" "yes"
+PACKVERSION:=$(PACKVERSION)-debug
+endif
+
+all:
+	rm -Rf tascar;\
+	mkdir -p tascar/{scripts,share/icons,share/glib-2.0,lib};\
+	rm -f tascar-$(PACKVERSION).zip;\
+	cp -v ../../*/build/[lt]*.{dll,exe} tascar/;\
+	cp -r ../../scripts/*.m tascar/scripts/;\
+	cp -r /ucrt64/share/icons/Adwaita tascar/share/icons/;\
+	cp -r /ucrt64/share/icons/hicolor tascar/share/icons/;\
+	cp -r /ucrt64/share/glib-2.0/schemas tascar/share/glib-2.0/;\
+	cp -r /ucrt64/lib/gdk-pixbuf-2.0 tascar/lib/;\
+	cp /ucrt64/bin/gdbus.exe tascar/;\
+	cp /ucrt64/bin/broadwayd.exe tascar/;\
+	cp /ucrt64/bin/librsvg-2-2.dll tascar/;\
+	(cd tascar; cp -v $$(cygcheck ./* ./lib/gdk-pixbuf-2.0/*/*.dll | grep msys64 | sort -bu) .;mkdir -p share/{icons,glib-2.0} lib); \
+	cp ../../artwork/*.png tascar/;\
+	(cd tascar; glib-compile-schemas share/glib-2.0/schemas);\
+	zip -r tascar-$(PACKVERSION).zip tascar/;
+
+#\
+#	(cd tascar; find /d/ -name "Adwaita*"; find /d/ -name "glib-2.0"; find /d/ -name "hicolor"; find /d/ -name "librsvg-2-2.dll";echo "---";echo "---";ls /ucrt64/;echo "packaging completed.";)
+
+ver:
+	@echo "Packaging: $(PACKVERSION)"

plugins/Makefile

@@ -14,11 +14,11 @@ RECEIVERS = omni nsp amb3h0v amb3h3v amb1h0v amb1h1v cardioid hann	\
 SOURCES = omni cardioidmod door generic1storder farsrc head
 
 TASCARMODS = system pos2osc sampler pendulum epicycles motionpath	\
-  foa2hoadiff route oscevents oscjacktime ltcgen nearsensor dirgain	\
+  foa2hoadiff route oscevents oscjacktime nearsensor dirgain	\
   dummy matrix hoafdnrot mpu6050track touchosc savegains hrirconv	\
   hossustain rotator orientationmodulator locationmodulator		\
   linearmovement granularsynth fail waitforjackport sleep jackrec	\
-  oscserver oscrelay echoc snapangle lightctl oscactor ovheadtracker	\
+  oscserver oscrelay echoc snapangle oscactor	\
   oscheadtracker tonalenhancement
 
 TASCARMODSGUI = tracegui simplecontroller timedisplay geopresets	\
@@ -36,7 +36,11 @@ MASKPLUGINS = fig8 multibeam sampledgain
 ifneq ($(OS),Windows_NT)
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
-  TASCARMODS += midicc2osc midictl mididispatch joystick qualisystracker	\
+  TASCARMODS += midicc2osc midictl mididispatch joystick qualisystracker ltcgen lightctl ovheadtracker\
+#  ovheadtracker
+endif
+ifeq ($(UNAME_S),Darwin)
+  TASCARMODS += ltcgen	\
 #  ovheadtracker
 endif
 endif

plugins/src/tascarmod_datalogging.cc

@@ -36,6 +36,7 @@
 #ifdef HAS_LSL
 #include <lsl_cpp.h>
 #endif
+#include <chrono>
 #include <matio.h>
 #include <mutex>
 #include <sys/stat.h>
@@ -1198,7 +1199,7 @@ void lslvar_t::poll_lsl_data()
 {
   while(run_lsl_poll_service) {
     poll_data();
-    usleep(1000);
+    std::this_thread::sleep_for(std::chrono::microseconds(1000));
   }
 }
 #endif
@@ -1369,8 +1370,10 @@ void datalogging_t::start_trial(const std::string& name)
     session->tp_stop();
     session->tp_locate(0u);
     uint32_t timeout(1000);
-    while(timeout && (session->tp_get_time() > 0))
-      usleep(1000);
+    while(timeout && (session->tp_get_time() > 0)){
+      std::this_thread::sleep_for(std::chrono::microseconds(1000));
+      timeout--;
+    }
   }
   for(uint32_t k = 0; k < recorder.size(); k++)
     recorder[k]->clear();

plugins/src/tascarmod_jackrec.cc

@@ -319,7 +319,7 @@ std::vector<std::string> jackrec_t::scan_dir()
   HANDLE hFind;
   hFind = FindFirstFile((path + pattern).c_str(), &FindFileData);
   if(hFind == INVALID_HANDLE_VALUE)
-    return;
+    return res;
   do {
     res.push_back(FindFileData.cFileName);
   } while(FindNextFile(hFind, &FindFileData) != 0);