Commit c09944f8 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'jwarmbook/purr-data-external-tests-revised'

parents 76fdb7e0 4de72424
...@@ -11,7 +11,7 @@ debian_stable_i386_deb: ...@@ -11,7 +11,7 @@ debian_stable_i386_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
- cd .. - cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd - pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -30,7 +30,7 @@ debian_stable_amd64_deb: ...@@ -30,7 +30,7 @@ debian_stable_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
- cd .. - cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd - pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -49,7 +49,8 @@ ubuntu_14.04_i386_deb: ...@@ -49,7 +49,8 @@ ubuntu_14.04_i386_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
- cd .. - cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd - cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -68,7 +69,9 @@ ubuntu_14.04_amd64_deb: ...@@ -68,7 +69,9 @@ ubuntu_14.04_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
- cd .. - cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd - cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -87,7 +90,9 @@ ubuntu_16.04_amd64_deb: ...@@ -87,7 +90,9 @@ ubuntu_16.04_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
- cd .. - cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null - echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd - cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -102,6 +107,8 @@ osx_amd64_dmg: ...@@ -102,6 +107,8 @@ osx_amd64_dmg:
- echo `pwd` - echo `pwd`
- cd l2ork_addons - cd l2ork_addons
- ./tar_em_up.sh -X - ./tar_em_up.sh -X
- cd ../scripts
- ../packages/darwin_app/build/*.app/Contents/Resources/app.nw/bin/pd-l2ork -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
...@@ -116,25 +123,13 @@ osx_10.8_amd64_dmg: ...@@ -116,25 +123,13 @@ osx_10.8_amd64_dmg:
- echo `pwd` - echo `pwd`
- cd l2ork_addons - cd l2ork_addons
- osx_version=10.8 ./tar_em_up.sh -X - osx_version=10.8 ./tar_em_up.sh -X
- cd ../scripts
- ../packages/darwin_app/build/*.app/Contents/Resources/app.nw/bin/pd-l2ork -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
- Pd*.dmg - Pd*.dmg
debian_stable_arm_deb:
tags:
- debian
- arm
- stable
script:
- echo `pwd`
- cd l2ork_addons
- ./tar_em_up.sh -r
artifacts:
expire_in: 1 day
paths:
- pd*.deb
windows_i386_installer: windows_i386_installer:
tags: tags:
- windows - windows
...@@ -143,6 +138,8 @@ windows_i386_installer: ...@@ -143,6 +138,8 @@ windows_i386_installer:
- echo `pwd` - echo `pwd`
- cd l2ork_addons - cd l2ork_addons
- ./tar_em_up.sh -Z - ./tar_em_up.sh -Z
- cd ../scripts
- ../packages/win32_inno/build/bin/pd.exe -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
url = https://git.purrdata.net/jwilkes/Gem.git url = https://git.purrdata.net/jwilkes/Gem.git
[submodule "externals/lyonpotpourri"] [submodule "externals/lyonpotpourri"]
path = externals/lyonpotpourri path = externals/lyonpotpourri
url = https://github.com/ericlyon/lyonpotpourri3.0.git url = https://git.purrdata.net/jwilkes/lyonpotpourri3.0.git
...@@ -129,7 +129,7 @@ CXXFLAGS = $(CFLAGS) ...@@ -129,7 +129,7 @@ CXXFLAGS = $(CFLAGS)
# #
# WARNING! this MUST be all on one line because the automatic package # WARNING! this MUST be all on one line because the automatic package
# building scripts rely on it being that way. # building scripts rely on it being that way.
LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
# DISABLED: flatgui # DISABLED: flatgui
...@@ -937,7 +937,7 @@ iem16_install: iem16 ...@@ -937,7 +937,7 @@ iem16_install: iem16
install -d $(DESTDIR)$(objectsdir)/$(IEM16_NAME) install -d $(DESTDIR)$(objectsdir)/$(IEM16_NAME)
$(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(IEM16_NAME) \ $(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(IEM16_NAME) \
--author "IOhannes m zmoelnig" \ --author "IOhannes m zmoelnig" \
--description "16bit table, array objects for low memory usage" \ --description "16bit table/array objects for low memory usage" \
--license "GNU GPL" \ --license "GNU GPL" \
--version "0.1" --version "0.1"
install -p $(IEM16_DIR)/*.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(IEM16_NAME) install -p $(IEM16_DIR)/*.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(IEM16_NAME)
...@@ -1108,29 +1108,6 @@ jasch_lib_clean: ...@@ -1108,29 +1108,6 @@ jasch_lib_clean:
-rm -f -- $(externals_src)/jasch_lib/*/*.bak -rm -f -- $(externals_src)/jasch_lib/*/*.bak
-rm -f -- $(externals_src)/jasch_lib/*/*.*~ -rm -f -- $(externals_src)/jasch_lib/*/*.*~
#------------------------------------------------------------------------------#
# LOADERS-HEXLOADER
LOADERS-HEXLOADER_NAME = hexloader
LOADERS-HEXLOADER_OBJECTS := $(externals_src)/loaders/hexloader/hexloader.c
loaders-hexloader: $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION))
echo $(LOADERS-HEXLOADER_OBJECTS)
loaders-hexloader_install: loaders-hexloader
install -d $(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME)
install -p $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION)) \
$(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME)
install -p $(externals_src)/loaders/hexloader/README.txt \
$(externals_src)/loaders/hexloader/FAQ.txt \
$(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME)
loaders-hexloader_clean:
-rm -f -- $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION))
-rm -f -- $(externals_src)/loaders/hexloader/*.o
-rm -f -- $(externals_src)/loaders/*.bak
-rm -f -- $(externals_src)/loaders/hexloader/*.*~
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# LOADERS-LIBDIR # LOADERS-LIBDIR
loaders-libdir: loaders-libdir:
...@@ -1857,26 +1834,26 @@ zexy_install: zexy ...@@ -1857,26 +1834,26 @@ zexy_install: zexy
# add missing aliases # add missing aliases
# can't do these on Windows because FAT, NTFS don't support these chars in filenames # can't do these on Windows because FAT, NTFS don't support these chars in filenames
# on Windows, these are faked in by loading them as libs # on Windows, these are faked in by loading them as libs
ifneq ($(OS_NAME),windows) #ifneq ($(OS_NAME),windows)
test -e $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) || \ # test -e $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) || \
ln -s 0x2e.$(EXTENSION) \ # ln -s 0x2e.$(EXTENSION) \
$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) # $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION)
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' || \ # test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' || \
ln -s 0x260x260x7e.$(EXTENSION) \ # ln -s 0x260x26_tilde.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' # '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' || \ # test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' || \
ln -s 0x3c0x7e.$(EXTENSION) \ # ln -s 0x3c_tilde.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' # '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' || \ # test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' || \
ln -s 0x3d0x3d0x7e.$(EXTENSION) \ # ln -s 0x3d0x3d_tilde.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' # '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)' || \ # test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)' || \
ln -s 0x3e0x7e.$(EXTENSION) \ # ln -s 0x3e_tilde.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)' # '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/>~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)' || \ # test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)' || \
ln -s 0x7c0x7c0x7e.$(EXTENSION) \ # ln -s 0x7c0x7c_tilde.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)' # '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/||~.$(EXTENSION)'
endif #endif
zexy_clean: zexy_clean:
cd $(externals_src)/zexy && ./autogen.sh cd $(externals_src)/zexy && ./autogen.sh
......
/* config.h. Generated by configure. */ /* config.h. Generated from config.h.in by configure. */
...@@ -4,7 +4,7 @@ ARFLAGS=srv ...@@ -4,7 +4,7 @@ ARFLAGS=srv
# DEFS= -Dunix # DEFS= -Dunix
LIB=libOSC.a LIB=libOSC.a
CFLAGS=-g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src CFLAGS=-g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
INCLUDES=-I../libOSC -I../../pd/src -I../../../pd/src -I../src INCLUDES=-I../libOSC -I../../pd/src -I../../../pd/src -I../src
LIBOBJS= ${LIB}(OSC-client.o) ${LIB}(OSC-timetag.o) LIBOBJS= ${LIB}(OSC-client.o) ${LIB}(OSC-timetag.o)
......
LIBS = -lc -lm LIBS = -L../../../pd/bin -lc -lm
LIBOSCDIR = ../libOSC LIBOSCDIR = ../libOSC
LIBOSC = ${LIBOSCDIR}/libOSC.a LIBOSC = ${LIBOSCDIR}/libOSC.a
# strange bug requires this... # strange bug requires this...
CFLAGS= -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src -I../libOSC -I../../pd/src -I../../../pd/src -I../src CFLAGS= -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src -I../libOSC -I../../pd/src -I../../../pd/src -I../src
# INCLUDES= -I../libOSC -I../../pd/src -I../../../pd/src -I../src # INCLUDES= -I../libOSC -I../../pd/src -I../../../pd/src -I../src
DUMPOBJS=dumpOSC.o DUMPOBJS=dumpOSC.o
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
EXT=o EXT=o
LIBS = -lc -lm LIBS = -L../../../pd/bin -lc -lm
LIBOSC = ../libOSC/libOSC.a LIBOSC = ../libOSC/libOSC.a
CFLAGS = -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src CFLAGS = -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
INCLUDES = -I../libOSC -I../../pd/src -I../../../pd/src -I../src INCLUDES = -I../libOSC -I../../pd/src -I../../../pd/src -I../src
LDFLAGS = -Wl,--export-dynamic -shared LDFLAGS = -Wl,--export-dynamic -shared
......
...@@ -345,11 +345,25 @@ static void *partconv_new(t_symbol *s, int argc, t_atom *argv) ...@@ -345,11 +345,25 @@ static void *partconv_new(t_symbol *s, int argc, t_atom *argv)
t_partconv *x = (t_partconv *)pd_new(partconv_class); t_partconv *x = (t_partconv *)pd_new(partconv_class);
outlet_new(&x->x_obj, gensym("signal")); outlet_new(&x->x_obj, gensym("signal"));
t_atom sane_defaults[2];
if (argc != 2) { if (argc != 2) {
/* Give some sane defaults with no args so we can at least
instantiate and get to the help patch */
if (!argc)
{
post("partconv~: warning: no arguments given");
SETSYMBOL(sane_defaults, &s_);
SETFLOAT(sane_defaults+1, 2.);
argc = 2;
argv = sane_defaults;
}
else
{
post("argc = %d", argc); post("argc = %d", argc);
error("partconv~: usage: [partconv~ <arrayname> <partsize>]\n\t- partition size must be a power of 2 >= blocksize"); error("partconv~: usage: [partconv~ <arrayname> <partsize>]\n\t- partition size must be a power of 2 >= blocksize");
return NULL; return NULL;
}
} }
x->arrayname = atom_getsymbol(argv); x->arrayname = atom_getsymbol(argv);
......
...@@ -315,14 +315,27 @@ static void *pvoc_new(t_symbol *s, int argc, t_atom *argv) ...@@ -315,14 +315,27 @@ static void *pvoc_new(t_symbol *s, int argc, t_atom *argv)
{ {
t_pvoc *x = (t_pvoc *)pd_new(pvoc_class); t_pvoc *x = (t_pvoc *)pd_new(pvoc_class);
int i; int i;
t_atom sane_defaults[3];
inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); // pitch-shift inlet inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); // pitch-shift inlet
outlet_new(&x->x_obj, gensym("signal")); outlet_new(&x->x_obj, gensym("signal"));
if (argc != 3) { if (argc != 3) {
if (!argc)
{
post("partconv~: warning: no arguments given");
SETSYMBOL(sane_defaults, &s_);
SETFLOAT(sane_defaults+1, 2.);
SETFLOAT(sane_defaults+2, 2.);
argc = 3;
argv = sane_defaults;
}
else
{
post("argc = %d", argc); post("argc = %d", argc);
error("pvoc~: usage: [pvoc~ <arrayname> <fftsize> <overlap>]"); error("pvoc~: usage: [pvoc~ <arrayname> <fftsize> <overlap>]");
return NULL; return NULL;
}
} }
x->fftsize = atom_getfloatarg(1, argc, argv); x->fftsize = atom_getfloatarg(1, argc, argv);
......
...@@ -97,6 +97,10 @@ typedef struct _iemgui ...@@ -97,6 +97,10 @@ typedef struct _iemgui
unsigned int x_locked:1; // 7 matches ([bng] only) unsigned int x_locked:1; // 7 matches ([bng] only)
unsigned int x_reverse:1; // 4 matches (sliders only) unsigned int x_reverse:1; // 4 matches (sliders only)
unsigned int dummy:20; unsigned int dummy:20;
int legacy_x; // legacy x offset
int legacy_y; // legacy y offset
//int click_x; // click getrect x offset
//int click_y; // click getrect y offset
} t_iemgui; } t_iemgui;
typedef struct _bng typedef struct _bng
...@@ -180,7 +184,7 @@ typedef struct _my_numbox ...@@ -180,7 +184,7 @@ typedef struct _my_numbox
double x_k; double x_k;
int x_lin0_log1; // bool int x_lin0_log1; // bool
char x_buf[IEMGUI_MAX_NUM_LEN]; char x_buf[IEMGUI_MAX_NUM_LEN];
int x_numwidth; // unsigned int x_numwidth; // unsigned (width in pixels)
int x_scalewidth; /* temporary value for scalehandle */ int x_scalewidth; /* temporary value for scalehandle */
int x_scaleheight; /* temporary value for scalehandle */ int x_scaleheight; /* temporary value for scalehandle */
int x_tmpfontsize; /* temporary value for scalehandle */ int x_tmpfontsize; /* temporary value for scalehandle */
...@@ -280,3 +284,4 @@ EXTERN void iemgui_out_bang(t_iemgui *x, int o, int chk_putin); ...@@ -280,3 +284,4 @@ EXTERN void iemgui_out_bang(t_iemgui *x, int o, int chk_putin);
EXTERN void iemgui_out_float(t_iemgui *x, int o, int chk_putin, t_float f); EXTERN void iemgui_out_float(t_iemgui *x, int o, int chk_putin, t_float f);
EXTERN void iemgui_out_list(t_iemgui *x, int o, int chk_putin, t_symbol *s, int argc, t_atom *argv); EXTERN void iemgui_out_list(t_iemgui *x, int o, int chk_putin, t_symbol *s, int argc, t_atom *argv);
EXTERN int sys_legacy; // found in s_main.c, used for legacy iemgui positioning
...@@ -31,11 +31,11 @@ typedef struct ffpoly_struct ...@@ -31,11 +31,11 @@ typedef struct ffpoly_struct
t_float x_f; t_float x_f;
t_outlet *x_outlet; t_outlet *x_outlet;
t_int *x_coef; int *x_coef;
t_int x_poly_order; int x_poly_order;
t_int x_field_order; int x_field_order;
t_int x_lastpackedcoef; int x_lastpackedcoef;
...@@ -49,7 +49,7 @@ static void ffpoly_compute(t_ffpoly *x, t_floatarg fcoef) ...@@ -49,7 +49,7 @@ static void ffpoly_compute(t_ffpoly *x, t_floatarg fcoef)
int in = (int)fcoef; int in = (int)fcoef;
int fo = x->x_field_order; int fo = x->x_field_order;
int po = x->x_poly_order; int po = x->x_poly_order;
t_int* c = x->x_coef; int* c = x->x_coef;
int i, out; int i, out;
in %= fo; in %= fo;
...@@ -124,8 +124,8 @@ t_class *ffpoly_class; ...@@ -124,8 +124,8 @@ t_class *ffpoly_class;
static void *ffpoly_new(t_floatarg fpolyorder, t_floatarg ffieldorder) static void *ffpoly_new(t_floatarg fpolyorder, t_floatarg ffieldorder)
{ {
t_int polyorder = (int)fpolyorder; int polyorder = (int)fpolyorder;
t_int fieldorder = (int)ffieldorder; int fieldorder = (int)ffieldorder;
t_ffpoly *x = (t_ffpoly *)pd_new(ffpoly_class); t_ffpoly *x = (t_ffpoly *)pd_new(ffpoly_class);
...@@ -135,7 +135,7 @@ static void *ffpoly_new(t_floatarg fpolyorder, t_floatarg ffieldorder) ...@@ -135,7 +135,7 @@ static void *ffpoly_new(t_floatarg fpolyorder, t_floatarg ffieldorder)
x->x_poly_order = polyorder; x->x_poly_order = polyorder;
x->x_field_order = fieldorder; x->x_field_order = fieldorder;
x->x_coef = (t_int *)malloc((x->x_poly_order + 1) * sizeof(int)); x->x_coef = (int *)malloc((x->x_poly_order + 1) * sizeof(int));
/* set poly to f(x) = x */ /* set poly to f(x) = x */
ffpoly_coefficients(x, x->x_field_order); ffpoly_coefficients(x, x->x_field_order);
......
...@@ -81,8 +81,8 @@ void ENV_setup(void) ...@@ -81,8 +81,8 @@ void ENV_setup(void)
ENV_class = class_new(gensym("ENV"), (t_newmethod)ENV_new, 0, ENV_class = class_new(gensym("ENV"), (t_newmethod)ENV_new, 0,
sizeof(t_ENV), 0, 0); sizeof(t_ENV), 0, 0);
class_addmethod(ENV_class, (t_method)ENV_RAND_MAX, gensym("RAND_MAX"), 0); class_addmethod(ENV_class, (t_method)ENV_RAND_MAX, gensym("RAND_MAX"), 0);
class_addmethod(ENV_class, (t_method)ENV_getenv, gensym("getenv"), A_SYMBOL); class_addmethod(ENV_class, (t_method)ENV_getenv, gensym("getenv"), A_SYMBOL, 0);
class_addmethod(ENV_class, (t_method)ENV_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL); class_addmethod(ENV_class, (t_method)ENV_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL, 0);
class_addfloat(ENV_class, ENV_float); class_addfloat(ENV_class, ENV_float);
} }
...@@ -23,7 +23,7 @@ typedef struct _counter ...@@ -23,7 +23,7 @@ typedef struct _counter
t_outlet *t_out2; /* the outlet */ t_outlet *t_out2; /* the outlet */
} t_counter; } t_counter;
void counter_bang(t_counter *x) static void counter_bang(t_counter *x)
{ {
int sendBang = 0; int sendBang = 0;
switch(x->c_dir) switch(x->c_dir)
...@@ -93,23 +93,23 @@ void counter_bang(t_counter *x) ...@@ -93,23 +93,23 @@ void counter_bang(t_counter *x)
outlet_bang(x->t_out2); outlet_bang(x->t_out2);
} }
void counter_dir(t_counter *x, t_floatarg n) static void counter_dir(t_counter *x, t_floatarg n)
{ {
if (n == 1 || n == 2 || n == 3) x->c_dir = (int)n; if (n == 1 || n == 2 || n == 3) x->c_dir = (int)n;
else error("bad dir"); else error("bad dir");
} }
void counter_high(t_counter *x, t_floatarg n) static void counter_high(t_counter *x, t_floatarg n)
{ {
x->c_high = (int)n; x->c_high = (int)n;
} }
void counter_low(t_counter *x, t_floatarg n) static void counter_low(t_counter *x, t_floatarg n)
{ {
x->c_low = (int)n; x->c_low = (int)n;
} }
void counter_reset(t_counter *x, t_symbol *s, int argc, t_atom *argv) static void counter_reset(t_counter *x, t_symbol *s, int argc, t_atom *argv)
{ {
if (!argc) if (!argc)
{ {
...@@ -144,7 +144,7 @@ void counter_reset(t_counter *x, t_symbol *s, int argc, t_atom *argv) ...@@ -144,7 +144,7 @@ void counter_reset(t_counter *x, t_symbol *s, int argc, t_atom *argv)
outlet_float(x->t_out1, (float)x->c_current); outlet_float(x->t_out1, (float)x->c_current);
} }
void counter_clear(t_counter *x, t_symbol *s, int argc, t_atom *argv) static void counter_clear(t_counter *x, t_symbol *s, int argc, t_atom *argv)
{ {
if (!argc) if (!argc)
{ {
...@@ -178,7 +178,7 @@ void counter_clear(t_counter *x, t_symbol *s, int argc, t_atom *argv) ...@@ -178,7 +178,7 @@ void counter_clear(t_counter *x, t_symbol *s, int argc, t_atom *argv)
} }
} }
void *counter_new(t_floatarg f, t_floatarg g, t_floatarg h) /* init vals in struc */ static void *counter_new(t_floatarg f, t_floatarg g, t_floatarg h) /* init vals in struc */
{ {
t_counter *x = (t_counter *)pd_new(counter_class); t_counter *x = (t_counter *)pd_new(counter_class);
x->t_out1 = outlet_new(&x->x_obj, 0); x->t_out1 = outlet_new(&x->x_obj, 0);
......
...@@ -213,10 +213,10 @@ void proc_setup(void) ...@@ -213,10 +213,10 @@ void proc_setup(void)
proc_class = class_new(gensym("proc"), (t_newmethod)proc_new, 0, proc_class = class_new(gensym("proc"), (t_newmethod)proc_new, 0,
sizeof(t_proc), 0, 0); sizeof(t_proc), 0, 0);
class_addmethod(proc_class, (t_method)proc_cpuinfo, gensym("cpuinfo"), 0); class_addmethod(proc_class, (t_method)proc_cpuinfo, gensym("cpuinfo"), 0);
class_addmethod(proc_class, (t_method)proc_proc, gensym("proc"), A_SYMBOL); class_addmethod(proc_class, (t_method)proc_proc, gensym("proc"), A_SYMBOL, 0);
//class_addmethod(proc_class, (t_method)proc_RAND_MAX, gensym("RAND_MAX"), 0); //class_addmethod(proc_class, (t_method)proc_RAND_MAX, gensym("RAND_MAX"), 0);
//class_addmethod(proc_class, (t_method)proc_getenv, gensym("getenv"), A_SYMBOL); //class_addmethod(proc_class, (t_method)proc_getenv, gensym("getenv"), A_SYMBOL, 0);
//class_addmethod(proc_class, (t_method)proc_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL); //class_addmethod(proc_class, (t_method)proc_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL, 0);
class_addfloat(proc_class, proc_float); class_addfloat(proc_class, proc_float);
} }
...@@ -177,7 +177,7 @@ void maskxor_print(t_maskxor *x) ...@@ -177,7 +177,7 @@ void maskxor_print(t_maskxor *x)
post("mode = %f, lengthl = %d, lengthr = %d, lengthm = %d",x->mode,x->lengthl,x->lengthr,x->lengthm); post("mode = %f, lengthl = %d, lengthr = %d, lengthm = %d",x->mode,x->lengthl,x->lengthr,x->lengthm);
} }
void *maskxor_new(t_symbol *s, t_floatarg fmode) void *maskxor_new(t_floatarg fmode)
{ {