bugfix release 0.233.2

gisogrimm · Oct 23, 2024 · bb38f5e · bb38f5e
1 parent 626c90c
commit bb38f5e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/changelog b/changelog
@@ -1,3 +1,4 @@
+0.233.2: bugfix of tascar_spkcalib
 0.233.1:
        - add layer property for faces/facegroups (fholzm)
        - improve search paths on Windows

diff --git a/config.mk b/config.mk
@@ -1,5 +1,5 @@
 # variables:
-VERSION=0.233.1
+VERSION=0.233.2
 
 ARCH=$(shell uname -m)
 

diff --git a/libtascar/src/calibsession.cc b/libtascar/src/calibsession.cc
@@ -453,8 +453,13 @@ calibsession_t::calibsession_t(const std::string& fname, const calib_cfg_t& cfg)
   // validate scene:
   if(scenes.empty())
     throw TASCAR::ErrMsg("Programming error: no scene");
-  if(scenes[0]->source_objects.size() != 2)
+  if(scenes[0]->source_objects.size() != 2) {
+    DEBUG(scenes.size());
+    for(const auto& scene : scenes) {
+      DEBUG(scene->source_objects.size());
+    }
     throw TASCAR::ErrMsg("Programming error: not exactly two sources.");
+  }
   if(scenes[0]->receivermod_objects.size() != 3)
     throw TASCAR::ErrMsg("Programming error: not exactly three receivers.");
   scenes.back()->source_objects[0]->dlocation = pos_t(1, 0, 0);

diff --git a/libtascar/src/session.cc b/libtascar/src/session.cc
@@ -416,9 +416,6 @@ TASCAR::session_t::session_t()
   profilermsg = lo_message_new();
   pthread_mutex_init(&mtx, NULL);
   read_xml();
-  if(scenes.empty()) {
-    add_scene(NULL);
-  }
   try {
     add_output_port("sync_out");
     jackc_transport_t::activate();
@@ -460,9 +457,6 @@ TASCAR::session_t::session_t(const std::string& filename_or_data, load_type_t t,
   pthread_mutex_init(&mtx, NULL);
   // parse XML:
   read_xml();
-  if(scenes.empty()) {
-    add_scene(NULL);
-  }
   try {
     add_output_port("sync_out");
     jackc_transport_t::activate();
@@ -706,6 +700,8 @@ void TASCAR::session_t::add_module(tsccfg::node_t src)
 
 void TASCAR::session_t::start()
 {
+  if(scenes.empty())
+    add_scene(NULL);
   started_ = true;
   try {
     for(auto scene : scenes) {