importing ints

svn path=/trunk/externals/miXed/; revision=1608

12 files changed, 18 insertions, 15 deletions

diff --git a/cyclone/Makefile.sources b/cyclone/Makefile.sources
index f6e69bf..462422f 100644
--- a/cyclone/Makefile.sources
+++ b/cyclone/Makefile.sources
@@ -80,7 +80,8 @@ hammer/zl.c
 HFILE_SOURCES = \
 hammer/capture.c \
 hammer/coll.c \
-hammer/mtr.c
+hammer/mtr.c \
+hammer/Table.c
 
 HRAND_SOURCES = \
 hammer/drunk.c
diff --git a/cyclone/hammer/Append.c b/cyclone/hammer/Append.c
index 19978c7..0cdea60 100644
--- a/cyclone/hammer/Append.c
+++ b/cyclone/hammer/Append.c
@@ -141,7 +141,7 @@ static void append_set(t_append *x, t_symbol *s, int ac, t_atom *av)
 	{
 	    if (x->x_auxbuf)
 	    {
-		loud_warning((t_pd *)x, "\'set\' message overridden");
+		loud_warning((t_pd *)x, 0, "\'set\' message overridden");
 		freebytes(x->x_auxbuf, x->x_auxsize * sizeof(*x->x_auxbuf));
 		x->x_auxsize = 0;
 	    }
diff --git a/cyclone/hammer/Makefile.sources b/cyclone/hammer/Makefile.sources
index 74bda2c..89d9b2d 100644
--- a/cyclone/hammer/Makefile.sources
+++ b/cyclone/hammer/Makefile.sources
@@ -64,6 +64,7 @@ sprintf.c \
 substitute.c \
 sustain.c \
 switch.c \
+Table.c \
 tanh.c \
 thresh.c \
 TogEdge.c \
diff --git a/cyclone/hammer/allhammers.c b/cyclone/hammer/allhammers.c
index 7a28cc8..7cdf1e2 100644
--- a/cyclone/hammer/allhammers.c
+++ b/cyclone/hammer/allhammers.c
@@ -1,6 +1,6 @@
 // Do not edit this file, run "make" instead.
 
-/* Copyright (c) 2002-2003 krzYszcz and others.
+/* Copyright (c) 2002-2004 krzYszcz and others.
  * For information on usage and redistribution, and for a DISCLAIMER OF ALL
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
 
@@ -12,6 +12,7 @@ void Decode_setup(void);
 void Histo_setup(void);
 void MouseState_setup(void);
 void Peak_setup(void);
+void Table_setup(void);
 void TogEdge_setup(void);
 void Trough_setup(void);
 void Uzi_setup(void);
@@ -91,6 +92,7 @@ void allhammers_setup(void)
     Histo_setup();
     MouseState_setup();
     Peak_setup();
+    Table_setup();
     TogEdge_setup();
     Trough_setup();
     Uzi_setup();
diff --git a/cyclone/hammer/anal.c b/cyclone/hammer/anal.c
index 477eb20..374fa17 100644
--- a/cyclone/hammer/anal.c
+++ b/cyclone/hammer/anal.c
@@ -76,7 +76,7 @@ static void *anal_new(t_floatarg f)
     else if (size > ANAL_MAXSIZE)
     {
 	/* CHECKED: */
-	loud_warning(&anal_class, "size too large, using %d", ANAL_MAXSIZE);
+	loud_warning(&anal_class, 0, "size too large, using %d", ANAL_MAXSIZE);
 	size = ANAL_MAXSIZE;  /* LATER switch into a 'sparse' mode */
     }
     /* CHECKED: actually the bytesize is size * size * sizeof(short),
diff --git a/cyclone/hammer/coll.c b/cyclone/hammer/coll.c
index 5308341..53003fd 100644
--- a/cyclone/hammer/coll.c
+++ b/cyclone/hammer/coll.c
@@ -602,7 +602,7 @@ static void collcommon_doread(t_collcommon *cc, t_symbol *fn, t_canvas *cv)
 	sys_bashfilename(buf, fname);
 	if (!(fp = fopen(fname, "r")))
 	{
-	    loud_warning(&coll_class, "no coll file '%s'", fname);
+	    loud_warning(&coll_class, 0, "no coll file '%s'", fname);
 	    return;
 	}
 	fclose(fp);
diff --git a/cyclone/hammer/prepend.c b/cyclone/hammer/prepend.c
index 567bb73..052c8d6 100644
--- a/cyclone/hammer/prepend.c
+++ b/cyclone/hammer/prepend.c
@@ -185,7 +185,7 @@ static void prepend_set(t_prepend *x, t_symbol *s, int ac, t_atom *av)
 	{
 	    if (x->x_auxbuf)
 	    {
-		loud_warning((t_pd *)x, "'set' message overridden");
+		loud_warning((t_pd *)x, 0, "'set' message overridden");
 		freebytes(x->x_auxbuf, x->x_auxsize * sizeof(*x->x_auxbuf));
 		x->x_auxsize = 0;
 	    }
diff --git a/cyclone/hammer/seq.c b/cyclone/hammer/seq.c
index 011c97d..edeff88 100644
--- a/cyclone/hammer/seq.c
+++ b/cyclone/hammer/seq.c
@@ -932,7 +932,7 @@ static void *seq_new(t_symbol *s)
     static int warned = 0;
     if (!warned)
     {
-	loud_warning((t_pd *)x, "seq is not ready yet");
+	loud_warning((t_pd *)x, 0, "seq is not ready yet");
 	warned = 1;
     }
     x->x_canvas = canvas_getcurrent();
diff --git a/cyclone/hammer/urn.c b/cyclone/hammer/urn.c
index 37aaae0..d6983a2 100644
--- a/cyclone/hammer/urn.c
+++ b/cyclone/hammer/urn.c
@@ -50,7 +50,7 @@ static int urn_resize(t_urn *x, t_float f, int init)
     }
     if (range > URN_MAXSIZE)
     {
-	loud_warning((t_pd *)x,
+	loud_warning((t_pd *)x, 0,
 		     "requested size (%d) clipped -- effective size is %d",
 		     range, URN_MAXSIZE);
 	range = URN_MAXSIZE;
diff --git a/cyclone/hammer/zl.c b/cyclone/hammer/zl.c
index 1c4c7a5..994eef9 100644
--- a/cyclone/hammer/zl.c
+++ b/cyclone/hammer/zl.c
@@ -260,7 +260,7 @@ static int zl_nop_count(t_zl *x)
 
 static void zl_nop(t_zl *x, int natoms, t_atom *buf, int banged)
 {
-    loud_warning((t_pd *)x, "unknown mode");
+    loud_warning((t_pd *)x, 0, "unknown mode");
 }
 
 static int zl_ecils_intarg(t_zl *x, int i)
diff --git a/cyclone/shadow/cyclone.c b/cyclone/shadow/cyclone.c
index 69abf2c..20d1396 100644
--- a/cyclone/shadow/cyclone.c
+++ b/cyclone/shadow/cyclone.c
@@ -142,13 +142,13 @@ void cyclone_setup(void)
 
     cyclone_hammerndx = fragile_class_count();
     if (zgetfn(&pd_objectmaker, gensym("hammer")))
-	loud_warning(0, "hammer is already loaded");
+	loud_warning(0, "cyclone", "hammer is already loaded");
     else
 	hresult = unstable_load_lib("", "hammer");
 
     cyclone_sicklendx = fragile_class_count();
     if (zgetfn(&pd_objectmaker, gensym("sickle")))
-	loud_warning(0, "sickle is already loaded");
+	loud_warning(0, "cyclone", "sickle is already loaded");
     else
 	sresult = unstable_load_lib("", "sickle");
 
@@ -157,7 +157,7 @@ void cyclone_setup(void)
 
     cyclone_dummiesndx = fragile_class_count();
     if (zgetfn(&pd_objectmaker, gensym("dummies")))
-	loud_warning(0, "dummies are already loaded");
+	loud_warning(0, "cyclone", "dummies are already loaded");
     else
 	dresult = unstable_load_lib("", "dummies");
 
@@ -175,7 +175,7 @@ void cyclone_setup(void)
 		    "use a more recent Pd release (or recompile the cyclone).");
     }
     else if (dresult == LOADER_NOFILE)
-	loud_warning(0, "dummies not found");
+	loud_warning(0, "cyclone", "dummies not found");
     else
     {
 	t_symbol *s = gensym("_cc.dummies");
diff --git a/cyclone/shadow/dummies.c b/cyclone/shadow/dummies.c
index 3f857ef..6555aeb 100644
--- a/cyclone/shadow/dummies.c
+++ b/cyclone/shadow/dummies.c
@@ -486,7 +486,6 @@ static t_dummy_slot dummy_slots[] =
     { "swatch",          3, 2, 0, 0 },
     { "sxformat",       -1, 1, 0, (t_newmethod)dummy_sxformat_new },
     { "sysexin",         1, 1, 0, 0 },
-    { "Table",           2, 2, 0, 0 },
     { "tapin~",          1, 1, 0, 0 },
     { "tapout~",        -1, -1, 0, (t_newmethod)dummy_tapout_tilde_new },
     { "teeth~",          6, 1, 0, 0 },
@@ -548,7 +547,7 @@ static t_object *dummy_newobject(t_symbol *s, t_dummy_slot **slotp)
 	bug("dummy_newobject");  /* create a "_dummy" in this case */
     else if (!sl->s_warned)
     {
-	loud_warning((t_pd *)x, "dummy substitution");
+	loud_warning((t_pd *)x, 0, "dummy substitution");
 	sl->s_warned = 1;
     }
     if (slotp) *slotp = sl;