Commit 81baca60 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'code-cleanup'

parents 1d9a805c 22793c2d
...@@ -125,8 +125,8 @@ typedef struct _editor ...@@ -125,8 +125,8 @@ typedef struct _editor
unsigned int e_textdirty: 1; /* one if e_textedfor has changed */ unsigned int e_textdirty: 1; /* one if e_textedfor has changed */
unsigned int e_selectedline: 1; /* one if a line is selected */ unsigned int e_selectedline: 1; /* one if a line is selected */
t_magicGlass *gl_magic_glass; /* magic glass object */ t_magicGlass *gl_magic_glass; /* magic glass object */
char canvas_cnct_inlet_tag[4096]; /* tags for currently highlighted nlets */ char canvas_cnct_inlet_tag[4096]; /* tags for currently highlighted nlets */
char canvas_cnct_outlet_tag[4096]; char canvas_cnct_outlet_tag[4096];
t_clock *e_clock; /* clock to filter GUI move messages */ t_clock *e_clock; /* clock to filter GUI move messages */
int e_xnew; /* xpos for next move event */ int e_xnew; /* xpos for next move event */
int e_ynew; /* ypos, similarly */ int e_ynew; /* ypos, similarly */
...@@ -151,8 +151,8 @@ typedef struct _arrayvis ...@@ -151,8 +151,8 @@ typedef struct _arrayvis
t_garray *av_garray; /* owning structure */ t_garray *av_garray; /* owning structure */
} t_arrayvis; } t_arrayvis;
t_garray* array_garray; /* used for sending bangs when t_garray* array_garray; /* used for sending bangs when
array is changed via gui */ array is changed via gui */
/* the t_tick structure describes where to draw x and y "ticks" for a glist */ /* the t_tick structure describes where to draw x and y "ticks" for a glist */
...@@ -171,7 +171,7 @@ area of a window. ...@@ -171,7 +171,7 @@ area of a window.
//#include "g_undo.h" //#include "g_undo.h"
struct _glist struct _glist
{ {
t_object gl_obj; /* header in case we're a glist */ t_object gl_obj; /* header in case we're a glist */
t_gobj *gl_list; /* the actual data */ t_gobj *gl_list; /* the actual data */
struct _gstub *gl_stub; /* safe pointer handler */ struct _gstub *gl_stub; /* safe pointer handler */
...@@ -738,7 +738,7 @@ EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s); ...@@ -738,7 +738,7 @@ EXTERN t_symbol *iemgui_dollar2raute(t_symbol *s);
EXTERN t_undo_action *canvas_undo_init(t_canvas *x); EXTERN t_undo_action *canvas_undo_init(t_canvas *x);
EXTERN t_undo_action *canvas_undo_add(t_canvas *x, EXTERN t_undo_action *canvas_undo_add(t_canvas *x,
int type, const char *name, void *data); int type, const char *name, void *data);
EXTERN void canvas_undo_undo(t_canvas *x); EXTERN void canvas_undo_undo(t_canvas *x);
EXTERN void canvas_undo_redo(t_canvas *x); EXTERN void canvas_undo_redo(t_canvas *x);
EXTERN void canvas_undo_rebranch(t_canvas *x); EXTERN void canvas_undo_rebranch(t_canvas *x);
......
...@@ -68,7 +68,6 @@ void gstub_cutoff(t_gstub *gs) ...@@ -68,7 +68,6 @@ void gstub_cutoff(t_gstub *gs)
if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs));
} }
int gpointer_docheck(const t_gpointer *gp, int headok, int gobjok) int gpointer_docheck(const t_gpointer *gp, int headok, int gobjok)
{ {
t_gstub *gs = gp->gp_stub; t_gstub *gs = gp->gp_stub;
...@@ -1104,7 +1103,6 @@ static void setsize_float(t_setsize *x, t_float f) ...@@ -1104,7 +1103,6 @@ static void setsize_float(t_setsize *x, t_float f)
} }
} }
static void setsize_free(t_setsize *x) static void setsize_free(t_setsize *x)
{ {
gpointer_unset(&x->x_gp); gpointer_unset(&x->x_gp);
...@@ -1118,7 +1116,6 @@ static void setsize_setup(void) ...@@ -1118,7 +1116,6 @@ static void setsize_setup(void)
class_addfloat(setsize_class, setsize_float); class_addfloat(setsize_class, setsize_float);
class_addmethod(setsize_class, (t_method)setsize_set, gensym("set"), class_addmethod(setsize_class, (t_method)setsize_set, gensym("set"),
A_SYMBOL, A_SYMBOL, 0); A_SYMBOL, A_SYMBOL, 0);
} }
/* ---------------------- append ----------------------------- */ /* ---------------------- append ----------------------------- */
......
...@@ -439,6 +439,11 @@ void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv) ...@@ -439,6 +439,11 @@ void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv)
(*(*x)->c_listmethod)(x, &s_list, argc, argv); (*(*x)->c_listmethod)(x, &s_list, argc, argv);
} }
void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv)
{
(*(*x)->c_anymethod)(x, s, argc, argv);
}
void mess_init(void); void mess_init(void);
void obj_init(void); void obj_init(void);
void conf_init(void); void conf_init(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment