From a2b76c71f48393a78f43606f2bbc34727901f2dd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 Sep 2003 05:19:17 +0000 Subject: added #if's and minor tweaks to make things compile with pd 0.37 svn path=/trunk/externals/unauthorized/; revision=929 --- Makefile | 2 +- audience~/audience~.c | 2 ++ exciter/exciter.c | 7 +++++++ filterbank~/filterbank~.c | 6 ++++++ grid/grid.c | 13 ++++++++++++- grid/grid2.c | 6 ++++++ mp3live~/mp3fileout~.c | 1 + mp3live~/mp3streamin~.c | 5 +++++ pianoroll/pianoroll.c | 6 ++++++ playlist/playlist.c | 6 ++++++ probalizer/probalizer.c | 6 ++++++ scratcher~/scratcher~.c | 6 ++++++ sonogram~/sonogram~-joge.c | 6 ++++++ sonogram~/sonogram~-yves.c | 6 ++++++ sonogram~/sonogram~.c | 6 ++++++ 15 files changed, 82 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9ee92d8..4a56c14 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ clean: # delete emacs backup files -rm -f */*.?~ */*.~?.?.~ # delete compile products - -rm -f *.o *.pd_* *.dll *.tk2c core so_locations + -rm -f *.o *.pd_* *.dll *.tk2c core so_locations ChangeLog -rm -f */*.?~ */*.o */*.pd_* */*.dll */*.tk2c */.*.swp */core so_locations # delete autoconf/automake product -rm -Rf */autom4te.cache diff --git a/audience~/audience~.c b/audience~/audience~.c index 4340211..74b19b7 100644 --- a/audience~/audience~.c +++ b/audience~/audience~.c @@ -1049,6 +1049,8 @@ void audience_tilde_setup(void) audience_widgetbehavior.w_deletefn = audience_delete; audience_widgetbehavior.w_visfn = audience_vis; audience_widgetbehavior.w_clickfn = audience_click; + /* As of 0.37, pd does not have these last two elements in */ + /* a t_widgetbehavoir anymore. */ #if PD_MAJOR_VERSION == 0 #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) audience_widgetbehavior.w_propertiesfn = audience_properties; diff --git a/exciter/exciter.c b/exciter/exciter.c index 66a8ff7..d9a4310 100644 --- a/exciter/exciter.c +++ b/exciter/exciter.c @@ -810,8 +810,15 @@ void exciter_setup(void) exciter_widgetbehavior.w_deletefn = exciter_delete; exciter_widgetbehavior.w_visfn = exciter_vis; exciter_widgetbehavior.w_clickfn = exciter_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) exciter_widgetbehavior.w_propertiesfn = exciter_properties; exciter_widgetbehavior.w_savefn = exciter_save; +#endif +#endif + class_setwidget(exciter_class, &exciter_widgetbehavior); class_sethelpsymbol(exciter_class, gensym("help-exciter.pd")); } diff --git a/filterbank~/filterbank~.c b/filterbank~/filterbank~.c index 19bc773..5d238ff 100644 --- a/filterbank~/filterbank~.c +++ b/filterbank~/filterbank~.c @@ -654,8 +654,14 @@ void filterbank_tilde_setup(void) filterbank_widgetbehavior.w_deletefn = filterbank_delete; filterbank_widgetbehavior.w_visfn = filterbank_vis; filterbank_widgetbehavior.w_clickfn = NULL; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) filterbank_widgetbehavior.w_propertiesfn = filterbank_properties; filterbank_widgetbehavior.w_savefn = filterbank_save; +#endif +#endif class_setwidget(filterbank_class_tilde, &filterbank_widgetbehavior); class_sethelpsymbol(filterbank_class_tilde, gensym("help-filterbank~.pd")); } diff --git a/grid/grid.c b/grid/grid.c index 3e040e8..5042f4e 100644 --- a/grid/grid.c +++ b/grid/grid.c @@ -94,7 +94,12 @@ static void grid_draw_new(t_grid *x, t_glist *glist) t_canvas *canvas=glist_getcanvas(glist); char *tagRoot; - rtext_new(glist, (t_text *)x, glist->gl_editor->e_rtext, 0); +/* rtext_new(); in g_canvas.h changed in 0.37 */ +#if PD_MINOR_VERSION >= 37 + rtext_new(glist, (t_text *)x); +#else + rtext_new(glist, (t_text *)x, glist->gl_editor->e_rtext, 0); +#endif tagRoot = rtext_gettag(glist_findrtext(glist,(t_text *)x)); GRID_SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #124392 -tags %xGRID\n", canvas, x->x_obj.te_xpix, x->x_obj.te_ypix, @@ -664,8 +669,14 @@ void grid_setup(void) grid_widgetbehavior.w_deletefn = grid_delete; grid_widgetbehavior.w_visfn = grid_vis; grid_widgetbehavior.w_clickfn = grid_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) grid_widgetbehavior.w_propertiesfn = grid_properties; grid_widgetbehavior.w_savefn = grid_save; +#endif +#endif class_setwidget(grid_class, &grid_widgetbehavior); class_sethelpsymbol(grid_class, gensym("help-grid.pd")); } diff --git a/grid/grid2.c b/grid/grid2.c index df53c5b..426e2d2 100644 --- a/grid/grid2.c +++ b/grid/grid2.c @@ -535,8 +535,14 @@ void grid_setup(void) grid_widgetbehavior.w_deletefn = grid_delete; grid_widgetbehavior.w_visfn = grid_vis; grid_widgetbehavior.w_clickfn = grid_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) grid_widgetbehavior.w_propertiesfn = grid_properties; grid_widgetbehavior.w_savefn = grid_save; +#endif +#endif class_setwidget(grid_class, &grid_widgetbehavior); class_sethelpsymbol(grid_class, gensym("help-grid.pd")); } diff --git a/mp3live~/mp3fileout~.c b/mp3live~/mp3fileout~.c index edadf8e..41476f1 100644 --- a/mp3live~/mp3fileout~.c +++ b/mp3live~/mp3fileout~.c @@ -30,6 +30,7 @@ /* ---------------------------------------------------------------------------- */ +#include #include #include diff --git a/mp3live~/mp3streamin~.c b/mp3live~/mp3streamin~.c index 954af64..54fe5ac 100644 --- a/mp3live~/mp3streamin~.c +++ b/mp3live~/mp3streamin~.c @@ -30,9 +30,14 @@ /* ---------------------------------------------------------------------------- */ +#include #include #include +#if PD_MINOR_VERSION >=37 +#include "s_stuff.h" +#endif + #include #include #ifdef UNIX diff --git a/pianoroll/pianoroll.c b/pianoroll/pianoroll.c index b005017..6b8304d 100644 --- a/pianoroll/pianoroll.c +++ b/pianoroll/pianoroll.c @@ -800,8 +800,14 @@ void pianoroll_setup(void) pianoroll_widgetbehavior.w_deletefn = pianoroll_delete; pianoroll_widgetbehavior.w_visfn = pianoroll_vis; pianoroll_widgetbehavior.w_clickfn = pianoroll_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) pianoroll_widgetbehavior.w_propertiesfn = pianoroll_properties; pianoroll_widgetbehavior.w_savefn = pianoroll_save; +#endif +#endif class_setwidget(pianoroll_class, &pianoroll_widgetbehavior); class_sethelpsymbol(pianoroll_class, gensym("help-pianoroll.pd")); } diff --git a/playlist/playlist.c b/playlist/playlist.c index a953b36..a79f4c4 100644 --- a/playlist/playlist.c +++ b/playlist/playlist.c @@ -742,8 +742,14 @@ void playlist_setup(void) playlist_widgetbehavior.w_deletefn = playlist_delete; playlist_widgetbehavior.w_visfn = playlist_vis; playlist_widgetbehavior.w_clickfn = playlist_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) playlist_widgetbehavior.w_propertiesfn = playlist_properties; playlist_widgetbehavior.w_savefn = playlist_save; +#endif +#endif class_setwidget(playlist_class, &playlist_widgetbehavior); class_sethelpsymbol(playlist_class, gensym("help-playlist.pd")); } diff --git a/probalizer/probalizer.c b/probalizer/probalizer.c index b3efe1a..e789412 100644 --- a/probalizer/probalizer.c +++ b/probalizer/probalizer.c @@ -687,8 +687,14 @@ void probalizer_setup(void) probalizer_widgetbehavior.w_deletefn = probalizer_delete; probalizer_widgetbehavior.w_visfn = probalizer_vis; probalizer_widgetbehavior.w_clickfn = probalizer_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) probalizer_widgetbehavior.w_propertiesfn = probalizer_properties; probalizer_widgetbehavior.w_savefn = probalizer_save; +#endif +#endif class_setwidget(probalizer_class, &probalizer_widgetbehavior); class_sethelpsymbol(probalizer_class, gensym("help-probalizer.pd")); } diff --git a/scratcher~/scratcher~.c b/scratcher~/scratcher~.c index db37847..63ceb1b 100644 --- a/scratcher~/scratcher~.c +++ b/scratcher~/scratcher~.c @@ -778,8 +778,14 @@ void scratcher_tilde_setup(void) scratcher_widgetbehavior.w_deletefn = scratcher_delete; scratcher_widgetbehavior.w_visfn = scratcher_vis; scratcher_widgetbehavior.w_clickfn = scratcher_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) scratcher_widgetbehavior.w_propertiesfn = scratcher_properties; scratcher_widgetbehavior.w_savefn = scratcher_save; +#endif +#endif CLASS_MAINSIGNALIN( scratcher_class, t_scratcher, x_f ); class_addmethod(scratcher_class, (t_method)scratcher_dsp, gensym("dsp"), A_NULL); diff --git a/sonogram~/sonogram~-joge.c b/sonogram~/sonogram~-joge.c index fc70b73..b6e6c97 100644 --- a/sonogram~/sonogram~-joge.c +++ b/sonogram~/sonogram~-joge.c @@ -1992,8 +1992,14 @@ void sonogram_tilde_setup(void) sonogram_widgetbehavior.w_deletefn = sonogram_delete; sonogram_widgetbehavior.w_visfn = sonogram_vis; sonogram_widgetbehavior.w_clickfn = sonogram_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; +#endif +#endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); class_addmethod(sonogram_class, (t_method)sonogram_dsp, gensym("dsp"), A_NULL); diff --git a/sonogram~/sonogram~-yves.c b/sonogram~/sonogram~-yves.c index 4459d9e..6d647ac 100644 --- a/sonogram~/sonogram~-yves.c +++ b/sonogram~/sonogram~-yves.c @@ -1963,8 +1963,14 @@ void sonogram_tilde_setup(void) sonogram_widgetbehavior.w_deletefn = sonogram_delete; sonogram_widgetbehavior.w_visfn = sonogram_vis; sonogram_widgetbehavior.w_clickfn = sonogram_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; +#endif +#endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); class_addmethod(sonogram_class, (t_method)sonogram_dsp, gensym("dsp"), A_NULL); diff --git a/sonogram~/sonogram~.c b/sonogram~/sonogram~.c index 844f71f..4d9dfb1 100644 --- a/sonogram~/sonogram~.c +++ b/sonogram~/sonogram~.c @@ -2028,8 +2028,14 @@ void sonogram_tilde_setup(void) sonogram_widgetbehavior.w_deletefn = sonogram_delete; sonogram_widgetbehavior.w_visfn = sonogram_vis; sonogram_widgetbehavior.w_clickfn = sonogram_click; + /* As of 0.37, the last two elements of t_widgetbehavoir */ + /* have been removed. */ +#if PD_MAJOR_VERSION == 0 +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; +#endif +#endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); class_addmethod(sonogram_class, (t_method)sonogram_dsp, gensym("dsp"), A_NULL); -- cgit v1.2.1