Pd-cvs January 2006

pd-cvs@lists.iem.at

13 participants
285 discussions

abstractions/pureunity BYEBYE,NONE,1.1
by Mathieu Bouchard 13 Jan '06

13 Jan '06

Update of /cvsroot/pure-data/abstractions/pureunity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19121 Added Files: BYEBYE Log Message: qwerty --- NEW FILE: BYEBYE --- refugee expatriated to ../externals/

1 0

abstractions/pureunity/generics #.do.pd, 1.1, NONE #.norm.pd, 1.1, NONE #.swap.pd, 1.1, NONE #.taa.pd, 1.1, NONE 3times.pd, 1.1, NONE 4times.pd, 1.1, NONE ^.pd, 1.1, NONE antireflexive-test.pd, 1.1, NONE associative-test.pd, 1.7, NONE associator.pd, 1.4, NONE commutative-test.pd, 1.9, NONE commutator.pd, 1.4, NONE distributive-test.pd, 1.7, NONE distributor.pd, 1.4, NONE f.do.pd, 1.1, NONE f.norm.pd, 1.2, NONE f.packunpack3.pd, 1.1, NONE f.taa.pd, 1.1, NONE invertible-test.pd, 1.7, NONE invertor.pd
by Mathieu Bouchard 13 Jan '06

13 Jan '06

Update of /cvsroot/pure-data/abstractions/pureunity/generics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18473/generics Removed Files: #.do.pd #.norm.pd #.swap.pd #.taa.pd 3times.pd 4times.pd ^.pd antireflexive-test.pd associative-test.pd associator.pd commutative-test.pd commutator.pd distributive-test.pd distributor.pd f.do.pd f.norm.pd f.packunpack3.pd f.taa.pd invertible-test.pd invertor.pd partialorder-test.pd partialordereq-test.pd protocols-tree.pd reflexive-test.pd totalorder-test.pd totalordereq-test.pd tree.pd trichotomy-test.pd twice.pd ~.do.pd ~.norm.pd ~.packunpack3.pd ~.swap.pd ~.taa.pd Log Message: faith can move abstractions to /externals/ but why do it? --- ~.do.pd DELETED --- --- commutative-test.pd DELETED --- --- trichotomy-test.pd DELETED --- --- ~.taa.pd DELETED --- --- associator.pd DELETED --- --- associative-test.pd DELETED --- --- #.taa.pd DELETED --- --- invertor.pd DELETED --- --- f.taa.pd DELETED --- --- #.do.pd DELETED --- --- ~.swap.pd DELETED --- --- twice.pd DELETED --- --- invertible-test.pd DELETED --- --- ~.norm.pd DELETED --- --- ~.packunpack3.pd DELETED --- --- ^.pd DELETED --- --- antireflexive-test.pd DELETED --- --- distributive-test.pd DELETED --- --- partialordereq-test.pd DELETED --- --- totalorder-test.pd DELETED --- --- totalordereq-test.pd DELETED --- --- distributor.pd DELETED --- --- f.do.pd DELETED --- --- partialorder-test.pd DELETED --- --- f.norm.pd DELETED --- --- protocols-tree.pd DELETED --- --- commutator.pd DELETED --- --- 4times.pd DELETED --- --- 3times.pd DELETED --- --- #.norm.pd DELETED --- --- f.packunpack3.pd DELETED --- --- tree.pd DELETED --- --- reflexive-test.pd DELETED --- --- #.swap.pd DELETED ---

1 0

abstractions/pureunity/generics/locale english.tcl, 1.3, NONE
by Mathieu Bouchard 13 Jan '06

13 Jan '06

Update of /cvsroot/pure-data/abstractions/pureunity/generics/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18473/generics/locale Removed Files: english.tcl Log Message: faith can move abstractions to /externals/ but why do it? --- english.tcl DELETED ---

1 0

abstractions/pureunity/specifics arith-test.pd, 1.2, NONE comparators-test.pd, 1.1, NONE glue-test.pd, 1.1, NONE
by Mathieu Bouchard 13 Jan '06

13 Jan '06

Update of /cvsroot/pure-data/abstractions/pureunity/specifics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18473/specifics Removed Files: arith-test.pd comparators-test.pd glue-test.pd Log Message: faith can move abstractions to /externals/ but why do it? --- arith-test.pd DELETED --- --- glue-test.pd DELETED --- --- comparators-test.pd DELETED ---

