From a431a46da7eefba0c9bc45842a4cd63769eab900 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 15 Sep 2003 04:43:47 +0000 Subject: updated #ifdef code to make savefn and propertiesfn work under 0.37 svn path=/trunk/externals/unauthorized/; revision=965 --- audience~/audience~.c | 13 +++++++++---- cooled~/cooled~.c | 13 ++++++++++--- exciter/exciter.c | 14 +++++++++----- filterbank~/filterbank~.c | 13 +++++++++---- grid/grid.c | 13 +++++++++---- grid/grid2.c | 13 +++++++++---- pianoroll/pianoroll.c | 13 +++++++++---- playlist/playlist.c | 14 ++++++++++---- probalizer/probalizer.c | 13 +++++++++---- scratcher~/scratcher~.c | 13 +++++++++---- sonogram~/sonogram~-joge.c | 13 +++++++++---- sonogram~/sonogram~-yves.c | 13 +++++++++---- sonogram~/sonogram~.c | 13 +++++++++---- 13 files changed, 119 insertions(+), 52 deletions(-) diff --git a/audience~/audience~.c b/audience~/audience~.c index 74b19b7..110dc70 100644 --- a/audience~/audience~.c +++ b/audience~/audience~.c @@ -1049,13 +1049,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) audience_widgetbehavior.w_propertiesfn = audience_properties; audience_widgetbehavior.w_savefn = audience_save; -#endif +#else + class_setsavefn(audience_class_tilde, &audience_save); + class_setpropertiesfn(audience_class_tilde, &audience_properties); #endif class_setwidget(audience_class_tilde, &audience_widgetbehavior); diff --git a/cooled~/cooled~.c b/cooled~/cooled~.c index d0fd468..d0641d1 100644 --- a/cooled~/cooled~.c +++ b/cooled~/cooled~.c @@ -1365,11 +1365,18 @@ void cooled_tilde_setup(void) cooled_widgetbehavior.w_deletefn = cooled_delete; cooled_widgetbehavior.w_visfn = cooled_vis; cooled_widgetbehavior.w_clickfn = cooled_click; -#if PD_MAJOR_VERSION == 0 -#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ +#if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) cooled_widgetbehavior.w_propertiesfn = cooled_properties; cooled_widgetbehavior.w_savefn = cooled_save; -#endif +#else + class_setsavefn(cooled_class, &cooled_save); + class_setpropertiesfn(cooled_class, &cooled_properties); #endif CLASS_MAINSIGNALIN( cooled_class, t_cooled, x_f ); diff --git a/exciter/exciter.c b/exciter/exciter.c index d9a4310..0fbe21e 100644 --- a/exciter/exciter.c +++ b/exciter/exciter.c @@ -810,15 +810,19 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) exciter_widgetbehavior.w_propertiesfn = exciter_properties; exciter_widgetbehavior.w_savefn = exciter_save; +#else + class_setsavefn(exciter_class, &exciter_save); + class_setpropertiesfn(exciter_class, &exciter_properties); #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 5d238ff..df52a00 100644 --- a/filterbank~/filterbank~.c +++ b/filterbank~/filterbank~.c @@ -654,13 +654,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) filterbank_widgetbehavior.w_propertiesfn = filterbank_properties; filterbank_widgetbehavior.w_savefn = filterbank_save; -#endif +#else + class_setsavefn(filterbank_class_tilde, &filterbank_save); + class_setpropertiesfn(filterbank_class_tilde, &filterbank_properties); #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 5042f4e..2f61374 100644 --- a/grid/grid.c +++ b/grid/grid.c @@ -669,13 +669,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) grid_widgetbehavior.w_propertiesfn = grid_properties; grid_widgetbehavior.w_savefn = grid_save; -#endif +#else + class_setsavefn(grid_class, &grid_save); + class_setpropertiesfn(grid_class, &grid_properties); #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 426e2d2..070aa04 100644 --- a/grid/grid2.c +++ b/grid/grid2.c @@ -535,13 +535,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) grid_widgetbehavior.w_propertiesfn = grid_properties; grid_widgetbehavior.w_savefn = grid_save; -#endif +#else + class_setsavefn(grid_class, &grid_save); + class_setpropertiesfn(grid_class, &grid_properties); #endif class_setwidget(grid_class, &grid_widgetbehavior); class_sethelpsymbol(grid_class, gensym("help-grid.pd")); diff --git a/pianoroll/pianoroll.c b/pianoroll/pianoroll.c index 6b8304d..c2d8aff 100644 --- a/pianoroll/pianoroll.c +++ b/pianoroll/pianoroll.c @@ -800,13 +800,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) pianoroll_widgetbehavior.w_propertiesfn = pianoroll_properties; pianoroll_widgetbehavior.w_savefn = pianoroll_save; -#endif +#else + class_setsavefn(pianoroll_class, &pianoroll_save); + class_setpropertiesfn(pianoroll_class, &pianoroll_properties); #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 a79f4c4..a4d7522 100644 --- a/playlist/playlist.c +++ b/playlist/playlist.c @@ -742,14 +742,20 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) playlist_widgetbehavior.w_propertiesfn = playlist_properties; playlist_widgetbehavior.w_savefn = playlist_save; +#else + class_setsavefn(playlist_class, &playlist_save); + class_setpropertiesfn(playlist_class, &playlist_properties); #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 e789412..462ff98 100644 --- a/probalizer/probalizer.c +++ b/probalizer/probalizer.c @@ -687,13 +687,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) probalizer_widgetbehavior.w_propertiesfn = probalizer_properties; probalizer_widgetbehavior.w_savefn = probalizer_save; -#endif +#else + class_setsavefn(probalizer_class, &probalizer_save); + class_setpropertiesfn(probalizer_class, &probalizer_properties); #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 63ceb1b..0110776 100644 --- a/scratcher~/scratcher~.c +++ b/scratcher~/scratcher~.c @@ -778,13 +778,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) scratcher_widgetbehavior.w_propertiesfn = scratcher_properties; scratcher_widgetbehavior.w_savefn = scratcher_save; -#endif +#else + class_setpropertiesfn(scratcher_class, &scratcher_properties); + class_setsavefn(scratcher_class, &scratcher_save); #endif CLASS_MAINSIGNALIN( scratcher_class, t_scratcher, x_f ); diff --git a/sonogram~/sonogram~-joge.c b/sonogram~/sonogram~-joge.c index b6e6c97..e9c8927 100644 --- a/sonogram~/sonogram~-joge.c +++ b/sonogram~/sonogram~-joge.c @@ -1992,13 +1992,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; -#endif +#else + class_setpropertiesfn(sonogram_class, NULL); + class_setsavefn(sonogram_class, &sonogram_save); #endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); diff --git a/sonogram~/sonogram~-yves.c b/sonogram~/sonogram~-yves.c index 6d647ac..4886284 100644 --- a/sonogram~/sonogram~-yves.c +++ b/sonogram~/sonogram~-yves.c @@ -1963,13 +1963,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; -#endif +#else + class_setpropertiesfn(sonogram_class, NULL); + class_setsavefn(sonogram_class, &sonogram_save); #endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); diff --git a/sonogram~/sonogram~.c b/sonogram~/sonogram~.c index 4d9dfb1..61d12d9 100644 --- a/sonogram~/sonogram~.c +++ b/sonogram~/sonogram~.c @@ -2028,13 +2028,18 @@ 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 + /* + * : As of 0.37, pd does not have these last + * two elements in t_widgetbehavoir anymore. + * see pd/src/notes.txt: + * savefunction and dialog into class structure + */ #if PD_MINOR_VERSION < 37 || !defined(PD_MINOR_VERSION) sonogram_widgetbehavior.w_propertiesfn = NULL; sonogram_widgetbehavior.w_savefn = sonogram_save; -#endif +#else + class_setpropertiesfn(sonogram_class, NULL); + class_setsavefn(sonogram_class, &sonogram_save); #endif CLASS_MAINSIGNALIN( sonogram_class, t_sonogram, x_f ); -- cgit v1.2.1