- better handling of click callback

bugfixes and optimizations, especially for DSP under Max/MSP
- more compatible handling of attributes in patcher (hiding is now an option - define FLEXT_ATTRHIDE)

svn path=/trunk/; revision=3636

1 files changed, 39 insertions, 95 deletions

diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp
index fa9ac506..f6f109ad 100644
--- a/externals/grill/flext/source/fldsp.cpp
+++ b/externals/grill/flext/source/fldsp.cpp
@@ -18,10 +18,6 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 // === flext_dsp ==============================================
 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-const t_symbol *flext_dsp::dspsym = MakeSymbol("__flext_dspfun__");
-#endif
-
 void flext_dsp::Setup(t_classid id)
 {
     t_class *c = getClass(id);
@@ -33,52 +29,45 @@ void flext_dsp::Setup(t_classid id)
     CLASS_MAINSIGNALIN(c,flext_hdr,defsig); // float messages going into the left inlet are converted to signal
     add_dsp(c,cb_dsp);
     add_method1(c,cb_enable,"enable",A_FLOAT);
-#elif FLEXT_SYS == FLEXT_SYS_JMAX
-    fts_dsp_declare_function(dspsym,dspmeth);   
-    fts_class_message_varargs(c, fts_s_put, cb_dsp);
-    fts_class_message_varargs(c, MakeSymbol("enable"), cb_enable);
+#else
+#error Platform not supported!
 #endif
 }
 
-flext_dsp::FLEXT_CLASSDEF(flext_dsp)(): 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-    srate(fts_dsp_get_sample_rate()),  // should we set it?
-    blksz(fts_dsp_get_tick_size()),
-#else
-    srate(sys_getsr()),blksz(sys_getblksize()),
-#endif
-    chnsin(0),chnsout(0),
+flext_dsp::FLEXT_CLASSDEF(flext_dsp)()
+    : srate(sys_getsr()),blksz(sys_getblksize())
+    , vecs(NULL)
 #if FLEXT_SYS != FLEXT_SYS_MAX
-    dspon(true),
+    , dspon(true)
 #endif
-    invecs(NULL),outvecs(NULL)
+{}
+
+#if FLEXT_SYS == FLEXT_SYS_MAX
+bool flext_dsp::Init()
 {
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-    fts_dsp_object_init(thisHdr());
-#endif
-}
+    if(!flext_base::Init())
+		return false;
 
+	// according to the Max/MSP SDK this should be prior to any inlet creation, BUT
+	// that doesn't seem to be true... multiple signal ins and additional inlets don't seem to work then      
+	dsp_setup(thisHdr(),CntInSig()); // signal inlets   
+	return true;
+}
+#endif    
 
-flext_dsp::~FLEXT_CLASSDEF(flext_dsp)()
+void flext_dsp::Exit()
 {
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-    fts_dsp_object_delete(thisHdr());
-#endif
-
 #if FLEXT_SYS == FLEXT_SYS_MAX
-    // switch off dsp as the dsp function might get called afterwards (different thread)
-    thisHdr()->z_disabled = true;
+    // according to David Z. one should do that first...
+	dsp_free(thisHdr());
 #endif
 
-    if(invecs) delete[] invecs;
-    if(outvecs) delete[] outvecs;
+    flext_base::Exit();
+    
+    if(vecs) delete[] vecs;
 }
 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-void flext_dsp::dspmeth(fts_word_t *w) 
-{ 
-}
-#else
+
 t_int *flext_dsp::dspmeth(t_int *w) 
 { 
     flext_dsp *obj = (flext_dsp *)(size_t)w[1];
@@ -95,11 +84,8 @@ t_int *flext_dsp::dspmeth(t_int *w)
     }
     return w+2;
 }
-#endif
 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-void flext_dsp::cb_dsp(fts_object_t *c, int winlet, fts_symbol_t s, int ac, const fts_atom_t *at)
-#elif FLEXT_SYS == FLEXT_SYS_MAX
+#if FLEXT_SYS == FLEXT_SYS_MAX
 void flext_dsp::cb_dsp(t_class *c,t_signal **sp,short *count) 
 #else
 void flext_dsp::cb_dsp(t_class *c,t_signal **sp) 
