update cbox

template/calfbox/py/cbox.py

@@ -1041,6 +1041,8 @@ class DocScene(DocObj):
     def move_layer(self, old_pos, new_pos):
         self.cmd("/move_layer", None, int(old_pos + 1), int(new_pos + 1))
 
+    #Layer positions are 0 for "append" and other positions are 1...n which need to be unique
+
     def add_layer(self, aux, pos = None):
         if pos is None:
             return self.cmd_makeobj("/add_layer", 0, aux)

template/calfbox/sampler_layer.c

@@ -1319,7 +1319,7 @@ void sampler_layer_data_finalize(struct sampler_layer_data *l, struct sampler_la
             l->computed.eff_waveform = cbox_wavebank_get_waveform(p->name, p->tarfile, p->sample_dir, l->sample, &error);
             if (!l->computed.eff_waveform)
             {
-                g_warning("Cannot load waveform %s: %s", l->sample, error ? error->message : "unknown error");
+                g_warning("Cannot load waveform \"%s\" in sample_dir \"%s\" : \"%s\"", l->sample, p->sample_dir, error ? error->message : "unknown error");
                 g_error_free(error);
             }
         }

template/calfbox/sfzloader.c

@@ -275,7 +275,9 @@ gboolean sampler_module_load_program_sfz(struct sampler_module *m, struct sample
     if (is_from_string)
         status = load_sfz_from_string(sfz, strlen(sfz), &c, error);
     else
-        status = load_sfz(sfz, prg->tarfile, &c, error);
+    {
+        status = load_sfz(sfz, prg->tarfile, &c, error); //Loads the audio files but also sets fields, like prg->sample_dir. After this we cannot modify any values anymore.
+    }
     if (!status)
     {
         if (ls.region)

template/calfbox/sfzparser.c

@@ -434,6 +434,11 @@ restore:
     return ok;
 }
 
+/*
+ * This is not only called when literally constructing a sfz string
+ * but also when loading a null instrument e.g. to first create the jack ports and only later
+ * actually load the sfz and samples, which can be costly.
+ */
 gboolean load_sfz_from_string(const char *buf, int len, struct sfz_parser_client *c, GError **error)
 {
     struct sfz_parser_state s;
@@ -449,13 +454,17 @@ gboolean load_sfz_from_string(const char *buf, int len, struct sfz_parser_client
     return result;
 }
 
+/*
+ * Called once per sfz.
+ * Does not load samples, but only the sfz file.
+ */
 gboolean load_sfz_into_state(struct sfz_parser_state *s, const char *name)
 {
     g_clear_error(s->error);
     FILE *f;
     int len = -1;
     if (s->tarfile)
-    {
+    {   //This only extracts the .sfz file itself and will not attempt to load any sample waveforms, eventhough cbox_tarfile_get_item_by_name will later be used to extract the sample as well.
         struct cbox_taritem *item = cbox_tarfile_get_item_by_name(s->tarfile, name, TRUE);
         if (!item)
         {

template/calfbox/tarfile.h

@@ -38,7 +38,7 @@ struct cbox_tarfile
     int refs;
     GHashTable *items_byname;
     GHashTable *items_byname_nc;
-    char *file_pathname;
+    char *file_pathname; //full path to the .tar file with filename.ext
 };
 
 struct cbox_tarpool

template/calfbox/wavebank.c

@@ -320,6 +320,24 @@ struct cbox_waveform *cbox_wavebank_get_waveform(const char *context_name, struc
     struct cbox_taritem *taritem = NULL;
     if (tarfile)
     {
+        if (strcmp(sample_dir, ".") == 0)
+        {
+            //Potential path lookup problem:
+
+            //This is a sample without sfz default_path opcode inside a tar.
+            //We need to set the sample dir to the position of the .sfz file within the .tar
+            //because we also assume that the sample paths in regions are relative to the .sfz path.
+
+            //If the sfz is in the tar root this is a redundant action, but if the sfz is itself
+            //in a subdirectoy we need to adjust the path now.
+            // XXXNH sample_dir will not be updated in the struct itself and thus reported as "." in python etc.
+
+            //context_name is the sfz file, filename the sample file without leading ./  and sample_dir just a dot.
+
+            gchar *sfz_dir = g_path_get_dirname(context_name); //take the path of the sfz file...
+            pathname = g_build_filename(sfz_dir, filename, NULL); //... and prefix the sample filename with it.
+            g_free(sfz_dir);
+        }
         taritem = cbox_tarfile_get_item_by_name(tarfile, pathname, TRUE);
         if (taritem)
             sndfile = cbox_tarfile_opensndfile(tarfile, taritem, &waveform->sndstream, &waveform->info);

template/engine/api.py

@@ -308,6 +308,9 @@ def startEngine(nsmClient):
     logger.info("Template api engine started")
 
 
+def isStandaloneMode():
+    return session.standaloneMode
+
 def _deprecated_updatePlayback():
     """The only place in the program to update the cbox playback besides startEngine.
     We only need to update it after a user action, which always goes through the api.