diff --git a/Hoa.xcodeproj/project.pbxproj b/Hoa.xcodeproj/project.pbxproj index 0a42a70..b700ef3 100644 --- a/Hoa.xcodeproj/project.pbxproj +++ b/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 = ( diff --git a/Package/Hoa/README.txt b/Package/Hoa/README.txt index 24cf6fb..22055f2 100644 --- a/Package/Hoa/README.txt +++ b/Package/Hoa/README.txt @@ -1,5 +1,7 @@ ## [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 . @@ -7,7 +9,8 @@ The lastest release has been tested [Pure Data Vanilla](http://msp.ucsd.edu/soft ### Installation : With Pure Data Vanilla, copy the Hoa folder in your package folder and add hoa in the PD's statup window if you use the default package folder\*, otherwise add Hoa/hoa. -With Pure Data Extended, copy the Hoa folder in your package folder and add -lib externals/"system"/pd-extended/hoa in the statup falgs if you use the default package folder\*, otherwise add -lib Hoa/externals/"system"/pd-extended/hoa with "system" replaced by Linux, MacOs or Windows. + +With Pure Data Extended, copy the Hoa folder in your package folder and add -lib externals/Hoa in the statup falgs if you use the default package folder\*, otherwise add -lib Hoa/Hoa. \* The default package folder are generally /usr/local/lib/pd-externals on Linux, /Library/Pd on Mac Os and C:\Program Files\Common Files\Pd on Windows. @@ -20,7 +23,7 @@ Helps and tutorials are availables in the Hoa folder of the help br ### Compilation : ./autogen.sh (if needed) - ./configure or ./configure --with-pdextended + ./configure (useful options --with-pd=) make make install (optional) diff --git a/README.md b/README.md index 24cf6fb..22055f2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## [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 . @@ -7,7 +9,8 @@ The lastest release has been tested [Pure Data Vanilla](http://msp.ucsd.edu/soft ### Installation : With Pure Data Vanilla, copy the Hoa folder in your package folder and add hoa in the PD's statup window if you use the default package folder\*, otherwise add Hoa/hoa. -With Pure Data Extended, copy the Hoa folder in your package folder and add -lib externals/"system"/pd-extended/hoa in the statup falgs if you use the default package folder\*, otherwise add -lib Hoa/externals/"system"/pd-extended/hoa with "system" replaced by Linux, MacOs or Windows. + +With Pure Data Extended, copy the Hoa folder in your package folder and add -lib externals/Hoa in the statup falgs if you use the default package folder\*, otherwise add -lib Hoa/Hoa. \* The default package folder are generally /usr/local/lib/pd-externals on Linux, /Library/Pd on Mac Os and C:\Program Files\Common Files\Pd on Windows. @@ -20,7 +23,7 @@ Helps and tutorials are availables in the Hoa folder of the help br ### Compilation : ./autogen.sh (if needed) - ./configure or ./configure --with-pdextended + ./configure (useful options --with-pd=) make make install (optional) diff --git a/Sources/Makefile.am b/Sources/Makefile.am index 5e80c90..4b8d48a 100644 --- a/Sources/Makefile.am +++ b/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 = diff --git a/Sources/hoa.process_tilde.cpp b/Sources/hoa.process_tilde.cpp index 7bf9fff..858bc18 100644 --- a/Sources/hoa.process_tilde.cpp +++ b/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~")); diff --git a/hoa.library.cpp b/hoa.library.cpp index 31d3e99..eb5a503 100644 --- a/hoa.library.cpp +++ b/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); }