v2.1.0 update

cuinjune · May 13, 2019 · 51c42fb · 51c42fb
1 parent 8b335cd
commit 51c42fb
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 2 deletions.
diff --git a/ofelia/CHANGES.txt b/ofelia/CHANGES.txt
@@ -1,8 +1,9 @@
-v2.1.0: 6 May 2019
+v2.1.0: 13 May 2019
 
 * rebuilt using openFrameworks 0.10.1
 * fixed ofelia get/set issue with inlets
-* enabled ofUnicode, ofAlphabet and ofTrueTypeFontSettings classes
+* fixed handling of list with 0 or 1 argument 
+* enabled ofUnicode, ofAlphabet and ofTrueTypeFontSettings classes in swig
 * added "examples/text/unicode" example
 
 v2.0.4: 17 Dec 2018

diff --git a/ofelia/src/ofeliaClient.cpp b/ofelia/src/ofeliaClient.cpp
@@ -20,6 +20,7 @@
  ==============================================================================*/
 
 #include "ofeliaClient.h"
+#include <string.h>
 
 bool ofeliaClient::isDataValid()
 {
@@ -32,30 +33,89 @@ bool ofeliaClient::isDataValid()
 void ofeliaClient::bangMethod()
 {
     if (!isDataValid()) return;
+    if (data.io.hasMultiControlInlets)
+    {
+        int ac = data.io.numInlets - 1;
+        t_atom *av = static_cast<t_atom *>(getbytes(sizeof(t_atom) * ac));
+        data.io.doList(ac, av);
+        freebytes(av, sizeof(t_atom) * ac);
+        return;
+    }
     data.lua.doFunction(&s_bang);
 }
 
 void ofeliaClient::floatMethod(t_floatarg f)
 {
     if (!isDataValid()) return;
+    if (data.io.hasMultiControlInlets)
+    {
+        int ac = data.io.numInlets;
+        t_atom *av = static_cast<t_atom *>(getbytes(sizeof(t_atom) * ac));
+        SETFLOAT(av, f);
+        data.io.doList(ac, av);
+        freebytes(av, sizeof(t_atom) * ac);
+        return;
+    }
     data.lua.doFunction(&s_float, f);
 }
 
 void ofeliaClient::symbolMethod(t_symbol *s)
 {
     if (!isDataValid()) return;
+    if (data.io.hasMultiControlInlets)
+    {
+        int ac = data.io.numInlets;
+        t_atom *av = static_cast<t_atom *>(getbytes(sizeof(t_atom) * ac));
+        SETSYMBOL(av, s);
+        data.io.doList(ac, av);
+        freebytes(av, sizeof(t_atom) * ac);
+        return;
+    }
     data.lua.doFunction(&s_symbol, s);
 }
 
 void ofeliaClient::pointerMethod(t_gpointer *p)
 {
     if (!isDataValid()) return;
+    if (data.io.hasMultiControlInlets)
+    {
+        int ac = data.io.numInlets;
+        t_atom *av = static_cast<t_atom *>(getbytes(sizeof(t_atom) * ac));
+        SETPOINTER(av, p);
+        data.io.doList(ac, av);
+        freebytes(av, sizeof(t_atom) * ac);
+        return;
+    }
     data.lua.doFunction(&s_pointer, p);
 }
 
 void ofeliaClient::listMethod(t_symbol *s, int argc, t_atom *argv)
 {
     if (!isDataValid()) return;
+    if (!argc)
+    {
+        bangMethod();
+        return;
+    }
+    if (argc == 1)
+    {
+        if (argv->a_type == A_FLOAT)
+            floatMethod(argv->a_w.w_float);
+        else if (argv->a_type == A_SYMBOL)
+            symbolMethod(argv->a_w.w_symbol);
+        else if (argv->a_type == A_POINTER)
+            pointerMethod(argv->a_w.w_gpointer);
+        return;
+    }
+    if (data.io.hasMultiControlInlets)
+    {
+        int ac = data.io.numInlets + argc - 1;
+        t_atom *av = static_cast<t_atom *>(getbytes(sizeof(t_atom) * ac));
+        memcpy(av, argv, sizeof(t_atom) * argc);
+        data.io.doList(ac, av);
+        freebytes(av, sizeof(t_atom) * ac);
+        return;
+    }
     data.lua.doFunction(&s_list, argc, argv);
 }
 

diff --git a/ofelia/src/ofeliaDefine.cpp b/ofelia/src/ofeliaDefine.cpp
@@ -96,6 +96,21 @@ void ofeliaDefine::pointerMethod(t_gpointer *p)
 
 void ofeliaDefine::listMethod(t_symbol *s, int argc, t_atom *argv)
 {
+    if (!argc)
+    {
+        bangMethod();
+        return;
+    }
+    if (argc == 1)
+    {
+        if (argv->a_type == A_FLOAT)
+            floatMethod(argv->a_w.w_float);
+        else if (argv->a_type == A_SYMBOL)
+            symbolMethod(argv->a_w.w_symbol);
+        else if (argv->a_type == A_POINTER)
+            pointerMethod(argv->a_w.w_gpointer);
+        return;
+    }
     if (data.io.hasMultiControlInlets)
     {
         int ac = data.io.numInlets + argc - 1;