aboutsummaryrefslogtreecommitdiff
path: root/cyclone
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2007-10-31 05:42:54 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2007-10-31 05:42:54 +0000
commit15c0288885b0c7d7a0cc89a2ef68916dac71e388 (patch)
treea984c71f7f76ff59b03a54775f206d29584956b0 /cyclone
parente6812c77e47416a3152506865324deafcda64f3a (diff)
fixed problems with the classname stuff I just added:
- some objects use "x_ob" instead of the standard "x_obj" - Table puts the t_object in some other struct - Scope~ hides the t_object under some layer that's beyond me svn path=/trunk/externals/miXed/; revision=8911
Diffstat (limited to 'cyclone')
-rw-r--r--cyclone/hammer/Table.c2
-rw-r--r--cyclone/hammer/comment.c2
-rw-r--r--cyclone/hammer/funbuff.c2
-rw-r--r--cyclone/sickle/Scope.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/cyclone/hammer/Table.c b/cyclone/hammer/Table.c
index 488ce20..0d28941 100644
--- a/cyclone/hammer/Table.c
+++ b/cyclone/hammer/Table.c
@@ -316,7 +316,7 @@ static void tablecommon_dowrite(t_tablecommon *cc, t_symbol *fn, t_canvas *cv)
strncpy(buf, fn->s_name, MAXPDSTRING);
buf[MAXPDSTRING-1] = 0;
}
- binbuf_addv(bb, "s", atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)));
+ binbuf_addv(bb, "s", atom_getsymbol(binbuf_getvec(cc->c_refs->x_ob.te_binbuf)));
for (ndx = 0, ptr = cc->c_table; ndx < cc->c_length; ndx++, ptr++)
binbuf_addv(bb, "i", *ptr);
binbuf_write(bb, buf, "", 0);
diff --git a/cyclone/hammer/comment.c b/cyclone/hammer/comment.c
index b3ac7a6..536fa07 100644
--- a/cyclone/hammer/comment.c
+++ b/cyclone/hammer/comment.c
@@ -455,7 +455,7 @@ static void comment_save(t_gobj *z, t_binbuf *b)
comment_validate(x, 0);
binbuf_addv(b, "ssiisiissiiii", gensym("#X"), gensym("obj"),
(int)t->te_xpix, (int)t->te_ypix,
- atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+ atom_getsymbol(binbuf_getvec(x->x_ob.te_binbuf)),
x->x_pixwidth, x->x_fontsize, x->x_fontfamily,
(x->x_encoding ? x->x_encoding : gensym("?")),
x->x_fontprops,
diff --git a/cyclone/hammer/funbuff.c b/cyclone/hammer/funbuff.c
index 2aeb082..8328ffd 100644
--- a/cyclone/hammer/funbuff.c
+++ b/cyclone/hammer/funbuff.c
@@ -227,7 +227,7 @@ static void funbuff_dowrite(t_funbuff *x, t_symbol *fn)
t_binbuf *bb = binbuf_new();
char buf[MAXPDSTRING];
t_hammernode *np;
- binbuf_addv(bb, "s", atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)));
+ binbuf_addv(bb, "s", atom_getsymbol(binbuf_getvec(x->x_ob.te_binbuf)));
for (np = x->x_tree.t_first; np; np = np->n_next)
binbuf_addv(bb, "if", np->n_key, HAMMERNODE_GETFLOAT(np));
canvas_makefilename(x->x_canvas, fn->s_name, buf, MAXPDSTRING);
diff --git a/cyclone/sickle/Scope.c b/cyclone/sickle/Scope.c
index eb13a48..9436e3f 100644
--- a/cyclone/sickle/Scope.c
+++ b/cyclone/sickle/Scope.c
@@ -842,7 +842,7 @@ static void scope_save(t_gobj *z, t_binbuf *b)
t_text *t = (t_text *)x;
binbuf_addv(b, "ssiisiiiiiffififiiiiiii;", gensym("#X"), gensym("obj"),
(int)t->te_xpix, (int)t->te_ypix,
- atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+ atom_getsymbol(binbuf_getvec(t->te_binbuf)),
x->x_width, x->x_height, x->x_period, 3, x->x_bufsize,
x->x_minval, x->x_maxval, x->x_delay, 0.,
x->x_trigmode, x->x_triglevel,