Resolve conflicts

Jenkinsfile

@@ -77,6 +77,10 @@ pipeline {
                     agent {label              "bullseye && armv7 && tascardev"}
                     steps {tascar_build_steps("bullseye && armv7 && tascardev")}
                 }
+                //stage(                        "bullseye && aarch64 && tascardev") {
+                //    agent {label              "bullseye && aarch64 && tascardev"}
+                //    steps {tascar_build_steps("bullseye && aarch64 && tascardev")}
+                //}
                 stage(                        "bionic && armv7 && tascardev") {
                     agent {label              "bionic && armv7 && tascardev"}
                     steps {tascar_build_steps("bionic && armv7 && tascardev")}
@@ -97,6 +101,7 @@ pipeline {
                 unstash "x86_64_focal"
                 unstash "x86_64_bionic"
                 unstash "armv7_bullseye"
+                //unstash "aarch64_bullseye"
                 unstash "armv7_bionic"
 
                 // Copies the new debs to the stash of existing debs,

apps/src/tascar_pdf.cc

@@ -225,35 +225,36 @@ void App::pdf_export_t::draw(TSCGUI::scene_draw_t::viewt_t persp)
   cr->stroke();
   cr->set_font_size(10);
   char ctmp[1024];
+  ctmp[1023] = 0;
   switch(persp) {
   case TSCGUI::scene_draw_t::xy:
-    sprintf(ctmp, "top ortho");
+    snprintf(ctmp, 1023, "top ortho");
     break;
   case TSCGUI::scene_draw_t::xz:
-    sprintf(ctmp, "front ortho");
+    snprintf(ctmp, 1023, "front ortho");
     break;
   case TSCGUI::scene_draw_t::yz:
-    sprintf(ctmp, "left ortho");
+    snprintf(ctmp, 1023, "left ortho");
     break;
   case TSCGUI::scene_draw_t::p:
-    sprintf(ctmp, "perspective");
+    snprintf(ctmp, 1023, "perspective");
     break;
   case TSCGUI::scene_draw_t::xyz:
-    sprintf(ctmp, "xyz");
+    snprintf(ctmp, 1023, "xyz");
     break;
   }
   cr->move_to(bx + 12, by + 36);
   cr->show_text(ctmp);
   cr->stroke();
   if(persp == TSCGUI::scene_draw_t::p)
-    sprintf(ctmp, "fov %g°", drawer.view.get_fov());
+    snprintf(ctmp, 1023, "fov %g°", drawer.view.get_fov());
   else
-    sprintf(ctmp, "scale 1:%g",
+    snprintf(ctmp, 1023, "scale 1:%g",
             drawer.view.get_scale() / (wscale / 72 * 0.0254));
   cr->move_to(bx + 12, by + 48);
   cr->show_text(ctmp);
   cr->stroke();
-  sprintf(ctmp, "time %g s", time);
+  snprintf(ctmp, 1023, "time %g s", time);
   cr->move_to(bx + 12, by + 60);
   cr->show_text(ctmp);
   cr->stroke();

apps/src/tascar_tscupdate.cc

@@ -94,15 +94,16 @@ void scan_source(xmlpp::Element* src)
         if(!gain.empty())
           dgain = atof(gain.c_str());
         char ctmp[1024];
-        sprintf(ctmp, "%g", dgain - 20.0 * log10(2e-5));
+        ctmp[1023] = 0;
+        snprintf(ctmp, 1023, "%g", dgain - 20.0 * log10(2e-5));
         ne_child->set_attribute("level", ctmp);
         // e_child->remove_attribute("gain");
         // starttime to position conversion:
         std::string startt(e_child->get_attribute_value("starttime"));
         double dstart(0);
         if(!startt.empty()) {
           dstart = atof(startt.c_str());
-          sprintf(ctmp, "%g", -dstart);
+          snprintf(ctmp, 1023, "%g", -dstart);
           ne_child->set_attribute("position", ctmp);
         }
         ne_child->remove_attribute("starttime");

changelog

@@ -1,3 +1,4 @@
+0.230: New plugins, many minor bug fixes, improvement of OSC handling, SVG map export via OSC, and minor improvements
 0.229.2: Correct speaker correction filter length
 0.229: Added transportramp plugin, bugfixes in FIR speaker correction and LSL handling in Qualisys interface
 0.228.3: Bugfix and documentation of Matlab/Octave tools

config.mk

@@ -1,5 +1,5 @@
 # variables:
-VERSION=0.229.2
+VERSION=0.230.1
 
 ARCH=$(shell uname -m)
 
@@ -42,15 +42,15 @@ FULLVERSION=$(VERSION).$(COMMIT_SINCE_RELEASE)-$(COMMITHASH)$(GITMODIFIED)
 mkfile_name := $(abspath $(lastword $(MAKEFILE_LIST)))
 mkfile_path := $(subst $(notdir $(mkfile_name)),,$(mkfile_name))
 
-HAS_LSL=$(shell $(mkfile_path)/check_for_lsl)
+HAS_LSL:=$(shell $(mkfile_path)/check_for_lsl)
 
-HAS_OPENMHA=$(shell $(mkfile_path)/check_for_openmha)
+HAS_OPENMHA:=$(shell $(mkfile_path)/check_for_openmha)
 
-HAS_OPENCV2=$(shell $(mkfile_path)/check_for_opencv2)
+HAS_OPENCV2:=$(shell $(mkfile_path)/check_for_opencv2)
 
-HAS_OPENCV4=$(shell $(mkfile_path)/check_for_opencv4)
+HAS_OPENCV4:=$(shell $(mkfile_path)/check_for_opencv4)
 
-HAS_WEBKIT=$(shell $(mkfile_path)/check_for_webkit)
+HAS_WEBKIT:=$(shell $(mkfile_path)/check_for_webkit)
 
 BUILD_DIR = build
 SOURCE_DIR = src

doc/news/css/main.css

@@ -69,7 +69,7 @@ header{
 }
 main{
     padding:0px 10px;
-    max-width:800px;
+    max-width:1200px;
     margin:0 auto;
     background:#FFFFFF;
     border-radius:6px;

doc/news/index.html

@@ -62,6 +62,10 @@ <h2>Toolbox for acoustic scene creation and rendering</h2>
 
       <h2>Latest news</h2><br/>
 
+      <time>September 21, 2023</time>
+      <h3>TASCAR 0.230 released</h3>
+      <p>New plugins, many minor bug fixes, improvement of OSC handling, SVG map export via OSC, and minor improvements.</p> <br/>
+
       <time>February 1, 2023</time>
       <h3>TASCAR 0.229.2 released</h3>
       <p>Correct FIR filter length in speaker correction (affects FIR speaker correction only, not related to calibration wizard).</p> <br/>

doc/news/install.html

@@ -80,20 +80,23 @@ <h2>Installation on Ubuntu/Debian Linux</h2><br/>
 	<pre><code>sudo apt-get update
 sudo apt-get install tascarpro</code></pre> for installation.</p>
 
-      <h2>Installation on MacOS</h2><br/>
+      <h2>Installation on macOS</h2><br/>
       <p>For MacOS, currently no pre-compiled binary packages are available. However, it can be compiled from sources.</p>
-      <p>If not yet installed, then download and install 'homebrew':
-        <pre><code>/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/gisogrimm/ov-client/development/packaging/Darwin/install_dependencies.sh)"</code></pre>
-        Now install all dependencies:
+      <p>If not yet installed, then download and install 'homebrew' (<a href="https://brew.sh/">https://brew.sh/</a>).
+        Then install all dependencies with:
         <pre><code>brew install pkgconfig glibmm jack liblo libsndfile gtkmm3 eigen boost gsl fftw libsamplerate xerces-c libltc gtksourceviewmm3 coreutils adwaita-icon-theme jpeg libmatio</code></pre>
-        Finally, compile the code:
-        <pre><code>make -j 8</code></pre>
+        The next step is to download the code:
+        <pre><code>git clone https://github.com/gisogrimm/tascar</code></pre>
+        Finally, change to the tascar directory and compile the code:
+        <pre><code>cd tascar
+make -j 8</code></pre>
         Now TASCAR can be started from the local directory, using the
         wrapper script:
         <pre><code>./tascar.sh</code></pre> Alternatively, it is
         possible to install it in the system with:
-        <pre><code>make install</code></pre>
+        <pre><code>sudo make install</code></pre>
       </p>
+      <p>Jack can be installed either from <a href="https://jackaudio.org/">https://jackaudio.org/</a> or from brew. If you use the version from jackaudio.org, then please uninstall the brew version to avoid library incompatibilities.</p>
 
 
       <h2>Starting TASCAR</h2><br/>

doc/tascar.sty

@@ -736,7 +736,7 @@ This General Public License does not permit incorporating your program into prop
   keywords={session,session,},
   morekeywords=[2]{scene,connect,modules,},
   morekeywords=[3]{receiver,face,facegroup,mask,source,diffuse,hrirconv,simplecontroller,pos2osc,system,datalogging,locationvelocity,rotator,lsljacktime,oscjacktime,route,matrix,ltcgen,lightctl,nearsensor,timedisplay,hoafdnrot,midictl,midi2osc,layout,waitforjackport,},
-  morekeywords=[4]{position,position,orientation,creator,sndfile,pink,filter,level2osc,sound,speaker,faces,entry,plugins,sine,port,}
+  morekeywords=[4]{position,position,orientation,creator,sndfile,pink,filter,level2osc,sound,speaker,faces,entry,plugins,sine,port,mic,}
   keywordstyle=\color{h4aGreen}\bfseries,       % keyword style
   keywordstyle=[2]\color{h4aBlueDark}\bfseries,     % keyword style for tascar objects
   keywordstyle=[3]\color{h4aBlueMedium}\bfseries,   % keyword style for session entries

examples/oscheadtracking.tsc

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<session license="CC0">
+  <scene>
+    <receiver/>
+  </scene>
+  <modules>
+    <oscheadtracker actor="/*/out"/>
+  </modules>
+</session>