1 0

abstractions/pureunity COPYING, 1.1, NONE ChangeLog, 1.3, NONE Makefile, 1.6, NONE README, 1.9, NONE TODO, 1.3, NONE main.pd, 1.5, NONE pureunity.c, 1.4, NONE
by Mathieu Bouchard 13 Jan '06

13 Jan '06

Update of /cvsroot/pure-data/abstractions/pureunity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18473 Removed Files: COPYING ChangeLog Makefile README TODO main.pd pureunity.c Log Message: faith can move abstractions to /externals/ but why do it? --- ChangeLog DELETED --- --- pureunity.c DELETED --- --- Makefile DELETED --- --- README DELETED --- --- COPYING DELETED --- --- main.pd DELETED --- --- TODO DELETED ---

1 0

externals/clr/external External.cs,1.2,1.3 pd.cs,1.2,1.3
by dmorelli 12 Jan '06

12 Jan '06

Update of /cvsroot/pure-data/externals/clr/external In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26055/external Modified Files: External.cs pd.cs Log Message: working on lists of atoms Index: External.cs =================================================================== RCS file: /cvsroot/pure-data/externals/clr/external/External.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** External.cs 12 Jan 2006 11:59:58 -0000 1.2 --- External.cs 12 Jan 2006 17:09:45 -0000 1.3 *************** *** 90,93 **** --- 90,102 ---- } + + public void SelGenericList(Atom a) + { + Console.WriteLine("a is type " + a.type); + Console.WriteLine("float = " + a.float_value); + Console.WriteLine("stringa = " + a.string_value); + } + + /* public void SelGenericList(Atom [] list) { *************** *** 96,103 **** { Atom a = (Atom) list[i]; ! pd.PostMessage("list[" + i + "] is type " + a.type + " stringa = " + a.string_value); ! // pd.PostMessage("float " + i + " = " + list[i]); } } public int test(int a) --- 105,119 ---- { Atom a = (Atom) list[i]; ! Console.WriteLine("a is type " + a.type); ! Console.WriteLine("float = " + a.float_value); ! Console.WriteLine("stringa = " + a.string_value); ! pd.PostMessage("a is type " + a.type); ! pd.PostMessage("float = " + a.float_value); ! pd.PostMessage("stringa = " + a.string_value); ! } + } + */ public int test(int a) Index: pd.cs =================================================================== RCS file: /cvsroot/pure-data/externals/clr/external/pd.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pd.cs 12 Jan 2006 11:59:58 -0000 1.2 --- pd.cs 12 Jan 2006 17:09:45 -0000 1.3 *************** *** 72,82 **** [StructLayout (LayoutKind.Explicit)] ! public struct Atom { //[FieldOffset (0)] AtomType type; ! [FieldOffset (0)] public int type; /* union members */ ! [FieldOffset (4)] public long string_value; ! [FieldOffset (4)] public float float_value; } --- 72,104 ---- [StructLayout (LayoutKind.Explicit)] ! // [StructLayout (LayoutKind.Sequential)] ! public class Atom { //[FieldOffset (0)] AtomType type; ! //[FieldOffset (0)] public int type; ! [FieldOffset (0)] ! public int type; /* union members */ ! [FieldOffset (4)] ! public float float_value; ! ! // [FieldOffset (4)] ! [FieldOffset (8)] ! public string string_value; ! ! ! ! public Atom(string string_value) ! { ! this.type = 2; ! this.float_value = 0; ! this.string_value = string_value; ! } ! public Atom(float float_value) ! { ! this.type = 1; ! this.string_value = ""; ! this.float_value = float_value; ! } }

1 0

externals/clr clr.c,1.2,1.3 test-clr.pd,1.2,1.3
by dmorelli 12 Jan '06

12 Jan '06

Update of /cvsroot/pure-data/externals/clr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26055 Modified Files: clr.c test-clr.pd Log Message: working on lists of atoms Index: test-clr.pd =================================================================== RCS file: /cvsroot/pure-data/externals/clr/test-clr.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test-clr.pd 12 Jan 2006 11:59:58 -0000 1.2 --- test-clr.pd 12 Jan 2006 17:09:45 -0000 1.3 *************** *** 1,3 **** ! #N canvas 0 0 734 482 12; #X obj 97 383 clr; #X obj 105 80 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,3 ---- ! #N canvas 0 0 738 486 12; #X obj 97 383 clr; #X obj 105 80 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 23,26 **** --- 23,27 ---- #X msg 239 364 selFloatList 0.001 1000; #X msg 239 387 selGenericList 0.001 abaco 1000; + #X msg 238 409 selGenericList abaco 1.1; #X connect 0 0 14 0; #X connect 1 0 0 0; *************** *** 41,42 **** --- 42,44 ---- #X connect 18 0 0 0; #X connect 19 0 0 0; + #X connect 20 0 0 0; Index: clr.c =================================================================== RCS file: /cvsroot/pure-data/externals/clr/clr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** clr.c 12 Jan 2006 11:59:58 -0000 1.2 --- clr.c 12 Jan 2006 17:09:45 -0000 1.3 *************** *** 54,61 **** //t_atomtype_simple a_type; int a_type; ! union{ float float_value; MonoString *string_value; ! } stuff; }; --- 54,62 ---- //t_atomtype_simple a_type; int a_type; ! //MonoString *a_type; ! //union{ float float_value; MonoString *string_value; ! //} stuff; }; *************** *** 71,74 **** --- 72,76 ---- MonoAssembly *assembly; MonoObject *obj; + MonoImage *image; MonoMethod *method, *setUp; MonoClass *klass; *************** *** 103,107 **** // const char *file="D:\\Davide\\cygwin\\home\\Davide\\externalTest1.dll"; const char *file="PureData.dll"; ! MonoImage *image; MonoMethod *m = NULL, *ctor = NULL, *fail = NULL, *mvalues; gpointer iter; --- 105,109 ---- // const char *file="D:\\Davide\\cygwin\\home\\Davide\\externalTest1.dll"; const char *file="PureData.dll"; ! MonoMethod *m = NULL, *ctor = NULL, *fail = NULL, *mvalues; gpointer iter; *************** *** 147,156 **** } ! image = mono_assembly_get_image (x->assembly); ! x->klass = mono_class_from_name (image, "PureData", "External"); if (!x->klass) { ! error("Can't find MyType in assembly %s\n", mono_image_get_filename (image)); //exit (1); } --- 149,158 ---- } ! x->image = mono_assembly_get_image (x->assembly); ! x->klass = mono_class_from_name (x->image, "PureData", "External"); if (!x->klass) { ! error("Can't find MyType in assembly %s\n", mono_image_get_filename (x->image)); //exit (1); } *************** *** 293,321 **** float ftmp; char *str; MonoArray * arystr; ! int j; ! arystr = mono_array_new (x->domain, mono_get_string_class (), argc); for (j=0; j<argc; j++) { ! atom_simple *atmp = malloc(sizeof(atom_simple)); switch ((argv+j)->a_type) { case A_FLOAT: post("setting type float in position %i", j); ! atmp->a_type = 1; ftmp = atom_getfloat(argv+j); ! atmp->stuff.float_value = ftmp; break; case A_SYMBOL: post("setting type symbol in position %i", j); ! atmp->a_type = 2; strsymbol = atom_getsymbol(argv+j); ! atmp->stuff.string_value = mono_string_new (x->domain, strsymbol->s_name); break; default: post("setting type null in position %i", j); ! atmp->a_type = 0; } ! mono_array_set (arystr, atom_simple *, j, atmp); //int * ftmp = malloc(sizeof(int)); --- 295,339 ---- float ftmp; char *str; + char strtmp[265], strtmp2[256]; MonoArray * arystr; ! int j; ! atom_simple *atmp; ! atom_simple *atmp2, *atmp3; ! ! int *tipo; ! float *fp; ! ! MonoClass *c = mono_class_from_name (x->image, "PureData", "Atom"); ! arystr = mono_array_new (x->domain, c /*mono_get_string_class ()*/, argc); ! //arystr = mono_array_new (x->domain, c, 2); ! /* for (j=0; j<argc; j++) { ! atmp = malloc(sizeof(atom_simple)); switch ((argv+j)->a_type) { case A_FLOAT: post("setting type float in position %i", j); ! //atmp->a_type = 1; ! sprintf(strtmp, "1"); ! // atmp->a_type = mono_string_new (x->domain, strtmp); ftmp = atom_getfloat(argv+j); ! atmp->float_value = ftmp; break; case A_SYMBOL: post("setting type symbol in position %i", j); ! //atmp->a_type = 2; ! sprintf(strtmp, "2"); ! // atmp->a_type = mono_string_new (x->domain, strtmp); strsymbol = atom_getsymbol(argv+j); ! atmp->string_value = mono_string_new (x->domain, strsymbol->s_name); break; default: post("setting type null in position %i", j); ! //atmp->a_type = 0; ! sprintf(strtmp, "0"); ! // atmp->a_type = mono_string_new (x->domain, strtmp); } ! // mono_array_set (arystr, MonoString *, j, atmp->a_type); mono_array_set (arystr, atom_simple *, j, atmp); //int * ftmp = malloc(sizeof(int)); *************** *** 331,335 **** } ! args[0] = arystr; //args[0] = strings; --- 349,388 ---- } ! */ ! ! // debug: ! // send just 1 atom ! ! atmp2 = malloc(sizeof(atom_simple)); ! atmp2->a_type = 121; ! atmp2->float_value = atom_getfloat(argv); ! strsymbol = atom_getsymbol(argv); ! atmp2->string_value = mono_string_new (x->domain, strsymbol->s_name); ! args[0] = atmp2; ! ! ! /* ! // a list of atoms ! for (j=0; j<argc; j++) ! { ! atmp2 = malloc(sizeof(atom_simple)); ! atmp2->a_type = 4; ! atmp2->float_value = atom_getfloat(argv+j); ! strsymbol = atom_getsymbol(argv+j); ! atmp2->string_value = mono_string_new (x->domain, strsymbol->s_name); ! mono_array_set (arystr, atom_simple *, j, atmp2); ! } ! */ ! ! ! /* ! atmp3 = malloc(sizeof(atom_simple)); ! atmp3->a_type = 2; ! atmp3->float_value = 0.5; ! sprintf(strtmp2, "abracadabra"); ! atmp3->string_value = mono_string_new (x->domain, strtmp2); ! mono_array_set (arystr, atom_simple *, 1, atmp3); ! */ ! // args[0] = arystr; //args[0] = strings;

1 0

externals/clr/external External.cs,1.1,1.2 pd.cs,1.1,1.2
by dmorelli 12 Jan '06

12 Jan '06

Update of /cvsroot/pure-data/externals/clr/external In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17879/external Modified Files: External.cs pd.cs Log Message: lists of atoms still not working Index: External.cs =================================================================== RCS file: /cvsroot/pure-data/externals/clr/external/External.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** External.cs 12 Jan 2006 09:24:23 -0000 1.1 --- External.cs 12 Jan 2006 11:59:58 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- pd.AddSelector(x, "selStringList", "SelStringList", ParametersType.List); pd.AddSelector(x, "selFloatList", "SelFloatList", ParametersType.List); + pd.AddSelector(x, "selGenericList", "SelGenericList", ParametersType.List); Console.WriteLine("selectors set"); pd.AddOutlet(x, ParametersType.Float); *************** *** 80,89 **** } ! public void SelFloatList(int [] list) { pd.PostMessage("SetStringList received a " + list.Length + " long list"); for (int i = 0; i<list.Length; i++) { ! pd.PostMessage("float " + i + " = " + list[0]); } } --- 81,101 ---- } ! public void SelFloatList(float [] list) { pd.PostMessage("SetStringList received a " + list.Length + " long list"); for (int i = 0; i<list.Length; i++) { ! pd.PostMessage("float " + i + " = " + list[i]); ! } ! } ! ! public void SelGenericList(Atom [] list) ! { ! pd.PostMessage("SetStringList received a " + list.Length + " long list"); ! for (int i = 0; i<list.Length; i++) ! { ! Atom a = (Atom) list[i]; ! pd.PostMessage("list[" + i + "] is type " + a.type + " stringa = " + a.string_value); ! // pd.PostMessage("float " + i + " = " + list[i]); } } Index: pd.cs =================================================================== RCS file: /cvsroot/pure-data/externals/clr/external/pd.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pd.cs 12 Jan 2006 09:24:23 -0000 1.1 --- pd.cs 12 Jan 2006 11:59:58 -0000 1.2 *************** *** 1,4 **** using System; ! using System.Runtime.CompilerServices; namespace PureData --- 1,6 ---- using System; ! using System.Runtime.CompilerServices; // for extern import ! using System.Runtime.InteropServices; // for structures ! namespace PureData *************** *** 47,49 **** --- 49,161 ---- } + + /* + // simplyfied atom + typedef struct atom_simple atom_simple; + typedef enum + { + A_S_NULL=0, + A_S_FLOAT=1, + A_S_SYMBOL=2, + } t_atomtype_simple; + typedef struct atom_simple + { + t_atomtype_simple a_type; + union{ + float float_value; + MonoString *string_value; + } stuff; + }; + */ + + public enum AtomType {Null = 0, Float=1, Symbol=2}; + + [StructLayout (LayoutKind.Explicit)] + public struct Atom + { + //[FieldOffset (0)] AtomType type; + [FieldOffset (0)] public int type; + /* union members */ + [FieldOffset (4)] public long string_value; + [FieldOffset (4)] public float float_value; + } + + + + /* + typedef float t_floatarg; + + typedef struct _symbol + { + char *s_name; + struct _class **s_thing; + struct _symbol *s_next; + } t_symbol; + + EXTERN_STRUCT _array; + #define t_array struct _array + + + + #define GP_NONE 0 + #define GP_GLIST 1 + #define GP_ARRAY 2 + + typedef struct _gstub + { + union + { + struct _glist *gs_glist; + struct _array *gs_array; + } gs_un; + int gs_which; + int gs_refcount; + } t_gstub; + + typedef struct _gpointer + { + union + { + struct _scalar *gp_scalar; + union word *gp_w; + } gp_un; + int gp_valid; + t_gstub *gp_stub; + } t_gpointer; + + typedef union word + { + t_float w_float; + t_symbol *w_symbol; + t_gpointer *w_gpointer; + t_array *w_array; + struct _glist *w_list; + int w_index; + } t_word; + + typedef enum + { + A_NULL, + A_FLOAT, + A_SYMBOL, + A_POINTER, + A_SEMI, + A_COMMA, + A_DEFFLOAT, + A_DEFSYM, + A_DOLLAR, + A_DOLLSYM, + A_GIMME, + A_CANT + } t_atomtype; + + #define A_DEFSYMBOL A_DEFSYM + + typedef struct _atom + { + t_atomtype a_type; + union word a_w; + } t_atom; + */ + }

1 0

externals/clr clr.c, 1.1, 1.2 makefile, 1.1, 1.2 test-clr.pd, 1.1, 1.2
by dmorelli 12 Jan '06

12 Jan '06

Update of /cvsroot/pure-data/externals/clr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17879 Modified Files: clr.c makefile test-clr.pd Log Message: lists of atoms still not working Index: test-clr.pd =================================================================== RCS file: /cvsroot/pure-data/externals/clr/test-clr.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test-clr.pd 12 Jan 2006 09:22:35 -0000 1.1 --- test-clr.pd 12 Jan 2006 11:59:58 -0000 1.2 *************** *** 1,3 **** ! #N canvas 0 0 726 474 12; #X obj 97 383 clr; #X obj 105 80 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,3 ---- ! #N canvas 0 0 734 482 12; #X obj 97 383 clr; #X obj 105 80 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 *************** *** 19,24 **** #X obj 71 429 print a; #X msg 239 297 selStringList abba baab caac dede; - #X msg 248 360 selFloatList 1 2 3 4; #X msg 240 319 selStringList ego filose; #X connect 0 0 14 0; #X connect 1 0 0 0; --- 19,26 ---- #X obj 71 429 print a; #X msg 239 297 selStringList abba baab caac dede; #X msg 240 319 selStringList ego filose; + #X msg 239 342 selFloatList 1.1 2.2 3.3 4.4; + #X msg 239 364 selFloatList 0.001 1000; + #X msg 239 387 selGenericList 0.001 abaco 1000; #X connect 0 0 14 0; #X connect 1 0 0 0; *************** *** 37,38 **** --- 39,42 ---- #X connect 16 0 0 0; #X connect 17 0 0 0; + #X connect 18 0 0 0; + #X connect 19 0 0 0; Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/clr/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 12 Jan 2006 09:22:35 -0000 1.1 --- makefile 12 Jan 2006 11:59:58 -0000 1.2 *************** *** 21,26 **** LINUXINCLUDE = -I../../src -I$PDPATH ! MONOSRC = -ID:/Davide/cygwin/tmp/build_deps/include -ID:/Davide/cygwin/tmp/build_deps/include/glib-2.0 -ID:/Davide/cygwin/tmp/build_deps/lib/glib-2.0/include -ID:/Davide/cygwin/home/Davide/mono/include ! MONOLIB = -LD:/Davide/cygwin/tmp/build_deps/lib -LD:/Davide/cygwin/home/Davide/mono/lib -lmono -lm -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv .c.dll: --- 21,26 ---- LINUXINCLUDE = -I../../src -I$PDPATH ! MONOSRC = -IC:/cygwin/tmp/build_deps/include -IC:/cygwin/tmp/build_deps/include/glib-2.0 -IC:/cygwin/tmp/build_deps/lib/glib-2.0/include -IC:/cygwin/home/Davide/mono/include ! MONOLIB = -LC:/cygwin/tmp/build_deps/lib -LC:/cygwin/home/Davide/mono/lib -lmono -lm -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv .c.dll: Index: clr.c =================================================================== RCS file: /cvsroot/pure-data/externals/clr/clr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clr.c 12 Jan 2006 09:22:35 -0000 1.1 --- clr.c 12 Jan 2006 11:59:58 -0000 1.2 *************** *** 39,45 **** { t_outlet *outlet_pointer; ! // selectorList *next; // next element of the list }; static t_class *clr_class; --- 39,64 ---- { t_outlet *outlet_pointer; ! // outletList *next; // next element of the list }; + // simplyfied atom + typedef struct atom_simple atom_simple; + typedef enum + { + A_S_NULL=0, + A_S_FLOAT=1, + A_S_SYMBOL=2, + } t_atomtype_simple; + typedef struct atom_simple + { + //t_atomtype_simple a_type; + int a_type; + union{ + float float_value; + MonoString *string_value; + } stuff; + }; + + static t_class *clr_class; *************** *** 56,59 **** --- 75,79 ---- int n; + // TODO: dynamic memory allocation selectorList selectors[MAX_SELECTORS]; outletList outlets[MAX_OUTLETS]; *************** *** 238,242 **** { // I've found the selector! - printf("selector %s, func %s\n", sl->s_name, x->selectors[i].sel); if (x->selectors[i].func) { --- 258,261 ---- *************** *** 272,299 **** MonoString *strmono; t_symbol *strsymbol; char *str; MonoArray * arystr; ! int j; ! printf("preparo l'array\n"); ! arystr = mono_array_new (x->domain, mono_get_string_class (), argc); for (j=0; j<argc; j++) { ! int * ftmp = malloc(sizeof(int)); ! *ftmp = j; ! strsymbol = atom_getsymbol(argv+j); ! MonoString *arg = mono_string_new (x->domain, strsymbol->s_name); ! mono_array_set (arystr, MonoString *, j, arg); // gpointer //mono_array_set (arystr, gint32 , j, ftmp); - } args[0] = arystr; //args[0] = strings; - printf("mando a mono\n"); mono_runtime_invoke (x->selectors[i].func, x->obj, args, NULL); - printf("ho mandatao a mono\n"); break; } --- 291,338 ---- MonoString *strmono; t_symbol *strsymbol; + float ftmp; char *str; MonoArray * arystr; ! int j; arystr = mono_array_new (x->domain, mono_get_string_class (), argc); for (j=0; j<argc; j++) { ! atom_simple *atmp = malloc(sizeof(atom_simple)); ! switch ((argv+j)->a_type) ! { ! case A_FLOAT: ! post("setting type float in position %i", j); ! atmp->a_type = 1; ! ftmp = atom_getfloat(argv+j); ! atmp->stuff.float_value = ftmp; ! break; ! case A_SYMBOL: ! post("setting type symbol in position %i", j); ! atmp->a_type = 2; ! strsymbol = atom_getsymbol(argv+j); ! atmp->stuff.string_value = mono_string_new (x->domain, strsymbol->s_name); ! break; ! default: ! post("setting type null in position %i", j); ! atmp->a_type = 0; ! } ! ! mono_array_set (arystr, atom_simple *, j, atmp); ! //int * ftmp = malloc(sizeof(int)); ! //*ftmp = j; ! //float ftmp = atom_getfloat(argv+j); ! //strsymbol = atom_getsymbol(argv+j); ! //MonoString *arg = mono_string_new (x->domain, strsymbol->s_name); ! //mono_array_set (arystr, MonoString *, j, arg); // gpointer + + //mono_array_set (arystr, gint32 , j, *ftmp); //mono_array_set (arystr, gint32 , j, ftmp); } args[0] = arystr; //args[0] = strings; mono_runtime_invoke (x->selectors[i].func, x->obj, args, NULL); break; }

1 0

externals/clr/external External.cs, NONE, 1.1 external.csproj, NONE, 1.1 pd.cs, NONE, 1.1
by dmorelli 12 Jan '06

12 Jan '06

Update of /cvsroot/pure-data/externals/clr/external In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20331 Added Files: External.cs external.csproj pd.cs Log Message: checking in the c sharp part --- NEW FILE: External.cs --- using System; namespace PureData { public class External { private IntPtr x; public External() { x = IntPtr.Zero; } // this function MUST exist public void SetUp(IntPtr pdClass) { // you must assign pdclass to x ! x = pdClass; // now you can do what you like... Console.WriteLine("pointer set!"); Console.WriteLine("setting selectors.."); pd.AddSelector(x, "sel1", "Sel1", ParametersType.None); pd.AddSelector(x, "sel2", "Sel2", ParametersType.None); pd.AddSelector(x, "selFloat", "SelFloat", ParametersType.Float); pd.AddSelector(x, "selString", "SelString", ParametersType.Symbol); pd.AddSelector(x, "selList", "SelList", ParametersType.List); pd.AddSelector(x, "selStringList", "SelStringList", ParametersType.List); pd.AddSelector(x, "selFloatList", "SelFloatList", ParametersType.List); Console.WriteLine("selectors set"); pd.AddOutlet(x, ParametersType.Float); pd.AddInlet(x, "selFloat", ParametersType.Float); } public void Sel1() { pd.PostMessage("Sel1 invoked!"); } public void Sel2() { pd.PostMessage("Sel2 invoked!"); } public void SelFloat(float f) { pd.PostMessage("SelFloat received " + f); } public void SelString(ref string s) { pd.PostMessage("SelString received " + s); } public void SelList(int [] list) { pd.PostMessage("SelList received " + list.Length + " elements"); for (int i = 0; i<list.Length; i++) { pd.PostMessage("int " + i + " = " + list[i]); } } public void SelStringList(string [] list) { pd.PostMessage("SetStringList received a " + list.Length + " long list"); for (int i = 0; i<list.Length; i++) { pd.PostMessage("string " + i + " = " + list[i]); } } public void SelFloatList(int [] list) { pd.PostMessage("SetStringList received a " + list.Length + " long list"); for (int i = 0; i<list.Length; i++) { pd.PostMessage("float " + i + " = " + list[0]); } } public int test(int a) { Console.WriteLine("test("+a+")"); return a+1; } } } --- NEW FILE: pd.cs --- using System; using System.Runtime.CompilerServices; namespace PureData { public enum ParametersType {None = 0, Float=1, Symbol=2, List=3}; public class pd { [MethodImplAttribute (MethodImplOptions.InternalCall)] private extern static void RegisterSelector (IntPtr x, string sel, string met, int type); // function called by the user public static void AddSelector(IntPtr x, string sel, string met, ParametersType type) { RegisterSelector (x, sel, met, (int) type); } // TODO // send stuff to an outlet [MethodImplAttribute (MethodImplOptions.InternalCall)] public extern static void ToOutlet (IntPtr x, int outlet, int type /*, ? array of values */); // create an outlet [MethodImplAttribute (MethodImplOptions.InternalCall)] private extern static void CreateOutlet (IntPtr x, int type); // function called by the user public static void AddOutlet(IntPtr x, ParametersType type) { CreateOutlet (x, (int) type); } // create an inlet [MethodImplAttribute (MethodImplOptions.InternalCall)] private extern static void CreateInlet (IntPtr x, string selector, int type); // function called by the user public static void AddInlet(IntPtr x, string selector, ParametersType type) { CreateInlet (x, selector, (int) type); } [MethodImplAttribute (MethodImplOptions.InternalCall)] public extern static void PostMessage (string message); [MethodImplAttribute (MethodImplOptions.InternalCall)] public extern static void ErrorMessage (string message); } } --- NEW FILE: external.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{FFBC9D2E-1FB7-4E82-B5DC-46B31F8A58A2}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "PureData" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "PureData" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "bin\Debug\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "bin\Release\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.Xml" HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "External.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "pd.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject>

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2006