Merge branch 'develop' of https://github.com/csound/csound into develop

Author: stekyne

Engine/csound_data_structures.c

@@ -356,7 +356,7 @@ char *cs_inverse_hash_get(CSOUND* csound, CS_HASH_TABLE* hashTable, int n)
         item = item->next;
       }
     }
-    return NULL;
+    return "";
 }
 
 

Opcodes/arrays.c

@@ -2201,16 +2201,16 @@ static int32_t tabsuma(CSOUND *csound, TABQUERY1 *p)
     if (UNLIKELY(early)) {
         memset(&ans[nsmps], '\0', early*sizeof(MYFLT));
     }
-    
+
     memcpy(ans,&(t->data[0]) + offset,
-           sizeof(MYFLT)*nsmps); 
+           sizeof(MYFLT)*nsmps);
     for (i=0; i<t->dimensions; i++) size += t->sizes[i];
     for (i=1; i<size; i++) {
       int j, k = i*span;
       in = &(t->data[k]);
-      for(j=offset; j < nsmps; j++) 
+      for(j=offset; j < nsmps; j++)
         ans[j] += in[j];
-        } 
+        }
     return OK;
 }
 
@@ -3531,14 +3531,38 @@ int32_t shiftout_perf(CSOUND *csound, FFT *p) {
     return OK;
 }
 
-int32_t scalarset(CSOUND *csound, FFT *p) {
+int32_t scalarset(CSOUND *csound, TABCOPY *p) {
     IGN(csound);
-    uint32_t siz = 0 , dim = p->out->dimensions, i;
-    MYFLT val = *((MYFLT *)p->in);
+    uint32_t siz = 0 , dim = p->tab->dimensions, i;
+    MYFLT val = *p->kfn;
     for (i=0; i < dim; i++)
-      siz += p->out->sizes[i];
+      siz += p->tab->sizes[i];
     for (i=0; i < siz; i++)
-      p->out->data[i] = val;
+      p->tab->data[i] = val;
+    return OK;
+}
+
+int32_t arrayass(CSOUND *csound, TABCOPY *p)
+{
+    IGN(csound);
+    uint32_t siz = 0 , dim = p->tab->dimensions, i;
+    uint32_t offset = p->h.insdshead->ksmps_offset;
+    uint32_t early  = p->h.insdshead->ksmps_no_end;
+    uint32_t n, nsmps = CS_KSMPS;
+    int32_t span = (p->tab->arrayMemberSize)/sizeof(MYFLT);
+    MYFLT *val = p->kfn;
+
+    for (i=0; i < dim; i++)
+      siz += p->tab->sizes[i];
+    for (i=0; i < siz; i++) {
+      int32_t pp = i*span;
+      for (n=0; n<offset; n++)
+        p->tab->data[pp+n] = FL(0.0);
+      for (n=offset; n<nsmps-early; n++)
+        p->tab->data[pp+n] = val[n];
+      for (n=nsmps-early; n<nsmps; n++)
+        p->tab->data[pp+n] = FL(0.0);
+    }
     return OK;
 }
 
@@ -4054,9 +4078,9 @@ static OENTRY arrayvars_localops[] =
     { "lentab.k", sizeof(TABQUERY1), _QQ, 1, "k", "k[]p", NULL, (SUBR) tablength },
     { "lenarray.ix", sizeof(TABQUERY1), 0, 1, "i", ".[]p", (SUBR) tablength },
     { "lenarray.kx", sizeof(TABQUERY1), 0, 2, "k", ".[]p", NULL, (SUBR)tablength },
-    { "out.A", sizeof(OUTA), 0, 3,"", "a[]", (SUBR)outa_set, (SUBR)outa},
+    { "out.A", sizeof(OUTA), IR, 3,"", "a[]", (SUBR)outa_set, (SUBR)outa},
     { "in.A", sizeof(OUTA), 0, 3, "a[]", "", (SUBR)ina_set, (SUBR)ina},
-    { "monitor.A", sizeof(OUTA), 0, 3, "a[]", "",
+    { "monitor.A", sizeof(OUTA), IB, 3, "a[]", "",
       (SUBR)monitora_init, (SUBR)monitora_perf},
     { "rfft", sizeof(FFT), 0, 3, "k[]","k[]",
       (SUBR) init_rfft, (SUBR) perf_rfft, NULL},
@@ -4128,8 +4152,9 @@ static OENTRY arrayvars_localops[] =
      (SUBR) shiftout_init, (SUBR) shiftout_perf},
     {"unwrap", sizeof(FFT), 0, 3, "k[]","k[]",
      (SUBR) init_recttopol, (SUBR) unwrap},
-    {"=.k", sizeof(FFT), 0, 3, "k[]","k", (SUBR) scalarset, (SUBR) scalarset},
-     {"dct", sizeof(FFT), 0, 3, "k[]","k[]",
+    {"=.X", sizeof(TABCOPY), 0, 3, "k[]","k", (SUBR) scalarset, (SUBR) scalarset},
+    {"=.Z", sizeof(TABCOPY), 0 , 2, "a[]", "a", NULL, (SUBR) arrayass},
+    {"dct", sizeof(FFT), 0, 3, "k[]","k[]",
      (SUBR) init_dct, (SUBR) kdct, NULL},
     {"dct", sizeof(FFT), 0, 1, "i[]","i[]",
      (SUBR) dct, NULL, NULL},

cmake/Modules/FindLIBLO.cmake

@@ -7,9 +7,9 @@
 find_path(LIBLO_INCLUDE_DIR lo.h PATH_SUFFIXES lo)
 
 if(LINUX)
-find_library(LIBLO_LIBRARY NAMES lo)
+ find_library(LIBLO_LIBRARY NAMES lo)
 else()
-find_library(LIBLO_LIBRARY NAMES liblo.a lo)
+ find_library(LIBLO_LIBRARY NAMES liblo.a liblo)
 endif()
 
 set(LIBLO_INCLUDE_DIRS ${LIBLO_INCLUDE_DIR})