Merge branch 'master' of https://github.com/CICM/HoaLibrary-PD

Hoa.xcodeproj/project.pbxproj

@@ -680,7 +680,7 @@
 					"values>",
 					"/usr/local/include/voro++",
 				);
-				"HEADER_SEARCH_PATHS[arch=*]" = "";
+				"HEADER_SEARCH_PATHS[arch=*]" = "/Applications/Pd-0.46-6.app/Contents/Resources/src/";
 				INSTALL_PATH = $SRCROOT/Package/Hoa;
 				LIBRARY_SEARCH_PATHS = "";
 				LLVM_LTO = YES;
@@ -717,7 +717,7 @@
 					"values>",
 					"/usr/local/include/voro++",
 				);
-				"HEADER_SEARCH_PATHS[arch=*]" = "";
+				"HEADER_SEARCH_PATHS[arch=*]" = "/Applications/Pd-extended.app/Contents/Resources/include/pdextended/";
 				INSTALL_PATH = "$SRCROOT/Package/Hoa/externals/MacOs/pd-extended";
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_LDFLAGS = (

Package/Hoa/README.txt

@@ -1,13 +1,16 @@
 ## [HOA](http://www.mshparisnord.fr/hoalibrary/ "Hoa Library") for Pure Data
 
+![CaptureHoaPD](http://www.mshparisnord.fr/hoalibrary/wp-content/uploads/2015/06/CaptureHoaPD.png)
+
 ### Compatibilty :
 
 The lastest release has been tested [Pure Data Vanilla](http://msp.ucsd.edu/software.html "PD-Vanilla") (0.46.6 - 32/64 bits) & [Pure Data Extended](https://puredata.info/ "PD-Extended") (0.43.4) on Linux, Mac Os, Windows .
 
 ### Installation :  
 
 With Pure Data Vanilla, copy the <em>Hoa</em> folder in your package folder and add <em>hoa</em> in the PD's statup window if you use the default package folder\*, otherwise add <em>Hoa/hoa</em>.  
-With Pure Data Extended, copy the <em>Hoa</em> folder in your package folder and add <em>-lib externals/"system"/pd-extended/hoa</em> in the statup falgs if you use the default package folder\*, otherwise add <em>-lib Hoa/externals/"system"/pd-extended/hoa</em> with <em>"system"</em> replaced by <em>Linux</em>, <em>MacOs</em> or <em>Windows</em>.  
+
+With Pure Data Extended, copy the <em>Hoa</em> folder in your package folder and add <em>-lib externals/Hoa</em> in the statup falgs if you use the default package folder\*, otherwise add <em>-lib Hoa/Hoa</em>.  
 
 \* The default package folder are generally <em>/usr/local/lib/pd-externals</em> on Linux, <em>/Library/Pd</em>  on Mac Os and <em>C:\Program Files\Common Files\Pd</em>  on Windows.  
 
@@ -20,7 +23,7 @@ Helps and tutorials are availables in the <em>Hoa</em> folder of the <em>help br
 ### Compilation : 
 
 	./autogen.sh (if needed)
-	./configure or ./configure --with-pdextended
+	./configure (useful options --with-pd=</path/to/pd>)
 	make
 	make install (optional)
 

README.md

@@ -1,13 +1,16 @@
 ## [HOA](http://www.mshparisnord.fr/hoalibrary/ "Hoa Library") for Pure Data
 
+![CaptureHoaPD](http://www.mshparisnord.fr/hoalibrary/wp-content/uploads/2015/06/CaptureHoaPD.png)
+
 ### Compatibilty :
 
 The lastest release has been tested [Pure Data Vanilla](http://msp.ucsd.edu/software.html "PD-Vanilla") (0.46.6 - 32/64 bits) & [Pure Data Extended](https://puredata.info/ "PD-Extended") (0.43.4) on Linux, Mac Os, Windows .
 
 ### Installation :  
 
 With Pure Data Vanilla, copy the <em>Hoa</em> folder in your package folder and add <em>hoa</em> in the PD's statup window if you use the default package folder\*, otherwise add <em>Hoa/hoa</em>.  
-With Pure Data Extended, copy the <em>Hoa</em> folder in your package folder and add <em>-lib externals/"system"/pd-extended/hoa</em> in the statup falgs if you use the default package folder\*, otherwise add <em>-lib Hoa/externals/"system"/pd-extended/hoa</em> with <em>"system"</em> replaced by <em>Linux</em>, <em>MacOs</em> or <em>Windows</em>.  
+
+With Pure Data Extended, copy the <em>Hoa</em> folder in your package folder and add <em>-lib externals/Hoa</em> in the statup falgs if you use the default package folder\*, otherwise add <em>-lib Hoa/Hoa</em>.  
 
 \* The default package folder are generally <em>/usr/local/lib/pd-externals</em> on Linux, <em>/Library/Pd</em>  on Mac Os and <em>C:\Program Files\Common Files\Pd</em>  on Windows.  
 
@@ -20,7 +23,7 @@ Helps and tutorials are availables in the <em>Hoa</em> folder of the <em>help br
 ### Compilation : 
 
 	./autogen.sh (if needed)
-	./configure or ./configure --with-pdextended
+	./configure (useful options --with-pd=</path/to/pd>)
 	make
 	make install (optional)
 

Sources/Makefile.am

@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 noinst_LTLIBRARIES = libHoapd.la
 
-libHoapd_la_CXXFLAGS = @PD_CPPFLAGS@ -O3 -fPIC -fpermissive -std=c++11 -pedantic
+libHoapd_la_CXXFLAGS = @PD_CPPFLAGS@ -O3 -fPIC -fpermissive -std=c++11 -pedantic -funroll-loops
 libHoapd_la_LDFLAGS = -module -avoid-version -shared -shrext .@EXTENSION@ @PD_LDFLAGS@ -fPIC 
 libHoapd_la_LIBADD = 
 

Sources/hoa.process_tilde.cpp

@@ -190,10 +190,6 @@ class ProcessInstance
         m_outs_extra.clear();
         m_outs_sig.clear();
         m_outs_extra_sig.clear();
-        if(m_canvas)
-        {
-            canvas_free(m_canvas);
-        }
     }
 
     inline void show() const noexcept
@@ -755,7 +751,7 @@ static void hoa_process_free(t_hoa_process *x)
     }
     if(x->f_global && x->f_switch)
     {
-        //canvas_free(x->f_global);
+        canvas_free(x->f_global);
     }
     x->f_instances.clear();
     eobj_dspfree(x);
@@ -775,11 +771,10 @@ static void *hoa_process_new(t_symbol *s, int argc, t_atom *argv)
         x->f_global = NULL;
         x->f_switch = NULL;
         x->f_target = _hoa_process::target_all;
-        t_pd *was = s__X.s_thing;
         x->f_global = canvas_new(NULL, gensym(""), 0, NULL);
-        s__X.s_thing = was;
         if(x->f_global)
         {
+            pd_popsym((t_pd *)x->f_global);
             canvas_vis(x->f_global, 0);
             t_atom av[3];
             atom_setlong(av, 10); atom_setlong(av+1, 10);atom_setsym(av+2, gensym("switch~"));

hoa.library.cpp

@@ -7,11 +7,6 @@
 #include "hoa.library.hpp"
 
 char hoaversion[] = "Beta 2.2";
-#ifdef PD_EXTENDED
-char pdversion[] = "Pd-Extended";
-#else
-char pdversion[] = "Pd-Vanilla";
-#endif
 
 static t_eclass *cream_class;
 
@@ -20,7 +15,7 @@ static void *hoa_new(t_symbol *s)
     t_eobj *x = (t_eobj *)eobj_new(cream_class);
     if(x)
     {
-        logpost(x, 3, "HOA Library by Julien Colafrancesco, Pierre Guillot, Eliott Paris & Thomas Le Meur\n© 2013 - 2015  CICM | Paris 8 University\nVersion %s (%s) for %s %i.%i\n",hoaversion, __DATE__, pdversion, PD_MAJOR_VERSION, PD_MINOR_VERSION);
+        logpost(x, 3, "HOA Library by Julien Colafrancesco, Pierre Guillot, Eliott Paris & Thomas Le Meur\n© 2013 - 2015  CICM | Paris 8 University\nVersion %s (%s) for Pure Data %i.%i\n",hoaversion, __DATE__, PD_MAJOR_VERSION, PD_MINOR_VERSION);
     }
     return (x);
 }
@@ -33,7 +28,7 @@ extern "C" void hoa_setup(void)
     t_eobj* obj = (t_eobj *)hoa_new(NULL);
     if(!obj)
     {
-        verbose(3, "HOA Library by Julien Colafrancesco, Pierre Guillot, Eliott Paris & Thomas Le Meur\n© 2013 - 2015  CICM | Paris 8 University\nVersion %s (%s) for %s %i.%i\n",hoaversion, __DATE__, pdversion, PD_MAJOR_VERSION, PD_MINOR_VERSION);
+        verbose(3, "HOA Library by Julien Colafrancesco, Pierre Guillot, Eliott Paris & Thomas Le Meur\n© 2013 - 2015  CICM | Paris 8 University\nVersion %s (%s) for Pure Data %i.%i\n",hoaversion, __DATE__, PD_MAJOR_VERSION, PD_MINOR_VERSION);
         eobj_free(obj);
     }