@@ -113,94 +99,52 @@ void flext_dsp::cb_dsp(t_class *c,t_signal **sp)
 #if FLEXT_SYS == FLEXT_SYS_PD
     // min. 1 input channel! (CLASS_MAININLET in pd...)
     if(!in) in = 1;
-#else
-    if(in+out == 0) return;
 #endif
 
     // store current dsp parameters
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-    fts_dsp_descr_t *dsp = (fts_dsp_descr_t *)fts_get_pointer(at+0);
-    obj->srate = fts_dsp_get_input_srate(dsp,0);
-    obj->blksz = fts_dsp_get_input_size(dsp,0);  // is this guaranteed to be the same as sys_getblksize() ?
-#else
     obj->srate = sp[0]->s_sr;
     obj->blksz = sp[0]->s_n;  // is this guaranteed to be the same as sys_getblksize() ?
-#endif
 
     // store in and out signal vectors
 
-    if(in != obj->chnsin) {
-        if(obj->invecs) delete[] obj->invecs;
-        obj->invecs = in?new t_signalvec[in]:NULL;
-        obj->chnsin = in;
-    }
-    for(i = 0; i < in; ++i) 
-        obj->invecs[i] = 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-            fts_dsp_get_input_name(dsp,i);
-#else
-            sp[i]->s_vec;
-#endif
+    if((in+out) && !obj->vecs)
+        obj->vecs = new t_signalvec[in+out];
 
-    if(out != obj->chnsout) {
-        if(obj->outvecs) delete[] obj->outvecs;
-        obj->outvecs = out?new t_signalvec[out]:NULL;
-        obj->chnsout = out;
-    }
+    for(i = 0; i < in; ++i) 
+        obj->vecs[i] = sp[i]->s_vec;
     for(i = 0; i < out; ++i) 
-        obj->outvecs[i] = 
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-            fts_dsp_get_output_name(dsp,i);
-#else
-            sp[in+i]->s_vec;
-#endif
+        obj->vecs[in+i] = sp[in+i]->s_vec;
 
     // with the following call derived classes can do their eventual DSP setup
     if(obj->CbDsp()) {
         // set the DSP function
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-        fts_atom_t args;
-        fts_set_pointer(args,obj);
-        fts_dsp_add_function(dspsym,1,args);
-#else
         dsp_add((t_dspmethod)dspmeth,1,obj);  
-#endif
     }
 }
 
-/*
-#if FLEXT_SYS == FLEXT_SYS_JMAX
-void flext_dsp::cb_dsp_init(fts_object_t *c, int winlet, fts_symbol_t *s, int ac, const fts_atom_t *at)
-{
-    fts_dsp_add_object(c);
-}
-
-void flext_dsp::cb_dsp_delete(fts_object_t *c, int winlet, fts_symbol_t *s, int ac, const fts_atom_t *at)
-{
-    fts_dsp_remove_object(c);
-}
-#endif
-*/
 
 void flext_dsp::m_dsp(int /*n*/,t_signalvec const * /*insigs*/,t_signalvec const * /*outsigs*/) {}
 
 bool flext_dsp::CbDsp() 
 { 
-    m_dsp(Blocksize(),invecs,outvecs); 
+	// invoke legacy method
+    m_dsp(Blocksize(),InSig(),OutSig()); 
     return true;
 }
 
+// this function will be overridden anyway - the probably useless default is clearing all outputs
 void flext_dsp::m_signal(int n,t_sample *const * /*insigs*/,t_sample *const *outs) 
 {
     for(int i = 0; i < CntOutSig(); ++i) ZeroSamples(outs[i],n);
 }
 
-void flext_dsp::CbSignal() { m_signal(Blocksize(),invecs,outvecs); }
+void flext_dsp::CbSignal() 
+{ 
+	// invoke legacy method
+	m_signal(Blocksize(),InSig(),OutSig()); 
+}
 
 
 #if FLEXT_SYS == FLEXT_SYS_PD
 void flext_dsp::cb_enable(t_class *c,t_float on) { thisObject(c)->dspon = on != 0; }
-#elif FLEXT_SYS == FLEXT_SYS_JMAX
-void flext_dsp::cb_enable(fts_object_t *c, int winlet, fts_symbol_t s, int ac, const fts_atom_t *at)
-{ thisObject(c)->dspon = fts_get_int(at+0) != 0; }
 #endif