Following this thread:

http://lists.puredata.info/pipermail/pd-dev/2007-10/009797.html

I have changed the save functions so that they will save the name of the
object that it was actually instantiated with.  This allows objects with
savefns to work properly with namespaces.

This is a fix for this bug:
http://sourceforge.net/tracker/index.php?&aid=1818219&group_id=55736&atid=478070

svn path=/trunk/externals/unauthorized/; revision=8902

12 files changed, 25 insertions, 13 deletions

diff --git a/audience~/audience~.c b/audience~/audience~.c
index a2ced47..40b1aba 100644
--- a/audience~/audience~.c
+++ b/audience~/audience~.c
@@ -367,8 +367,9 @@ static void audience_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiiiifi", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("audience~"), x->x_width, x->x_height,
-                x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay );
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_width, x->x_height,
+        x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay );
    for ( ii=0; ii<x->x_nbinputs; ii++ )
    {
       binbuf_addv(b, "ii", x->x_inputs_x[ii], x->x_inputs_y[ii] );
diff --git a/cooled~/cooled~.c b/cooled~/cooled~.c
index c79ee1c..cec6c2a 100644
--- a/cooled~/cooled~.c
+++ b/cooled~/cooled~.c
@@ -592,7 +592,8 @@ static void cooled_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiiii", gensym("#X"),gensym("obj"),
 		(int)x->x_obj.te_xpix, (int)x->x_obj.te_ypix,
-		gensym("cooled~"), x->x_size, x->x_width, x->x_height, x->x_draw );
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_size, x->x_width, x->x_height, x->x_draw );
    binbuf_addv(b, ";");
 }
 
diff --git a/exciter/exciter.c b/exciter/exciter.c
index 798f372..edee87e 100644
--- a/exciter/exciter.c
+++ b/exciter/exciter.c
@@ -322,7 +322,8 @@ static void exciter_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiiifii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("exciter"), x->x_width, x->x_height,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_width, x->x_height,
 		x->x_nbevents, x->x_timegrain,
                 x->x_loop, x->x_save 
                 );
diff --git a/filterbank~/filterbank~.c b/filterbank~/filterbank~.c
index 64cf55c..20e4624 100644
--- a/filterbank~/filterbank~.c
+++ b/filterbank~/filterbank~.c
@@ -253,7 +253,8 @@ static void filterbank_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("filterbank~"), x->x_lowfreq, x->x_highfreq,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_lowfreq, x->x_highfreq,
                 x->x_nbfilters );
    binbuf_addv(b, ";");
 }
diff --git a/grid/grid.c b/grid/grid.c
index f3317b4..4db389f 100644
--- a/grid/grid.c
+++ b/grid/grid.c
@@ -276,7 +276,8 @@ static void grid_save(t_gobj *z, t_binbuf *b)
    // post( "saving grid : %s", x->x_name->s_name );
    binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("grid"), x->x_name, x->x_width, x->x_min,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_name, x->x_width, x->x_min,
 		x->x_max, x->x_height,
                 x->y_min, x->y_max,
                 x->x_grid, x->x_xstep, 
diff --git a/pianoroll/pianoroll.c b/pianoroll/pianoroll.c
index 8bb0c2f..05b5ae7 100644
--- a/pianoroll/pianoroll.c
+++ b/pianoroll/pianoroll.c
@@ -264,7 +264,8 @@ static void pianoroll_save(t_gobj *z, t_binbuf *b)
    // post( "saving pianoroll : %s", x->x_name->s_name );
    binbuf_addv(b, "ssiissiiffiiifi", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("pianoroll"), x->x_name, x->x_width, x->x_height,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_name, x->x_width, x->x_height,
 		x->x_pmin, x->x_pmax,
                 x->x_nbgrades, x->x_nbsteps,
                 x->x_defvalue, x->x_transpose, x->x_save 
diff --git a/probalizer/probalizer.c b/probalizer/probalizer.c
index 0169285..ddb441e 100644
--- a/probalizer/probalizer.c
+++ b/probalizer/probalizer.c
@@ -276,7 +276,8 @@ static void probalizer_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiiiii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("probalizer"), x->x_width, x->x_height,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_width, x->x_height,
 		x->x_nvalues, x->x_noccurrences, x->x_save );
    if ( x->x_save ) 
    {
diff --git a/scratcher~/scratcher~.c b/scratcher~/scratcher~.c
index 32e8e46..930ef93 100644
--- a/scratcher~/scratcher~.c
+++ b/scratcher~/scratcher~.c
@@ -283,7 +283,8 @@ static void scratcher_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiiiiff", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("scratcher~"), x->x_size, x->x_width, x->x_height, 
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_size, x->x_width, x->x_height, 
                 x->x_sensibility, x->x_maxspeed, x->x_inertia );
    binbuf_addv(b, ";");
 }
diff --git a/scrolllist/scrolllist.c b/scrolllist/scrolllist.c
index af16c26..326db9f 100755
--- a/scrolllist/scrolllist.c
+++ b/scrolllist/scrolllist.c
@@ -280,7 +280,8 @@ static void scrolllist_save(t_gobj *z, t_binbuf *b)
    // post( "saving scrolllist : %d", x->x_capacity );
    binbuf_addv(b, "ssiisiiissss", gensym("#X"), gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("scrolllist"), x->x_capacity, x->x_width, x->x_height,
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_capacity, x->x_width, x->x_height,
                 gensym(x->x_font), gensym(x->x_bgcolor), 
                 gensym(x->x_fgcolor), gensym(x->x_secolor) );
    binbuf_addv(b, ";");
diff --git a/sonogram~/sonogram~-joge.c b/sonogram~/sonogram~-joge.c
index 62a23c3..b7e93bc 100644
--- a/sonogram~/sonogram~-joge.c
+++ b/sonogram~/sonogram~-joge.c
@@ -868,7 +868,8 @@ static void sonogram_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_xpos, (t_int)x->x_ypos,
-		gensym("sonogram~"), x->x_size, x->x_graphic, x->x_phaso );
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_size, x->x_graphic, x->x_phaso );
    binbuf_addv(b, ";");
 }
 
diff --git a/sonogram~/sonogram~-yves.c b/sonogram~/sonogram~-yves.c
index d45bf9e..161ebf2 100644
--- a/sonogram~/sonogram~-yves.c
+++ b/sonogram~/sonogram~-yves.c
@@ -849,7 +849,8 @@ static void sonogram_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_xpos, (t_int)x->x_ypos,
-		gensym("sonogram~"), x->x_size, x->x_graphic, x->x_phaso );
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_size, x->x_graphic, x->x_phaso );
    binbuf_addv(b, ";");
 }
 
diff --git a/sonogram~/sonogram~.c b/sonogram~/sonogram~.c
index e6c3887..92850a9 100644
--- a/sonogram~/sonogram~.c
+++ b/sonogram~/sonogram~.c
@@ -851,7 +851,8 @@ static void sonogram_save(t_gobj *z, t_binbuf *b)
 
    binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"),
 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
-		gensym("sonogram~"), x->x_size, x->x_graphic, x->x_phaso );
+		atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+        x->x_size, x->x_graphic, x->x_phaso );
    binbuf_addv(b, ";");
 }