Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15392

Modified Files: Tag: impd_0_37 g_all_guis.h m_pd.h Log Message: changes to headers (go with previous commits)

Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.1.1.4.2.10.2.7 retrieving revision 1.1.1.4.2.10.2.8 diff -C2 -d -r1.1.1.4.2.10.2.7 -r1.1.1.4.2.10.2.8 *** m_pd.h 3 May 2004 05:37:15 -0000 1.1.1.4.2.10.2.7 --- m_pd.h 3 May 2004 19:49:34 -0000 1.1.1.4.2.10.2.8 *************** *** 678,681 **** --- 678,685 ---- #endif

+ #define CLAMP(_var,_min,_max) { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } + #define MIN(a,b) ((a)<(b)?(a):(b)) + #define MAX(a,b) ((a)>(b)?(a):(b)) + #define __m_pd_h_ #endif /* __m_pd_h_ */

Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.19 retrieving revision 1.1.1.4.2.2.2.20 diff -C2 -d -r1.1.1.4.2.2.2.19 -r1.1.1.4.2.2.2.20 *** g_all_guis.h 3 May 2004 02:57:27 -0000 1.1.1.4.2.2.2.19 --- g_all_guis.h 3 May 2004 19:49:34 -0000 1.1.1.4.2.2.2.20 *************** *** 9,13 **** #define IEM_GUI_MAX_COLOR 30 #define IEM_GUI_DEFAULTSIZE 15 - #define IEM_GUI_MINSIZE 8 #define IEM_GUI_MAXSIZE 1000 #define IEM_SL_DEFAULTSIZE 128 --- 9,12 ---- *************** *** 35,39 **** int x_h, x_w; int x_ldx, x_ldy; ! char x_font[16]; /* formerly x_isa: */ unsigned int x_loadinit:1, x_scale:1, x_flashed:1, x_locked:1; --- 34,38 ---- int x_h, x_w; int x_ldx, x_ldy; ! /* obsolete : char x_font[16];*/ /* formerly x_isa: */ unsigned int x_loadinit:1, x_scale:1, x_flashed:1, x_locked:1; *************** *** 62,76 **** } t_bng;

! typedef struct _hslider { t_iemgui x_gui; int x_pos; int x_val; - int x_lin0_log1; - int x_steady; double x_min; double x_max; double x_k; ! } t_hslider;

typedef struct _radio --- 61,74 ---- } t_bng;

! typedef struct _slider { t_iemgui x_gui; int x_pos; int x_val; double x_min; double x_max; double x_k; ! t_symbol *x_flavor; ! } t_slider;

typedef struct _radio *************** *** 83,87 **** t_atom x_at[2]; t_symbol *x_flavor; ! } t_hradio, t_radio;

typedef struct _toggle --- 81,85 ---- t_atom x_at[2]; t_symbol *x_flavor; ! } t_radio;

typedef struct _toggle *************** *** 129,133 **** double x_max; double x_k; - int x_lin0_log1; char x_buf[IEMGUI_MAX_NUM_LEN]; int x_numwidth; --- 127,130 ---- *************** *** 140,147 **** EXTERN void iemgui_verify_snd_ne_rcv(t_iemgui *iemgui); EXTERN t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv); - EXTERN void iemgui_new_getnames(t_iemgui *iemgui, int indx, t_atom *argv); - EXTERN void iemgui_new_getnames2(t_iemgui *iemgui, int i, t_symbol *snd, t_symbol *rcv, t_symbol *lab); EXTERN void iemgui_all_col2save(t_iemgui *iemgui, int *bflcol); ! EXTERN void iemgui_all_colfromload(t_iemgui *iemgui, int *bflcol);

/* methods common to iemgui classes */ --- 137,142 ---- EXTERN void iemgui_verify_snd_ne_rcv(t_iemgui *iemgui); EXTERN t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv); EXTERN void iemgui_all_col2save(t_iemgui *iemgui, int *bflcol); ! //EXTERN void iemgui_all_colfromload(t_iemgui *iemgui, int *bflcol);

/* methods common to iemgui classes */ *************** *** 157,161 ****

/* adds the aforementioned methods to a iemgui class (pd has no inheritance) */ ! EXTERN void iemgui_register_class (t_class *c);

/* widgetbehaviour */ --- 152,156 ----

/* adds the aforementioned methods to a iemgui class (pd has no inheritance) */ ! EXTERN void iemgui_subclass (t_class *c);

/* widgetbehaviour */ *************** *** 176,183 **** EXTERN void pd_upload(t_gobj *self, t_canvas *can); EXTERN void sys_mgui(t_iemgui *self, const char *qlass, const char *sel, const char *fmt, ...); - EXTERN void iemgui_set_font_style(t_iemgui *self, int font); - #define MIN(a,b) ((a)<(b)?(a):(b)) - #define MAX(a,b) ((a)>(b)?(a):(b)) EXTERN t_iemgui *iemgui_new(t_class *qlass); EXTERN void iemgui_draw(t_iemgui *x, t_glist *glist, int mode, const char *s); ! /*EXTERN t_symbol *iemgui_gensym(void *x);*/ --- 171,178 ---- EXTERN void pd_upload(t_gobj *self, t_canvas *can); EXTERN void sys_mgui(t_iemgui *self, const char *qlass, const char *sel, const char *fmt, ...); EXTERN t_iemgui *iemgui_new(t_class *qlass); EXTERN void iemgui_draw(t_iemgui *x, t_glist *glist, int mode, const char *s); ! EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner); ! EXTERN const char *iemgui_get_font(t_iemgui *self); ! EXTERN void iemgui_constrain(t_iemgui *x); ! EXTERN t_symbol *sym_empty;