aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Morelli <morellid@users.sourceforge.net>2006-01-07 12:04:27 +0000
committerDavide Morelli <morellid@users.sourceforge.net>2006-01-07 12:04:27 +0000
commitffef7f757e6de28bd54bd031e392b2ca4afde0bb (patch)
treec4036794ede0423e96761eb3b5dcb5ebfa508fe8
parentf4ad91a62cf11ef1c3bd71c864ca76a324debc6e (diff)
fixed silly bugs
svn path=/trunk/externals/frankenstein/; revision=4371
-rwxr-xr-xMakefile6
-rwxr-xr-xrhythms_memory.c12
2 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 5b735a2..052a1dc 100755
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
# customize here !
#VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7"
VC="C:\Programmi\Microsoft Visual Studio .NET\Vc7"
-#PDPATH="H:\PureData\pd-0.38-3.msw\pd"
-PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd"
+PDPATH="H:\PureData\pd-0.38-3.msw\pd"
+#PDPATH="C:\Documents and Settings\Davide\Documenti\personali\pd-0.38-3.msw\pd"
current: pd_nt distclean
-pd_nt: chord_melo.dll chords_memory.dll harmonizer.dll GArhythm.dll ritmo1.dll rhythms_memory.dll
+pd_nt: chord_melo.dll chords_memory.dll harmonizer.dll GArhythm.dll ritmo1.dll rhythms_memory.dll themes_memory.dll
.SUFFIXES: .dll
diff --git a/rhythms_memory.c b/rhythms_memory.c
index 3b295e8..a9763ef 100755
--- a/rhythms_memory.c
+++ b/rhythms_memory.c
@@ -208,13 +208,13 @@ void end_measure(t_rhythms_memory *x)
if (rhythm_found==0)
{
post("rhythms_memory: rhythm %i %i was not found ", x->next_main_rhythm_out, x->next_sub_rhythm_out);
- return 0;
+ return;
}
if (wanted_rhythm==0)
{
error("rhythms_memory: wanted_rhythm should not be null! ");
- return 0;
+ return;
}
// now I setup the events_out list
@@ -383,9 +383,9 @@ void *rhythms_memory_new(t_symbol *s, int argc, t_atom *argv)
//x->l_out = outlet_new(&x->x_obj, &s_list);
x->bangs_out = outlet_new(&x->x_obj, gensym("bang"));
// this outputs lists of events
- x->list_out = outlet_new(&x->x_obj, "symbol");
+ x->list_out = outlet_new(&x->x_obj, gensym("symbol"));
// this outputs info on the last detected rhythm
- x->info_out = outlet_new(&x->x_obj, "symbol");
+ x->info_out = outlet_new(&x->x_obj, gensym("symbol"));
// inlet for rhythms in the form of lists
inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("list"), gensym("rhythm_in"));
@@ -399,14 +399,16 @@ void *rhythms_memory_new(t_symbol *s, int argc, t_atom *argv)
return (x);
}
+
// debugging function
void crash(t_rhythms_memory *x)
{
int *a;
a = malloc(sizeof(int));
- a[9999999999999999999] = 1;
+ a[99999999999] = 1;
}
+
void rhythms_memory_setup(void)
{
rhythms_memory_class = class_new(gensym("rhythms_memory"), (t_newmethod)rhythms_memory_new,