aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cube_sphere.c34
-rw-r--r--src/iem_vu.c20
-rw-r--r--src/iemgui.c3
-rw-r--r--src/iemgui.h1
-rw-r--r--src/iemlib.h16
-rw-r--r--src/makefile4
-rw-r--r--src/makefile_d_fat53
-rw-r--r--src/makefile_linux2
-rw-r--r--src/sym_dial.c20
9 files changed, 86 insertions, 67 deletions
diff --git a/src/cube_sphere.c b/src/cube_sphere.c
index 161fbee..069b353 100644
--- a/src/cube_sphere.c
+++ b/src/cube_sphere.c
@@ -1,7 +1,7 @@
/* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution.
-iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */
+iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2008 */
#include "m_pd.h"
#include "iemlib.h"
@@ -21,7 +21,7 @@ iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 *
#include <unistd.h>
#endif
-#define IEMGUI_CUBE_SPHERE_MAX 200
+#define IEMGUI_CUBE_SPHERE_MAX 10000
/* ---------- cube_sphere my gui-canvas for a window ---------------- */
@@ -494,7 +494,7 @@ static void cube_sphere_size(t_cube_sphere *x, t_floatarg size)
static void cube_sphere_vis(t_cube_sphere *x, t_symbol *s, int argc, t_atom *argv)
{
- int index, n=x->x_n_src;
+ int iindex, n=x->x_n_src;
int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
int newstate, oldstate;
@@ -505,48 +505,48 @@ static void cube_sphere_vis(t_cube_sphere *x, t_symbol *s, int argc, t_atom *arg
post("cube_sphere ERROR: vis-input needs 1 index + 1 visual state");
return;
}
- index = (int)atom_getint(argv++) - 1;
+ iindex = (int)atom_getint(argv++) - 1;
- if((index >= 0) && (index < n))
+ if((iindex >= 0) && (iindex < n))
{
newstate = ((int)atom_getint(argv) ? 1 : 0);
- oldstate = x->x_vis_src[index];
+ oldstate = x->x_vis_src[iindex];
if(newstate && !oldstate)
{
if(glist_isvisible(x->x_gui.x_glist))
sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
-font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
- canvas, xpos+x->x_pix_src_x[index], ypos+x->x_pix_src_y[index], index+1, x->x_fontsize,
- x->x_col_src[index], x, index);
+ canvas, xpos+x->x_pix_src_x[iindex], ypos+x->x_pix_src_y[iindex], iindex+1, x->x_fontsize,
+ x->x_col_src[iindex], x, iindex);
}
else if(!newstate && oldstate)
{
if(glist_isvisible(x->x_gui.x_glist))
- sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, index);
+ sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, iindex);
}
- x->x_vis_src[index] = newstate;
+ x->x_vis_src[iindex] = newstate;
}
- else if(index < 0)
+ else if(iindex < 0)
{// if index is -1 : all
newstate = ((int)atom_getint(argv) ? 1 : 0);
- for(index=0; index<n; index++)
+ for(iindex=0; iindex<n; iindex++)
{
- oldstate = x->x_vis_src[index];
+ oldstate = x->x_vis_src[iindex];
if(newstate && !oldstate)
{
if(glist_isvisible(x->x_gui.x_glist))
sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
-font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
- canvas, xpos+x->x_pix_src_x[index], ypos+x->x_pix_src_y[index], index+1, x->x_fontsize,
- x->x_col_src[index], x, index);
+ canvas, xpos+x->x_pix_src_x[iindex], ypos+x->x_pix_src_y[iindex], iindex+1, x->x_fontsize,
+ x->x_col_src[iindex], x, iindex);
}
else if(!newstate && oldstate)
{
if(glist_isvisible(x->x_gui.x_glist))
- sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, index);
+ sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, iindex);
}
- x->x_vis_src[index] = newstate;
+ x->x_vis_src[iindex] = newstate;
}
}
}
diff --git a/src/iem_vu.c b/src/iem_vu.c
index 62d11ab..5e22b6c 100644
--- a/src/iem_vu.c
+++ b/src/iem_vu.c
@@ -588,8 +588,8 @@ static void iem_vu_float(t_iem_vu *x, t_floatarg rms)
x->x_rms = IEM_VU_STEPS;
else
{
- int i = (int)(2.0*(rms + IEM_VU_OFFSET));
- x->x_rms = iem_vu_db2i[i];
+ int ii = (int)(2.0*(rms + IEM_VU_OFFSET));
+ x->x_rms = iem_vu_db2i[ii];
}
i = (int)(100.0*rms + 10000.5);
rms = 0.01*(t_float)(i - 10000);
@@ -608,8 +608,8 @@ static void iem_vu_ft1(t_iem_vu *x, t_floatarg peak)
x->x_peak = IEM_VU_STEPS;
else
{
- int i = (int)(2.0*(peak + IEM_VU_OFFSET));
- x->x_peak = iem_vu_db2i[i];
+ int ii = (int)(2.0*(peak + IEM_VU_OFFSET));
+ x->x_peak = iem_vu_db2i[ii];
}
i = (int)(100.0*peak + 10000.5);
peak = 0.01*(t_float)(i - 10000);
@@ -626,12 +626,12 @@ static void iem_vu_set(t_iem_vu *x, t_symbol *s, int ac, t_atom *av)
if( (ac >= 2) && IS_A_FLOAT(av,0) && IS_A_FLOAT(av,1) )
{
rms = (t_float)atom_getfloatarg(0, ac, av);
- peak = (t_float)atom_getfloatarg(1, ac, av);
+ peak = (t_float)atom_getfloatarg(1, ac, av);
}
else if( (ac == 1) && IS_A_FLOAT(av,0) )
{
rms = (t_float)atom_getfloatarg(0, ac, av);
- peak = rms;
+ peak = rms;
}
if(rms <= IEM_VU_MINDB)
x->x_rms = 0;
@@ -639,8 +639,8 @@ static void iem_vu_set(t_iem_vu *x, t_symbol *s, int ac, t_atom *av)
x->x_rms = IEM_VU_STEPS;
else
{
- int i = (int)(2.0*(rms + IEM_VU_OFFSET));
- x->x_rms = iem_vu_db2i[i];
+ int ii = (int)(2.0*(rms + IEM_VU_OFFSET));
+ x->x_rms = iem_vu_db2i[ii];
}
i = (int)(100.0*rms + 10000.5);
rms = 0.01*(t_float)(i - 10000);
@@ -652,8 +652,8 @@ static void iem_vu_set(t_iem_vu *x, t_symbol *s, int ac, t_atom *av)
x->x_peak = IEM_VU_STEPS;
else
{
- int i = (int)(2.0*(peak + IEM_VU_OFFSET));
- x->x_peak = iem_vu_db2i[i];
+ int ii = (int)(2.0*(peak + IEM_VU_OFFSET));
+ x->x_peak = iem_vu_db2i[ii];
}
i = (int)(100.0*peak + 10000.5);
peak = 0.01*(t_float)(i - 10000);
diff --git a/src/iemgui.c b/src/iemgui.c
index 2bdaf98..7e1def9 100644
--- a/src/iemgui.c
+++ b/src/iemgui.c
@@ -8,6 +8,7 @@ iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 *
#include "iemgui.h"
char my_iemgui_black_vscale_gif[]="R0lGODlhDgCCAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAOAIIAAAL/hI+pa0EBICIIdkRYBCEBgIigEHbEBQSFsCPOIghGxF0EwQkzg6AAEQTfIoxiE3xMvQgK4WMERBDsuIg7owAQEQEEgGKDgRHsuAgICmHHRUBQCB8jguBj6nL7AxITPkZABMGOu4gzCuFHHMUGACP4cRBxByQARBB8NIpN8DF1uf1JTPgYAREE/yIgguBfBEQQjIiwCEJC8C8CIgj+RUAEwceIIPiYutz+gMSEjxEQQfDRIjKNEgCABRCACIKPEJEJlBA+GsUm+Ji63P4kJnyMgAiCfxGISHEIdkRYBCEh+BcBEQT/IiCC4GNEEHxMXW5fkgDAgmBHhEUQEgCICAph5UdcQFAIO+IsgmBE3EUQnDAzCAoQQfAtwig2wcfU5fYkMQAsAAhIQAQEBQmCHwERQAnhR0AEUELYERYBlAAADICQQAQAUAIAMDCCGRvgCD6mLrcriQFgAUBAAiIgKEgQ/AiIAEoIO8IigBLCj4AIoITwIyACKAGAgQElMAAAC4ITQfAxdbldSRyAI9gRFwGUAMAAgJBABABQHAADAwICEAFBQYLgR0AEUAIAAwNKYAAAFgQnguBj6nL7OxIHLgCAkABEBBASAIgAQhIAEUBAAiAiCEgYRBjFAAMAoDhwQfAxdbkdSQEAOw==";
+char my_iemgui_black_test___gif[]="R0lGODlhDgCEAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAOAIQAAAL/hI+pa0EBICIIdkRYBCEBgIigEHbEBQSFsCPOIghGxF0EwQkzg6AAEQTfIoxiE3xMXW5/EhM+RkAEwY6LuDMKABERQAAoNhgYwY6LgKAQdlwEBIXwMSIIPqYutz8gMeFjBEQQ7LiLOKMQfsRRbAAwgh8HEXdAAkAEwUej2AQfU5fbn8SEjxEQQfAvAiII/kVABMGICIsgJAT/IiCC4F8ERBB8jAiCj6nL7Q9ITPgYAREEHy0i0ygBAFgAAYgg+AgRmUAJ4aNRbIKPqcvtT2LCxwiIIPgXgYgUh2BHhEUQEoJ/ERBB8C8CIgg+RgTBx9Tl9iUJACwIdkRYBCEBgIig5RB2xAUEhbAjziIIRsRdBMEJM4OgABEE3yKMYhN8TF1uTxIDwAKAgAREQFCQIPgREAGUEH4ERAAlhB1hEUAJAMAACAlEAAAlAAADI5ixAY7gY+pyu5IYABYABCQgAoKCBMGPgAighLAjLAIoIfwIiABKCD8CIoASABgYUAIDALAgOBEEH1OX25XEATiCHXERQAkADAAICUQAAMUBMDAgIAAREBQkCH4ERAAlADAwoAQGAGBBcCIIPqYut78jceACAAgJQEQAIQGACCAkARABBCQAIoKAhEGEUQwwAACKAxcEH1OXmwoAOw";
char my_iemgui_black_hlscale_gif[]="R0lGODlhgwAaAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAACDABoAAAL/hI+py+0Po5y02ouz3rz7D4biKBIJ4WPqcvsDkhD+RQQiUEz4FxGBiAgZEhM+pi63P4kJ3yIgguBDBEQQfItARMRD4hB8CMQLgo8QmZmZDolD8BEiMikhfIhAREREggTBh0C8IPgIkZmZ6ZAgQfARIhIpIXyLiEBEhBBJCJtiE3yg2AQfKDbBt4hABIoJHyMQjRLCR4hIowARBB8iAhGBJIQPgXhB8BEiMzNTIgnhXwQiUkL4GIGIiIckhA+BeEHwESIzM1MiCeFbBKJRAiP4EAERBB9TLYLgY+py+wOSEL5RbIJvEYEIFBM+pi63P4xy0gpITPgRcXcUE/5FBCJQ/0z4FxGIQDHhX0QgAsWEfxGBiIgMSWAAAEZICD5EQATBhwiIIPgQAREEHyIgguBDBEQQfIiACIIPERBB8CECIgh2RAQEJSH4GIERBB8vIo0SGMHHCLygED5eRBolMIIPERBB8CECIghGhEUEAQkzM6AEAGBG8BEi0iiBEXyMwAtKQvARItIogRF8iIAIgg8REEEwIiwiCEiYmQWFsCMg4u5IQvgWAREE/yIQg4IEwb8IxKAgQfAhAiIIPkRABMGIsIggIGFmEBTCj4CIOyMJ4V8ERBB8i0AESmAE3yIQgRIYwYcIiCD4EAERBCPCIoKAhJlFEHyIgAiCDxGIRgmM4FVDBKJRAiP4EIFolMAIPkRABMGHCIgg2BEREJSE4APFJtgRcWcUm+BbRCBSbIJvEYFIsQm+RQQiUEz4FxEEH1OX2x9GOWm1F2e9efcfDMWRLM0TfYgCADs=";
char my_iemgui_black_hrscale_gif[]="R0lGODlhhgAbAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAACGABsAAAL/hI+py+0Po5y02ouz3rz7D4biSG5EHIJvEYEIFBM+RhB8TF1uf0ASwsfUjCD4FwERBB8iIILgW0QQfExdbn8SEz6mYgTBx4vIpITwISICERFCCBkSwkeITKAQfkQEwcdUjKCE8DEC8SghfAiIQESEEEKGhPARIhMohB8QcXd3SEz4EBaBaCQh/ItANEoI/yICESgmfKPYBB8oNsEHik3wIwg+pm4EwccIxKAQPkJEZmZKiITwESITKIRvEYiIiABJYAQfIiCC4EMEIlJC+Ji6GgQfITKBQvgWgYiIyJCY8C8iECk2wb8Igo+py+0PSEL4mLrc/jDKSesiMeFfRCAC/8WEfxGBCBQT/kUEIlBM+BcRiEAx4UfE3R3FgQsAICQQQfAhAiIIPkRABMGHCIgg+BABEQQfIiCC4EMERBB8iIAIgg8REEEwIiDi7gBJABYARnACIswMSAIj+BABEQQfI/CCQvh4EWmUwAg+RuAFhfAxAtEoAVgAGMEJiDAzIAmM4EMERBB8jMALSkLwESLSKIERfIzAC0pC8C0C0SgBWAAYwQmIMDMgCYzgQwREEPyLQAwKEgT/IhCDggTBvwjEoCBB8CPuzigBWAAYwQmIMDMgCYzgQwREEHyLQARKYATfIhCBEhjBtwhEoARGsCPu7oDiwAUAEBKIIPgQAREEH1YiIILgQwSiUQIj+BCBaJTACD5EIBolMAAAI/iYuhEUwr+IQASKCd8oNsG3iECk2ATfIgKRYhN8iwgEik3wMXW5/WGUk1Z7cdabd//BUBzJ0jzRVF1NogA7";
@@ -91,6 +92,7 @@ void iem_vu_setup(void);
void hfadl_scale_setup(void);
void hfadr_scale_setup(void);
void vfad_scale_setup(void);
+void vfad_test_setup(void);
void numberbox_matrix_setup(void);
void iem_event_setup(void);
//void toggle_matrix_setup(void);
@@ -111,6 +113,7 @@ void iemgui_setup(void)
hfadl_scale_setup();
hfadr_scale_setup();
vfad_scale_setup();
+ vfad_test_setup();
numberbox_matrix_setup();
iem_event_setup();
// toggle_matrix_setup();
diff --git a/src/iemgui.h b/src/iemgui.h
index a436cd5..ff648f8 100644
--- a/src/iemgui.h
+++ b/src/iemgui.h
@@ -32,6 +32,7 @@ typedef union _my_iemgui_3u4
} t_my_iemgui_3u4;
extern char my_iemgui_black_vscale_gif[];
+extern char my_iemgui_black_test___gif[];
extern char my_iemgui_black_hlscale_gif[];
extern char my_iemgui_black_hrscale_gif[];
extern char my_iemgui_base64[];
diff --git a/src/iemlib.h b/src/iemlib.h
index 973bfeb..97b088b 100644
--- a/src/iemlib.h
+++ b/src/iemlib.h
@@ -1,7 +1,7 @@
/* For information on usage and redistribution, and for a DISCLAIMER OF ALL
* WARRANTIES, see the file, "LICENSE.txt," in this distribution.
-iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2007 */
+iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 */
#ifndef __IEMLIB_H__
#define __IEMLIB_H__
@@ -99,4 +99,18 @@ union tabfudge_f
#endif
+/* on 64bit systems we cannot use garray_getfloatarray... */
+#if (defined __x86_64__)
+# define iemarray_t t_word
+# define iemarray_getarray garray_getfloatwords
+# define iemarray_getfloat(pointer, index) (pointer[index].w_float)
+# define iemarray_setfloat(pointer, index, fvalue) (pointer[index].w_float = fvalue)
+#else
+# define iemarray_t t_float
+# define iemarray_getarray garray_getfloatarray
+# define iemarray_getfloat(pointer, index) (pointer[index])
+# define iemarray_setfloat(pointer, index, fvalue) (pointer[index] = fvalue)
+#endif
+
+
#endif
diff --git a/src/makefile b/src/makefile
index 7ad8296..bb87457 100644
--- a/src/makefile
+++ b/src/makefile
@@ -12,8 +12,8 @@ LIB = -ldl -lm -lpthread
#select either the DBG and OPT compiler flags below:
CFLAGS = -DPD -DUNIX -W -Wno-unused \
- -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -fPIC \
- -DDL_OPEN
+ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
+ -DDL_OPEN -fPIC
SYSTEM = $(shell uname -m)
diff --git a/src/makefile_d_fat b/src/makefile_d_fat
index 1b49c50..090483d 100644
--- a/src/makefile_d_fat
+++ b/src/makefile_d_fat
@@ -1,34 +1,35 @@
current: all
-.SUFFIXES: .d_fat
-
+.SUFFIXES: .d_fat
+
PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources"
INCLUDE = -I. -I$(PD_INSTALL_PATH)/src
-CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
+CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
-Wno-unused -Wno-parentheses -Wno-switch
LFLAGS = -bundle -undefined suppress -flat_namespace
# the sources
-
-SRC = room_sim_2d.c \
- room_sim_3d.c \
- cube_sphere.c \
- sym_dial.c \
- iem_image.c \
- iem_vu.c \
- hfadl_scale.c \
- hfadr_scale.c \
- vfad_scale.c \
- numberbox_matrix.c \
- iem_event.c \
- iemgui.c
-
-TARGET = iemgui.d_fat
-
-
+
+SRC = room_sim_2d.c \
+ room_sim_3d.c \
+ cube_sphere.c \
+ sym_dial.c \
+ iem_image.c \
+ iem_vu.c \
+ hfadl_scale.c \
+ hfadr_scale.c \
+ vfad_scale.c \
+ vfad_test.c \
+ numberbox_matrix.c \
+ iem_event.c \
+ iemgui.c
+
+TARGET = iemgui.d_fat
+
+
OBJ = $(SRC:.c=.o)
#
@@ -41,14 +42,14 @@ clean:
all: $(OBJ)
@echo :: $(OBJ)
- $(CC) -arch i386 -arch ppc $(LFLAGS) -o $(TARGET) *.o
+ $(CC) -arch i386 -arch ppc $(LFLAGS) -o $(TARGET) *.o
strip -S -x $(TARGET)
mv $(TARGET) ..
$(OBJ) : %.o : %.c
touch $*.c
- $(CC) -arch i386 -arch ppc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
-
-
-
-
+ $(CC) -arch i386 -arch ppc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
+
+
+
+
diff --git a/src/makefile_linux b/src/makefile_linux
index 60d83b3..7736cf1 100644
--- a/src/makefile_linux
+++ b/src/makefile_linux
@@ -11,7 +11,7 @@ LIB = -ldl -lm -lpthread
CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \
-Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
- -DDL_OPEN
+ -DDL_OPEN -fPIC
SYSTEM = $(shell uname -m)
diff --git a/src/sym_dial.c b/src/sym_dial.c
index e1d1ae2..eaf925a 100644
--- a/src/sym_dial.c
+++ b/src/sym_dial.c
@@ -459,10 +459,10 @@ static void sym_dial_set(t_sym_dial *x, t_symbol *s, int ac, t_atom *av)
}
else if(IS_A_SYMBOL(av, 0))
{
- t_symbol *s=atom_getsymbolarg(0, ac, av);
+ t_symbol *sy=atom_getsymbolarg(0, ac, av);
for(i=0; i<x->x_ac; i++)
{
- if(x->x_syms[i] == s)
+ if(x->x_syms[i] == sy)
break;
}
x->x_index = i;
@@ -656,7 +656,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
int bflcol[]={-262144, -1, -1};
int w=6, h=14, ac=0, i, j;
int snd_fs=0, f=0, ldx=59, ldy=7;
- int fs=9, index=0;
+ int fs=9, iindex=0;
char str[144];
iem_inttosymargs(&x->x_gui.x_isa, 0);
@@ -684,7 +684,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
bflcol[0] = (int)atom_getintarg(11, argc, argv);
bflcol[1] = (int)atom_getintarg(12, argc, argv);
bflcol[2] = (int)atom_getintarg(13, argc, argv);
- index = atom_getintarg(14, argc, argv);
+ iindex = atom_getintarg(14, argc, argv);
ac = (int)atom_getintarg(15, argc, argv);
if((ac+16) == argc)
{
@@ -710,7 +710,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
x->x_max_ac = 10;
x->x_syms = (t_symbol **)getbytes(x->x_max_ac * sizeof(t_symbol *));
x->x_syms[0] = gensym("sdl");
- index = 0;
+ iindex = 0;
}
x->x_gui.x_draw = (t_iemfunptr)sym_dial_draw;
@@ -718,7 +718,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
x->x_gui.x_fsf.x_rcv_able = 1;
x->x_gui.x_glist = (t_glist *)canvas_getcurrent();
if(x->x_gui.x_isa.x_loadinit)
- x->x_index = index;
+ x->x_index = iindex;
else
x->x_index = 0;
if(snd_fs != 0)
@@ -767,7 +767,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
t_symbol *srl[3];
int w=6, h=14, ac=0, i, j;
int snd_fs=0, f=0, ldx=59, ldy=7;
- int fs=9, iinit=0, ifstyle=0, index=0;
+ int fs=9, iinit=0, ifstyle=0, iindex=0;
t_iem_init_symargs *init=(t_iem_init_symargs *)(&iinit);
t_iem_fstyle_flags *fstyle=(t_iem_fstyle_flags *)(&ifstyle);
char str[144];
@@ -821,7 +821,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
bflcol[0] = (int)atom_getintarg(11, argc, argv);
bflcol[1] = (int)atom_getintarg(12, argc, argv);
bflcol[2] = (int)atom_getintarg(13, argc, argv);
- index = atom_getintarg(14, argc, argv);
+ iindex = atom_getintarg(14, argc, argv);
ac = (int)atom_getintarg(15, argc, argv);
if((ac+16) == argc)
{
@@ -846,7 +846,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
x->x_max_ac = 10;
x->x_syms = (t_symbol **)getbytes(x->x_max_ac * sizeof(t_symbol *));
x->x_syms[0] = gensym("sdl");
- index = 0;
+ iindex = 0;
}
x->x_gui.x_draw = (t_iemfunptr)sym_dial_draw;
@@ -857,7 +857,7 @@ static void *sym_dial_new(t_symbol *s, int argc, t_atom *argv)
x->x_gui.x_glist = (t_glist *)canvas_getcurrent();
x->x_gui.x_isa = *init;
if(x->x_gui.x_isa.x_loadinit)
- x->x_index = index;
+ x->x_index = iindex;
else
x->x_index = 0;
if(snd_fs != 0) snd_fs = 1;