Pd-cvs November 2004

pd-cvs@lists.iem.at

12 participants
283 discussions

pd/extra/expr~ fts_to_pd.h,1.2,1.3 makefile,1.6,1.7 vexp.c,1.4,1.5 vexp.h,1.3,1.4 vexp_fun.c,1.3,1.4 vexp_if.c,1.4,1.5
by Miller Puckette 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/extra/expr~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/pd/extra/expr~ Modified Files: fts_to_pd.h makefile vexp.c vexp.h vexp_fun.c vexp_if.c Log Message: 0.38 test 9 (mostly bug fixes) Index: vexp.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vexp.c 6 Sep 2004 20:20:27 -0000 1.4 --- vexp.c 6 Nov 2004 16:07:22 -0000 1.5 *************** *** 29,42 **** /* ! * Feb 2002 - added access to variables ! * multiple expression support ! * new short hand forms for fexpr~ ! * now $y or $y1 = $y1[-1] and $y2 = $y2[-1] ! * --sdy * * July 2002 ! * fixed bugs introduced in last changes in store and ET_EQ [...3834 lines suppressed...] ! post("%s", "||"); ! break; ! case OP_COMMA: ! post("%c", ','); ! break; ! case OP_SEMI: ! post("%c", ';'); ! break; ! default: ! post("expr: ex_print: bad op 0x%lx\n", eptr->ex_op); ! } ! break; ! default: ! post("expr: ex_print: bad type 0x%lx\n", eptr->ex_type); ! } ! eptr++; ! } ! post("\n"); } Index: vexp_fun.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp_fun.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vexp_fun.c 23 Sep 2003 00:18:13 -0000 1.3 --- vexp_fun.c 6 Nov 2004 16:07:23 -0000 1.4 *************** *** 28,61 **** * * Nov. 2001 --sdy ! * conversion for expr~ * * Jan, 2002 --sdy ! * added fmod() * * May 2002 ! * added floor and ceil for expr -- Orm Finnendahl * [...2171 lines suppressed...] ! return (xx); } FUNC_DEF_UNARY(ex_imodf, imodf, (double), 1); *************** *** 1229,1235 **** fracmodf(double x) { ! double xx; ! return(modf(x, &xx)); } FUNC_DEF_UNARY(ex_modf, fracmodf, (double), 1); --- 1229,1235 ---- fracmodf(double x) { ! double xx; ! return(modf(x, &xx)); } FUNC_DEF_UNARY(ex_modf, fracmodf, (double), 1); Index: fts_to_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/fts_to_pd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fts_to_pd.h 8 Aug 2002 16:42:32 -0000 1.2 --- fts_to_pd.h 6 Nov 2004 16:07:22 -0000 1.3 *************** *** 15,26 **** #ifdef MSP ! #define t_atom Atom ! #define t_symbol Symbol ! #define pd_new(x) newobject(x); ! #define pd_free(x) freeobject(x); ! #define t_outlet void ! #define t_binbuf void ! typedef t_class *t_pd; ! typedef float t_floatarg; #include <stdlib.h> --- 15,26 ---- #ifdef MSP ! #define t_atom Atom ! #define t_symbol Symbol ! #define pd_new(x) newobject(x); ! #define pd_free(x) freeobject(x); ! #define t_outlet void ! #define t_binbuf void ! typedef t_class *t_pd; ! typedef float t_floatarg; #include <stdlib.h> Index: vexp_if.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp_if.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vexp_if.c 6 Sep 2004 20:20:27 -0000 1.4 --- vexp_if.c 6 Nov 2004 16:07:23 -0000 1.5 *************** *** 31,36 **** * Feb 2002 - added access to variables * multiple expression support ! * new short hand forms for fexpr~ ! * now $y or $y1 = $y1[-1] and $y2 = $y2[-1] * --sdy */ --- 31,36 ---- * Feb 2002 - added access to variables * multiple expression support ! * new short hand forms for fexpr~ [...2162 lines suppressed...] ! optr->ex_int = 0; ! } ! fts_integer_vector_set_element(tw, argv->ex_int < 0 ? 0 : argv->ex_int % fts_integer_vector_get_size(tw), argv[1].ex_int); ! *optr = argv[1]; #endif } *************** *** 1210,1214 **** vsprintf(error_string, fmt, ap); */ post(fmt, ap); ! va_end(ap); /* SDY fprintf(stderr, "error: %s\n", error_string); --- 1210,1214 ---- vsprintf(error_string, fmt, ap); */ post(fmt, ap); ! va_end(ap); /* SDY fprintf(stderr, "error: %s\n", error_string); Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile 6 Sep 2004 20:20:27 -0000 1.6 --- makefile 6 Nov 2004 16:07:22 -0000 1.7 *************** *** 82,86 **** LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src --- 82,86 ---- LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch LINUXINCLUDE = -I../../src Index: vexp.h =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vexp.h 23 Sep 2003 00:18:13 -0000 1.3 --- vexp.h 6 Nov 2004 16:07:23 -0000 1.4 *************** *** 44,50 **** #ifdef MSP ! #define t_atom Atom ! #define t_symbol Symbol ! #define pd_new(x) newobject(x); #define t_outlet void #endif --- 44,50 ---- #ifdef MSP ! #define t_atom Atom ! #define t_symbol Symbol ! #define pd_new(x) newobject(x); #define t_outlet void #endif *************** *** 56,61 **** */ ! #define MAX_VARS 9 ! #define MINODES 10 /* was 200 */ /* terminal defines */ --- 56,61 ---- */ ! #define MAX_VARS 9 ! #define MINODES 10 /* was 200 */ /* terminal defines */ *************** *** 68,221 **** */ ! #define OP_SEMI ((long)(1<<16|1)) /* ; */ ! #define OP_COMMA ((long)(2<<16|2)) /* , */ ! #define OP_LOR ((long)(3<<16|3)) /* || */ ! #define OP_LAND ((long)(4<<16|4)) /* && */ ! #define OP_OR ((long)(5<<16|5)) /* | */ ! #define OP_XOR ((long)(6<<16|6)) /* ^ */ ! #define OP_AND ((long)(7<<16|7)) /* & */ ! #define OP_NE ((long)(8<<16|8)) /* != */ ! #define OP_EQ ((long)(8<<16|9)) /* == */ ! #define OP_GE ((long)(9<<16|10)) /* >= */ ! #define OP_GT ((long)(9<<16|11)) /* > */ ! #define OP_LE ((long)(9<<16|12)) /* <= */ ! #define OP_LT ((long)(9<<16|13)) /* < */ ! #define OP_SR ((long)(10<<16|14)) /* >> */ ! #define OP_SL ((long)(10<<16|15)) /* << */ ! #define OP_SUB ((long)(11<<16|16)) /* - */ ! #define OP_ADD ((long)(11<<16|17)) /* + */ ! #define OP_MOD ((long)(12<<16|18)) /* % */ ! #define OP_DIV ((long)(12<<16|19)) /* / */ ! #define OP_MUL ((long)(12<<16|20)) /* * */ ! #define OP_UMINUS ((long)(13<<16|21)) /* - unary minus */ ! #define OP_NEG ((long)(13<<16|22)) /* ~ one complement */ ! #define OP_NOT ((long)(13<<16|23)) /* ! */ ! #define OP_RB ((long)(14<<16|24)) /* ] */ ! #define OP_LB ((long)(14<<16|25)) /* [ */ ! #define OP_RP ((long)(14<<16|26)) /* ) */ ! #define OP_LP ((long)(14<<16|27)) /* ( */ ! #define OP_STORE ((long)(15<<16|28)) /* = */ ! #define HI_PRE ((long)(100<<16)) /* infinite precedence */ ! #define PRE_MASK ((long)0xffff0000) /* precedence level mask */ struct ex_ex; ! #define name_ok(c) (((c)=='_') || ((c)>='a' && (c)<='z') || \ ! ((c)>='A' && (c)<='Z') || ((c) >= '0' && (c) <= '9')) ! #define unary_op(x) ((x) == OP_NOT || (x) == OP_NEG || (x) == OP_UMINUS) struct ex_ex { ! union { ! long v_int; ! float v_flt; ! t_float *v_vec; /* this is an for allocated vector */ ! long op; ! char *ptr; ! } ex_cont; /* content */ ! #define ex_int ex_cont.v_int ! #define ex_flt ex_cont.v_flt ! #define ex_vec ex_cont.v_vec ! #define ex_op ex_cont.op ! #define ex_ptr ex_cont.ptr ! long ex_type; /* type of the node */ }; ! #define exNULL ((struct ex_ex *)0) /* defines for ex_type */ ! #define ET_INT 1 /* an int */ ! #define ET_FLT 2 /* a float */ ! #define ET_OP 3 /* operator */ ! #define ET_STR 4 /* string */ ! #define ET_TBL 5 /* a table, the content is a pointer */ ! #define ET_FUNC 6 /* a function */ ! #define ET_SYM 7 /* symbol ("string") */ ! #define ET_VSYM 8 /* variable symbol ("$s?") */ ! /* we treat parenthesis and brackets */ ! /* special to keep a pointer to their */ ! /* match in the content */ ! #define ET_LP 9 /* left parenthesis */ ! #define ET_LB 10 /* left bracket */ ! #define ET_II 11 /* and integer inlet */ ! #define ET_FI 12 /* float inlet */ ! #define ET_SI 13 /* string inlet */ ! #define ET_VI 14 /* signal inlet */ ! #define ET_VEC 15 /* allocated signal vector */ ! /* special types for fexpr~ */ ! #define ET_YO 16 /* vector output for fexpr~ */ ! #define ET_YOM1 17 /* shorthand for $y?[-1] */ ! #define ET_XI 18 /* vector input for fexpr~ */ ! #define ET_XI0 20 /* shorthand for $x?[0] */ ! #define ET_VAR 21 /* variable */ /* defines for ex_flags */ ! #define EF_TYPE_MASK 0x07 /* first three bits define the type of expr */ ! #define EF_EXPR 0x01 /* expr - control in and out */ ! #define EF_EXPR_TILDE 0x02 /* expr~ signal and control in, signal out */ ! #define EF_FEXPR_TILDE 0x04 /* fexpr~ filter expression */ ! #define EF_STOP 0x08 /* is it stopped used for expr~ and fexpr~ */ ! #define EF_VERBOSE 0x10 /* verbose mode */ ! #define IS_EXPR(x) ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR) == EF_EXPR) ! #define IS_EXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR_TILDE)==EF_EXPR_TILDE) ! #define IS_FEXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_FEXPR_TILDE)==EF_FEXPR_TILDE) ! #define SET_EXPR(x) (x)->exp_flags |= EF_EXPR; \ ! (x)->exp_flags &= ~EF_EXPR_TILDE; \ ! (x)->exp_flags &= ~EF_FEXPR_TILDE; ! #define SET_EXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ ! (x)->exp_flags |= EF_EXPR_TILDE; \ ! (x)->exp_flags &= ~EF_FEXPR_TILDE; ! #define SET_FEXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ ! (x)->exp_flags &= ~EF_EXPR_TILDE; \ ! (x)->exp_flags |= EF_FEXPR_TILDE; /* * defines for expr_error */ ! #define EE_DZ 0x01 /* divide by zero error */ ! #define EE_BI_OUTPUT 0x02 /* Bad output index */ ! #define EE_BI_INPUT 0x04 /* Bad input index */ ! #define EE_NOTABLE 0x08 /* NO TABLE */ ! #define EE_NOVAR 0x10 /* NO VARIABLE */ typedef struct expr { #ifdef PD ! t_object exp_ob; #else /* MSP */ ! t_pxobject exp_ob; #endif ! int exp_flags; /* are we expr~, fexpr~, or expr */ ! int exp_error; /* reported errors */ ! int exp_nexpr; /* number of expressions */ ! char *exp_string; /* the full expression string */ ! char *exp_str; /* current parsing position */ ! t_outlet *exp_outlet[MAX_VARS]; #ifdef PD ! struct _exprproxy *exp_proxy; #else /* MAX */ ! void *exp_proxy[MAX_VARS]; ! long exp_proxy_id; #endif ! struct ex_ex *exp_stack[MAX_VARS]; ! struct ex_ex exp_var[MAX_VARS]; ! struct ex_ex exp_res[MAX_VARS]; /* the evluation result */ ! t_float *exp_p_var[MAX_VARS]; ! t_float *exp_p_res[MAX_VARS]; /* the previous evaluation result */ ! t_float *exp_tmpres[MAX_VARS]; /* temporty result for fexpr~ */ ! int exp_vsize; /* the size of the signal vector */ ! int exp_nivec; /* # of vector inlets */ ! float exp_f; /* control value to be transformed to signal */ } t_expr; typedef struct ex_funcs { ! char *f_name; /* function name */ ! void (*f_func)(t_expr *, long, struct ex_ex *, struct ex_ex *); ! /* the real function performing the function (void, no return!!!) */ ! long f_argc; /* number of arguments */ } t_ex_func; --- 68,221 ---- */ ! #define OP_SEMI ((long)(1<<16|1)) /* ; */ ! #define OP_COMMA ((long)(2<<16|2)) /* , */ ! #define OP_LOR ((long)(3<<16|3)) /* || */ ! #define OP_LAND ((long)(4<<16|4)) /* && */ ! #define OP_OR ((long)(5<<16|5)) /* | */ ! #define OP_XOR ((long)(6<<16|6)) /* ^ */ ! #define OP_AND ((long)(7<<16|7)) /* & */ ! #define OP_NE ((long)(8<<16|8)) /* != */ ! #define OP_EQ ((long)(8<<16|9)) /* == */ ! #define OP_GE ((long)(9<<16|10)) /* >= */ ! #define OP_GT ((long)(9<<16|11)) /* > */ ! #define OP_LE ((long)(9<<16|12)) /* <= */ ! #define OP_LT ((long)(9<<16|13)) /* < */ ! #define OP_SR ((long)(10<<16|14)) /* >> */ ! #define OP_SL ((long)(10<<16|15)) /* << */ ! #define OP_SUB ((long)(11<<16|16)) /* - */ ! #define OP_ADD ((long)(11<<16|17)) /* + */ ! #define OP_MOD ((long)(12<<16|18)) /* % */ ! #define OP_DIV ((long)(12<<16|19)) /* / */ ! #define OP_MUL ((long)(12<<16|20)) /* * */ ! #define OP_UMINUS ((long)(13<<16|21)) /* - unary minus */ ! #define OP_NEG ((long)(13<<16|22)) /* ~ one complement */ ! #define OP_NOT ((long)(13<<16|23)) /* ! */ ! #define OP_RB ((long)(14<<16|24)) /* ] */ ! #define OP_LB ((long)(14<<16|25)) /* [ */ ! #define OP_RP ((long)(14<<16|26)) /* ) */ ! #define OP_LP ((long)(14<<16|27)) /* ( */ ! #define OP_STORE ((long)(15<<16|28)) /* = */ ! #define HI_PRE ((long)(100<<16)) /* infinite precedence */ ! #define PRE_MASK ((long)0xffff0000) /* precedence level mask */ struct ex_ex; ! #define name_ok(c) (((c)=='_') || ((c)>='a' && (c)<='z') || \ ! ((c)>='A' && (c)<='Z') || ((c) >= '0' && (c) <= '9')) ! #define unary_op(x) ((x) == OP_NOT || (x) == OP_NEG || (x) == OP_UMINUS) struct ex_ex { ! union { ! long v_int; ! float v_flt; ! t_float *v_vec; /* this is an for allocated vector */ ! long op; ! char *ptr; ! } ex_cont; /* content */ ! #define ex_int ex_cont.v_int ! #define ex_flt ex_cont.v_flt ! #define ex_vec ex_cont.v_vec ! #define ex_op ex_cont.op ! #define ex_ptr ex_cont.ptr ! long ex_type; /* type of the node */ }; ! #define exNULL ((struct ex_ex *)0) /* defines for ex_type */ ! #define ET_INT 1 /* an int */ ! #define ET_FLT 2 /* a float */ ! #define ET_OP 3 /* operator */ ! #define ET_STR 4 /* string */ ! #define ET_TBL 5 /* a table, the content is a pointer */ ! #define ET_FUNC 6 /* a function */ ! #define ET_SYM 7 /* symbol ("string") */ ! #define ET_VSYM 8 /* variable symbol ("$s?") */ ! /* we treat parenthesis and brackets */ ! /* special to keep a pointer to their */ ! /* match in the content */ ! #define ET_LP 9 /* left parenthesis */ ! #define ET_LB 10 /* left bracket */ ! #define ET_II 11 /* and integer inlet */ ! #define ET_FI 12 /* float inlet */ ! #define ET_SI 13 /* string inlet */ ! #define ET_VI 14 /* signal inlet */ ! #define ET_VEC 15 /* allocated signal vector */ ! /* special types for fexpr~ */ ! #define ET_YO 16 /* vector output for fexpr~ */ ! #define ET_YOM1 17 /* shorthand for $y?[-1] */ ! #define ET_XI 18 /* vector input for fexpr~ */ ! #define ET_XI0 20 /* shorthand for $x?[0] */ ! #define ET_VAR 21 /* variable */ /* defines for ex_flags */ ! #define EF_TYPE_MASK 0x07 /* first three bits define the type of expr */ ! #define EF_EXPR 0x01 /* expr - control in and out */ ! #define EF_EXPR_TILDE 0x02 /* expr~ signal and control in, signal out */ ! #define EF_FEXPR_TILDE 0x04 /* fexpr~ filter expression */ ! #define EF_STOP 0x08 /* is it stopped used for expr~ and fexpr~ */ ! #define EF_VERBOSE 0x10 /* verbose mode */ ! #define IS_EXPR(x) ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR) == EF_EXPR) ! #define IS_EXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR_TILDE)==EF_EXPR_TILDE) ! #define IS_FEXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_FEXPR_TILDE)==EF_FEXPR_TILDE) ! #define SET_EXPR(x) (x)->exp_flags |= EF_EXPR; \ ! (x)->exp_flags &= ~EF_EXPR_TILDE; \ ! (x)->exp_flags &= ~EF_FEXPR_TILDE; ! #define SET_EXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ ! (x)->exp_flags |= EF_EXPR_TILDE; \ ! (x)->exp_flags &= ~EF_FEXPR_TILDE; ! #define SET_FEXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ ! (x)->exp_flags &= ~EF_EXPR_TILDE; \ ! (x)->exp_flags |= EF_FEXPR_TILDE; /* * defines for expr_error */ ! #define EE_DZ 0x01 /* divide by zero error */ ! #define EE_BI_OUTPUT 0x02 /* Bad output index */ ! #define EE_BI_INPUT 0x04 /* Bad input index */ ! #define EE_NOTABLE 0x08 /* NO TABLE */ ! #define EE_NOVAR 0x10 /* NO VARIABLE */ typedef struct expr { #ifdef PD ! t_object exp_ob; #else /* MSP */ ! t_pxobject exp_ob; #endif ! int exp_flags; /* are we expr~, fexpr~, or expr */ ! int exp_error; /* reported errors */ ! int exp_nexpr; /* number of expressions */ ! char *exp_string; /* the full expression string */ ! char *exp_str; /* current parsing position */ ! t_outlet *exp_outlet[MAX_VARS]; #ifdef PD ! struct _exprproxy *exp_proxy; #else /* MAX */ ! void *exp_proxy[MAX_VARS]; ! long exp_proxy_id; #endif ! struct ex_ex *exp_stack[MAX_VARS]; ! struct ex_ex exp_var[MAX_VARS]; ! struct ex_ex exp_res[MAX_VARS]; /* the evluation result */ ! t_float *exp_p_var[MAX_VARS]; ! t_float *exp_p_res[MAX_VARS]; /* the previous evaluation result */ ! t_float *exp_tmpres[MAX_VARS]; /* temporty result for fexpr~ */ ! int exp_vsize; /* the size of the signal vector */ ! int exp_nivec; /* # of vector inlets */ ! float exp_f; /* control value to be transformed to signal */ } t_expr; typedef struct ex_funcs { ! char *f_name; /* function name */ ! void (*f_func)(t_expr *, long, struct ex_ex *, struct ex_ex *); ! /* the real function performing the function (void, no return!!!) */ ! long f_argc; /* number of arguments */ } t_ex_func; *************** *** 228,237 **** void ex_mkvector(t_float *fp, t_float x, int size); extern void ex_size(t_expr *expr, long int argc, struct ex_ex *argv, ! struct ex_ex *optr); ! extern void ex_sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_Sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_Avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_store(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); int value_getonly(t_symbol *s, t_float *f); --- 228,237 ---- void ex_mkvector(t_float *fp, t_float x, int size); extern void ex_size(t_expr *expr, long int argc, struct ex_ex *argv, ! struct ex_ex *optr); ! extern void ex_sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_Sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_Avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); ! extern void ex_store(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); int value_getonly(t_symbol *s, t_float *f);

1 0

pd/doc/7.stuff/tools testtone.pd,1.4,1.5
by Miller Puckette 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/doc/7.stuff/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/pd/doc/7.stuff/tools Modified Files: testtone.pd Log Message: 0.38 test 9 (mostly bug fixes) Index: testtone.pd =================================================================== RCS file: /cvsroot/pure-data/pd/doc/7.stuff/tools/testtone.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testtone.pd 6 Sep 2004 20:20:26 -0000 1.4 --- testtone.pd 6 Nov 2004 16:07:21 -0000 1.5 *************** *** 57,61 **** #X restore 236 308 pd midi; #X floatatom 139 185 3 0 0 0 - - -; ! #X floatatom 172 185 3 0 0 0 - - -; #X text 24 341 PD is COPYRIGHT 1997-2002 by Miller Puckette and others but is free for you to use for any reasonable purpose. See the file --- 57,61 ---- #X restore 236 308 pd midi; #X floatatom 139 185 3 0 0 0 - - -; ! #X floatatom 171 185 3 0 0 0 - - -; #X text 24 341 PD is COPYRIGHT 1997-2002 by Miller Puckette and others but is free for you to use for any reasonable purpose. See the file *************** *** 101,115 **** #X obj 260 117 tgl 20 0 tone-ch6 tone-ch6 6 5 -8 0 12 -262144 -1 -1 1 1; ! #X obj 294 108 bng 15 250 50 0 tone-all empty ALL 20 8 0 12 -262144 -1 -1; ! #X obj 294 129 bng 15 250 50 0 tone-none empty NONE 20 8 0 12 -262144 -1 -1; ! #X floatatom 205 185 3 0 0 0 - - -; ! #X floatatom 238 185 3 0 0 0 - - -; ! #X floatatom 271 186 3 0 0 0 - - -; ! #X floatatom 305 186 3 0 0 0 - - -; #X text 154 210 AUDIO INPUT (RMS dB); #X text 45 62 TEST; ! #N canvas 162 353 903 462 -------audio---- 0; #X obj 186 95 hip~ 5; #X obj 194 172 outlet; --- 101,127 ---- #X obj 260 117 tgl 20 0 tone-ch6 tone-ch6 6 5 -8 0 12 -262144 -1 -1 1 1; ! #X obj 331 108 bng 15 250 50 0 tone-all empty ALL 20 8 0 12 -262144 -1 -1; ! #X obj 331 129 bng 15 250 50 0 tone-none empty NONE 20 8 0 12 -262144 -1 -1; ! #X floatatom 204 185 3 0 0 0 - - -; ! #X floatatom 237 185 3 0 0 0 - - -; ! #X floatatom 269 186 3 0 0 0 - - -; ! #X floatatom 302 186 3 0 0 0 - - -; #X text 154 210 AUDIO INPUT (RMS dB); #X text 45 62 TEST; ! #X text 72 174 noise; ! #X text 71 191 tone; ! #X text 44 80 SIGNAL; ! #X text 131 78 test signal channels:; ! #X obj 52 174 vradio 15 1 0 2 tone-type tone-type-set empty 0 -6 0 ! 8 -262144 -1 -1 1; ! #X obj 51 104 vradio 15 1 0 3 tone-radio tone-radio-set empty 0 -6 ! 0 8 -262144 -1 -1 2; ! #X obj 379 220 adc~; ! #X obj 379 256 print~; ! #X obj 438 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #N canvas 162 353 903 462 -------audio----------- 0; #X obj 186 95 hip~ 5; #X obj 194 172 outlet; *************** *** 285,288 **** --- 297,330 ---- #X connect 28 0 16 0; #X restore 24 68 pd tone-generator; + #X obj 899 96 hip~ 5; + #X obj 907 173 outlet; + #X obj 907 147 int; + #X obj 907 121 env~ 8192; + #X obj 909 196 r~ tone-mon; + #X obj 918 331 line~; + #X obj 899 221 *~; + #X obj 918 304 pack 0 50; + #X obj 909 251 r~ tone-osc; + #X obj 909 356 *~; + #X obj 899 386 +~; + #X obj 907 69 r tone-hip; + #X obj 1019 95 hip~ 5; + #X obj 1027 172 outlet; + #X obj 1027 146 int; + #X obj 1027 120 env~ 8192; + #X obj 1029 195 r~ tone-mon; + #X obj 1038 330 line~; + #X obj 1019 220 *~; + #X obj 1038 303 pack 0 50; + #X obj 1029 250 r~ tone-osc; + #X obj 1029 355 *~; + #X obj 1019 385 +~; + #X obj 1027 68 r tone-hip; + #X obj 918 278 r tone-ch5; + #X obj 1038 277 r tone-ch6; + #X obj 899 43 adc~ 7; + #X obj 1019 42 adc~ 8; + #X obj 899 411 dac~ 7; + #X obj 1019 410 dac~ 8; #X connect 0 0 7 0; #X connect 0 0 3 0; *************** *** 374,390 **** #X connect 92 0 69 0; #X connect 93 0 81 0; ! #X restore 139 159 pd -------audio----; ! #X text 72 174 noise; ! #X text 71 191 tone; ! #X text 44 80 SIGNAL; ! #X text 131 78 test signal channels:; ! #X obj 52 174 vradio 15 1 0 2 tone-type tone-type-set empty 0 -6 0 ! 8 -262144 -1 -1 1; ! #X obj 51 104 vradio 15 1 0 3 tone-radio tone-radio-set empty 0 -6 ! 0 8 -262144 -1 -1 2; ! #X obj 379 220 adc~; ! #X obj 379 256 print~; ! #X obj 438 227 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; #X connect 1 0 2 0; #X connect 1 1 2 1; --- 416,454 ---- #X connect 92 0 69 0; #X connect 93 0 81 0; ! #X connect 99 0 105 0; ! #X connect 99 0 102 0; ! #X connect 101 0 100 0; ! #X connect 102 0 101 0; ! #X connect 103 0 105 1; ! #X connect 104 0 108 1; ! #X connect 105 0 109 0; ! #X connect 106 0 104 0; ! #X connect 107 0 108 0; ! #X connect 108 0 109 1; ! #X connect 109 0 127 0; ! #X connect 110 0 99 1; ! #X connect 111 0 117 0; ! #X connect 111 0 114 0; ! #X connect 113 0 112 0; ! #X connect 114 0 113 0; ! #X connect 115 0 117 1; ! #X connect 116 0 120 1; ! #X connect 117 0 121 0; ! #X connect 118 0 116 0; ! #X connect 119 0 120 0; ! #X connect 120 0 121 1; ! #X connect 121 0 128 0; ! #X connect 122 0 111 1; ! #X connect 123 0 106 0; ! #X connect 124 0 118 0; ! #X connect 125 0 99 0; ! #X connect 126 0 111 0; ! #X restore 139 159 pd -------audio-----------; ! #X floatatom 335 186 3 0 0 0 - - -; ! #X floatatom 368 186 3 0 0 0 - - -; ! #X obj 283 117 tgl 20 0 tone-ch7 tone-ch7 7 5 -8 0 12 -262144 -1 -1 ! 0 1; ! #X obj 308 117 tgl 20 0 tone-ch8 tone-ch8 8 5 -8 0 12 -262144 -1 -1 ! 0 1; #X connect 1 0 2 0; #X connect 1 1 2 1; *************** *** 394,403 **** #X connect 9 1 7 0; #X connect 16 0 10 0; ! #X connect 35 0 11 0; ! #X connect 35 1 12 0; ! #X connect 35 2 29 0; ! #X connect 35 3 30 0; ! #X connect 35 4 31 0; ! #X connect 35 5 32 0; ! #X connect 42 0 43 0; ! #X connect 44 0 43 0; --- 458,469 ---- #X connect 9 1 7 0; #X connect 16 0 10 0; ! #X connect 41 0 42 0; ! #X connect 43 0 42 0; ! #X connect 44 0 11 0; ! #X connect 44 1 12 0; ! #X connect 44 2 29 0; ! #X connect 44 3 30 0; ! #X connect 44 4 31 0; ! #X connect 44 5 32 0; ! #X connect 44 6 45 0; ! #X connect 44 7 46 0;

1 0

pd/extra/choice choice.c,1.1.1.1,1.2
by Miller Puckette 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/extra/choice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/pd/extra/choice Modified Files: choice.c Log Message: 0.38 test 9 (mostly bug fixes) Index: choice.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/choice/choice.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** choice.c 29 Jul 2002 17:06:16 -0000 1.1.1.1 --- choice.c 6 Nov 2004 16:07:22 -0000 1.2 *************** *** 51,60 **** for (j = 0; j < x->x_n; j++) { ! t_elem *e = x->x_vec + j; ! t_float *w = e->e_weight; ! post("%2d age %2d \ w %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f", ! j, (int)(e->e_age), w[0], w[1], w[2], w[3], w[4], w[5], ! w[6], w[7], w[8], w[9]); } } --- 51,60 ---- for (j = 0; j < x->x_n; j++) { ! t_elem *e = x->x_vec + j; ! t_float *w = e->e_weight; ! post("%2d age %2d \ w %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f", ! j, (int)(e->e_age), w[0], w[1], w[2], w[3], w[4], w[5], ! w[6], w[7], w[8], w[9]); } } *************** *** 66,70 **** float sum, normal; x->x_vec = (t_elem *)resizebytes(x->x_vec, oldn * sizeof(t_elem), ! newn * sizeof(t_elem)); x->x_n = newn; e = x->x_vec + oldn; --- 66,70 ---- float sum, normal; x->x_vec = (t_elem *)resizebytes(x->x_vec, oldn * sizeof(t_elem), ! newn * sizeof(t_elem)); x->x_n = newn; e = x->x_vec + oldn; *************** *** 73,83 **** for (i = 0, sum = 0; i < DIMENSION; i++) { ! float f = atom_getfloatarg(i, argc, argv); ! e->e_weight[i] = f; ! sum += f*f; } normal = (float)(sum > 0 ? 1./sqrt(sum) : 1); for (i = 0; i < DIMENSION; i++) ! e->e_weight[i] *= normal; } --- 73,83 ---- for (i = 0, sum = 0; i < DIMENSION; i++) { ! float f = atom_getfloatarg(i, argc, argv); ! e->e_weight[i] = f; ! sum += f*f; } normal = (float)(sum > 0 ? 1./sqrt(sum) : 1); for (i = 0; i < DIMENSION; i++) ! e->e_weight[i] *= normal; } *************** *** 89,112 **** t_float invec[DIMENSION]; for (i = 0; i < DIMENSION; i++) ! invec[i] = atom_getfloatarg(i, argc, argv); for (j = 0; j < x->x_n; j++) { ! t_elem *e = x->x_vec + j; ! float sum; ! for (i = 0, sum = 0; i < DIMENSION; i++) ! sum += e->e_weight[i] * invec[i]; ! if (x->x_nonrepeat) sum *= (float)(log(e->e_age)); ! if (sum > bestsum) ! { ! bestsum = sum; ! sum = 1; ! bestindex = j; ! } } if (bestindex >= 0) { ! for (j = 0; j < x->x_n; j++) ! x->x_vec[j].e_age += 1.; ! x->x_vec[bestindex].e_age = 1; } outlet_float(x->x_obj.ob_outlet, (float)bestindex); --- 89,112 ---- t_float invec[DIMENSION]; for (i = 0; i < DIMENSION; i++) ! invec[i] = atom_getfloatarg(i, argc, argv); for (j = 0; j < x->x_n; j++) { ! t_elem *e = x->x_vec + j; ! float sum; ! for (i = 0, sum = 0; i < DIMENSION; i++) ! sum += e->e_weight[i] * invec[i]; ! if (x->x_nonrepeat) sum *= (float)(log(e->e_age)); ! if (sum > bestsum) ! { ! bestsum = sum; ! sum = 1; ! bestindex = j; ! } } if (bestindex >= 0) { ! for (j = 0; j < x->x_n; j++) ! x->x_vec[j].e_age += 1.; ! x->x_vec[bestindex].e_age = 1; } outlet_float(x->x_obj.ob_outlet, (float)bestindex); *************** *** 121,125 **** { choice_class = class_new(gensym("choice"), (t_newmethod)choice_new, ! (t_method)choice_free, sizeof(t_choice), 0, A_DEFFLOAT, 0); class_addmethod(choice_class, (t_method)choice_add, gensym("add"), A_GIMME, 0); class_addmethod(choice_class, (t_method)choice_clear, gensym("clear"), 0); --- 121,125 ---- { choice_class = class_new(gensym("choice"), (t_newmethod)choice_new, ! (t_method)choice_free, sizeof(t_choice), 0, A_DEFFLOAT, 0); class_addmethod(choice_class, (t_method)choice_add, gensym("add"), A_GIMME, 0); class_addmethod(choice_class, (t_method)choice_clear, gensym("clear"), 0);

1 0

pd/extra/bonk~ bonk~.c,1.2,1.3
by Miller Puckette 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/extra/bonk~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/pd/extra/bonk~ Modified Files: bonk~.c Log Message: 0.38 test 9 (mostly bug fixes) Index: bonk~.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/bonk~/bonk~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bonk~.c 8 Aug 2002 16:42:29 -0000 1.2 --- bonk~.c 6 Nov 2004 16:07:22 -0000 1.3 *************** *** 20,29 **** #include "z_dsp.h" #include "math.h" - //#include "stdio.h" #include "ext_support.h" - //#include "ext_strings.h" #include "ext_proto.h" ! typedef double t_floatarg; // from m_pd.h #define flog log #define fexp exp [...1456 lines suppressed...] } void bonk_assist(t_bonk *x, void *b, long m, long a, char *s) { ! assist_string(3747,m,a,1,2,s); } *************** *** 1078,1082 **** float qrsqrt(float f) { ! return 1/sqrt(f); } --- 1072,1076 ---- float qrsqrt(float f) { ! return 1/sqrt(f); }

1 0

pd/doc/5.reference help-spigot.pd,1.1.1.1,1.2
by Miller Puckette 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/doc/5.reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/pd/doc/5.reference Modified Files: help-spigot.pd Log Message: 0.38 test 9 (mostly bug fixes) Index: help-spigot.pd =================================================================== RCS file: /cvsroot/pure-data/pd/doc/5.reference/help-spigot.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** help-spigot.pd 9 May 2003 16:03:49 -0000 1.1.1.1 --- help-spigot.pd 6 Nov 2004 16:07:21 -0000 1.2 *************** *** 1,21 **** ! #N canvas 349 223 586 335 12; ! #X msg 25 157 0.5 1000; ! #X floatatom 74 242 1 0 0; ! #X obj 25 267 spigot; ! #X obj 25 300 print; ! #X msg 38 210 walk the cat; ! #X msg 31 182 bang; #X obj 35 11 spigot; #X text 100 12 - pass or block messages; - #X text 99 242 control: nonzero to pass messages \, zero to stop them - ; - #X text 333 303 updated for Pd version 0.33; #X text 35 63 Spigot passes messages from its left inlet to its outlet \, as long as a nonzero number is sent to its right inlet. When its right inlet gets zero \, incoming messages are "blocked \, " i.e. \, ignored.; ! #X connect 0 0 2 0; ! #X connect 1 0 2 1; ! #X connect 2 0 3 0; ! #X connect 4 0 2 0; ! #X connect 5 0 2 0; --- 1,25 ---- ! #N canvas 59 19 612 342 12; #X obj 35 11 spigot; #X text 100 12 - pass or block messages; #X text 35 63 Spigot passes messages from its left inlet to its outlet \, as long as a nonzero number is sent to its right inlet. When its right inlet gets zero \, incoming messages are "blocked \, " i.e. \, ignored.; ! #X msg 25 157 0.5 1000; ! #X obj 25 300 print; ! #X msg 38 210 walk the cat; ! #X msg 31 182 bang; ! #X text 128 240 control: nonzero to pass messages \, zero to stop them ! ; ! #X obj 25 267 spigot 0; ! #X text 349 310 updated for Pd version 0.38; ! #X obj 92 244 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X text 450 267; ! #X text 125 267 optional arg sets the initial state (0 by default) ! ; ! #X connect 3 0 8 0; ! #X connect 5 0 8 0; ! #X connect 6 0 8 0; ! #X connect 8 0 4 0; ! #X connect 10 0 8 1;

1 0

pd/src s_audio_asio.cpp,1.1.4.1,1.1.4.2
by Tim Blechmann 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1114 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: some improvements Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** s_audio_asio.cpp 5 Nov 2004 13:33:19 -0000 1.1.4.1 --- s_audio_asio.cpp 6 Nov 2004 15:22:54 -0000 1.1.4.2 *************** *** 24,27 **** --- 24,34 ---- #include "stdio.h" /* for sprintf */ + /* fast float to integer conversion adapted from Erik de Castro Lopo */ + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC9X 1 + #define __USE_ISOC99 1 + #include "math.h" + #define ASIODEBUG *************** *** 43,53 **** ASIOBool directprocess); ! /* sample converting helper functions: ! * - global send / receive functions ! * - sample conversion functions (adapted from ASIOConvertSamples.cpp */ ! void asio_convert_and_send (t_sample* source, void* dest, ! ASIOSampleType format, long asio_bufsize); ! void asio_convert_and_receive (void* source, t_sample* dest, ! ASIOSampleType format, long asio_bufsize); void float32toInt16(float* inbuffer, void* outbuffer, long frames); void Int16tofloat32(void* inbuffer, float* outbuffer, long frames); --- 50,54 ---- ASIOBool directprocess); ! void float32copy(float* inbuffer, float* outbuffer, long frames); void float32toInt16(float* inbuffer, void* outbuffer, long frames); void Int16tofloat32(void* inbuffer, float* outbuffer, long frames); *************** *** 56,59 **** --- 57,84 ---- void float32toInt32(float* inbuffer, void* outbuffer, long frames); void Int32tofloat32(void* inbuffer, float* outbuffer, long frames); + void float32toInt16_S(float* inbuffer, void* outbuffer, long frames); + void Int16tofloat32_S(void* inbuffer, float* outbuffer, long frames); + void float32toInt24_S(float* inbuffer, void* outbuffer, long frames); + void Int24tofloat32_S(void* inbuffer, float* outbuffer, long frames); + void float32toInt32_S(float* inbuffer, void* outbuffer, long frames); + void Int32tofloat32_S(void* inbuffer, float* outbuffer, long frames); + + /* Swap LSB to MSB and vice versa */ + #define SwapLong(v) ((((v)>>24)&0xFF)|(((v)>>8)&0xFF00)|(((v)&0xFF00)<<8)|(((v)&0xFF)<<24)) ; + #define SwapShort(v) ((((v)>>8)&0xFF)|(((v)&0xFF)<<8)) ; + + typedef void converter_out_t(float* inbuffer, void* outbuffer, long frames); + typedef void converter_in_t(void* inbuffer, float* outbuffer, long frames); + + /* sample converting helper functions: + * - global send / receive functions + * - sample conversion functions (adapted from ASIOConvertSamples.cpp */ + void *asio_converter_send (ASIOSampleType format); + void *asio_converter_receive (ASIOSampleType format); + + /* pointers to the converter functions of each channel are stored here */ + static void **asio_converter = NULL; + + /* some local helper functions */ *************** *** 267,277 **** } ! for (i = 0; i != sys_inchannels + sys_outchannels; ++i) { asio_channelinfo[i].channel = asio_bufferinfo[i].channelNum; asio_channelinfo[i].isInput = asio_bufferinfo[i].isInput; ASIOGetChannelInfo(&asio_channelinfo[i]); - } /* get latencies */ --- 292,308 ---- } ! asio_converter = (void **)getbytes(channels * sizeof (void *)); ! ! for (i = 0; i != sys_outchannels + sys_inchannels; ++i) { asio_channelinfo[i].channel = asio_bufferinfo[i].channelNum; asio_channelinfo[i].isInput = asio_bufferinfo[i].isInput; ASIOGetChannelInfo(&asio_channelinfo[i]); + if (i < sys_outchannels) + asio_converter[i] = asio_converter_send(asio_channelinfo[i].type); + else + asio_converter[i] = asio_converter_receive(asio_channelinfo[i].type); + } /* get latencies */ *************** *** 330,334 **** { ASIOError status; ! int channels = asio_inchannels + asio_outchannels; int i; --- 361,365 ---- { ASIOError status; ! int channels = sys_inchannels + sys_outchannels; int i; *************** *** 350,353 **** --- 381,387 ---- asio_channelinfo = NULL; + if(asio_converter) freebytes(asio_converter, channels * sizeof (void *)); + asio_converter = NULL; + ASIOExit(); freebytes(asio_driver, sizeof (ASIODriverInfo)); *************** *** 482,500 **** * todo: improve input latency */ ! for (i = 0; i < asio_outchannels + asio_inchannels; i++) { if (asio_bufferinfo[i].isInput != ASIOTrue) { ! asio_convert_and_send(asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! (void*) asio_bufferinfo[i].buffers[db_idx], ! asio_channelinfo[i].type, asio_bufsize); } else /* these are the input channels */ { ! asio_convert_and_receive((void*)asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_channelinfo[i].type, asio_bufsize); } - } pthread_cond_broadcast(&asio_ringbuf_cond); --- 516,535 ---- * todo: improve input latency */ ! ! for (i = 0; i < sys_outchannels + sys_inchannels; i++) { + if(asio_converter[i]) if (asio_bufferinfo[i].isInput != ASIOTrue) { ! ((converter_out_t *)asio_converter[i])(asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! (void*) asio_bufferinfo[i].buffers[db_idx], ! asio_bufsize); } else /* these are the input channels */ { ! ((converter_in_t *)asio_converter[i])((void*)asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufsize); } } pthread_cond_broadcast(&asio_ringbuf_cond); *************** *** 524,528 **** /* sample converting helper functions */ ! void asio_convert_and_send(t_sample* source, void* dest, ASIOSampleType format, long bufsize) { --- 559,563 ---- /* sample converting helper functions */ ! void *asio_converter_send(ASIOSampleType format) { *************** *** 533,548 **** { case ASIOSTInt16LSB: ! /* e.g. m audio quattro */ ! float32toInt16(source, dest, bufsize); ! break; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! memcpy (dest, source, bufsize * sizeof (float)); /* check */ ! break; case ASIOSTInt24LSB: // used for 20 bits as well ! float32toInt24(source, dest, bufsize); ! break; case ASIOSTInt32LSB: ! float32toInt32(source, dest, bufsize); ! break; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 568,585 ---- { case ASIOSTInt16LSB: ! return float32toInt16; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! return float32copy; case ASIOSTInt24LSB: // used for 20 bits as well ! return float32toInt24; case ASIOSTInt32LSB: ! return float32toInt32; ! ! case ASIOSTInt16MSB: ! return float32toInt16_S; ! case ASIOSTInt24MSB: // used for 20 bits as well ! return float32toInt24_S; ! case ASIOSTInt32MSB: ! return float32toInt32_S; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture *************** *** 555,564 **** case ASIOSTInt32LSB24: // 32 bit data with 24 bit alignment - case ASIOSTInt16MSB: - - case ASIOSTInt24MSB: // used for 20 bits as well - - case ASIOSTInt32MSB: - case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture --- 592,595 ---- *************** *** 570,584 **** case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! { ! static int written = 0; ! if(written < 3) { ! post("Output sample Type %d not supported, yet!!!",format); ! ++written; ! } ! } } } ! void asio_convert_and_receive (void* source, t_sample* dest, ASIOSampleType format, long bufsize) { #ifdef ASIODEBUG --- 601,611 ---- case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! default: ! post("Output sample Type %d not supported, yet!!!",format); ! return NULL; } } ! void *asio_converter_receive (ASIOSampleType format) { #ifdef ASIODEBUG *************** *** 589,603 **** { case ASIOSTInt16LSB: ! Int16tofloat32(source, dest, bufsize); ! break; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! memcpy (dest, source, bufsize * sizeof (float)); /* check */ ! break; case ASIOSTInt24LSB: // used for 20 bits as well ! Int24tofloat32(source, dest, bufsize); ! break; case ASIOSTInt32LSB: ! Int32tofloat32(source, dest, bufsize); ! break; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 616,633 ---- { case ASIOSTInt16LSB: ! return Int16tofloat32; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! return float32copy; case ASIOSTInt24LSB: // used for 20 bits as well ! return Int24tofloat32; case ASIOSTInt32LSB: ! return Int32tofloat32; ! ! case ASIOSTInt16MSB: ! return Int16tofloat32_S; ! case ASIOSTInt24MSB: // used for 20 bits as well ! return Int24tofloat32_S; ! case ASIOSTInt32MSB: ! return Int32tofloat32_S; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture *************** *** 610,616 **** case ASIOSTInt32LSB24: // 32 bit data with 24 bit alignment - case ASIOSTInt16MSB: - case ASIOSTInt24MSB: // used for 20 bits as well - case ASIOSTInt32MSB: case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture case ASIOSTFloat64MSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 640,643 ---- *************** *** 622,632 **** case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! { ! static int written = 0; ! if(written < 3) { post("Input sample Type %d not supported, yet!!!",format); ! ++written; ! } ! } } --- 649,655 ---- case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! default: post("Input sample Type %d not supported, yet!!!",format); ! return NULL; } *************** *** 639,642 **** --- 662,670 ---- #define SCALE_INT32 2147483647.f /* (- (expt 2 31) 1) */ + void float32copy(float* inbuffer, float* outbuffer, long frames) + { + memcpy (outbuffer, inbuffer, frames* sizeof (float)); /* check */ + } + void float32toInt16(float* inbuffer, void* outbuffer, long frames) { *************** *** 644,648 **** while (frames--) { ! *out++ = (short)(*inbuffer++ * SCALE_INT16); } } --- 672,687 ---- while (frames--) { ! float o = (*inbuffer++ * SCALE_INT16); ! #ifdef __GNUC__ ! *out++ = (short)lrintf(o); ! #else ! short srt; ! __asm ! { ! fld o ! fistp srt ! }; ! *out++ = srt; ! #endif } } *************** *** 662,666 **** while (frames--) { ! *out++ = (int)(*inbuffer * SCALE_INT24); } } --- 701,716 ---- while (frames--) { ! float o = (*inbuffer * SCALE_INT24); ! #ifdef __GNUC__ ! *out++ = (int)lrintf(o); ! #else ! int intg; ! __asm ! { ! fld o ! fistp intg ! }; ! *out++ = intg; ! #endif } } *************** *** 680,684 **** while (frames--) { ! *out++ = (long)(*inbuffer * SCALE_INT32); } } --- 730,745 ---- while (frames--) { ! float o = (*inbuffer * SCALE_INT32); ! #ifdef __GNUC__ ! *out++ = lrintf(o); ! #else ! long lng; ! __asm ! { ! fld o ! fistp lng ! }; ! *out++ = lng; ! #endif } } *************** *** 693,696 **** --- 754,869 ---- } + void float32toInt16_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + float o = (*inbuffer++ * SCALE_INT16); + #ifdef __GNUC__ + short reverse = (short)lrintf(o); + #else + short reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[1] = ((char *)&reverse)[0]; + out[0] = ((char *)&reverse)[1]; + out += 2; + } + } + + void Int16tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + short d; + while (frames--) + { + ((char *)&d)[0] = in[1]; + ((char *)&d)[1] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT16)); + in += 2; + } + } + + void float32toInt24_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + int o = (*inbuffer * SCALE_INT24); + #ifdef __GNUC__ + int reverse = (int)lrintf(o); + #else + int reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[2] = ((char *)&reverse)[0]; + out[1] = ((char *)&reverse)[1]; + out[0] = ((char *)&reverse)[2]; + out += 3; + } + } + + void Int24tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + long d = 0; + while (frames--) + { + ((char *)&d)[1] = in[2]; + ((char *)&d)[2] = in[1]; + ((char *)&d)[3] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT24)); + in += 3; + } + } + + void float32toInt32_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + float o = (*inbuffer * SCALE_INT32); + #ifdef __GNUC__ + long reverse = (long)lrintf(o); + #else + long reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[3] = ((char *)&reverse)[0]; + out[2] = ((char *)&reverse)[1]; + out[1] = ((char *)&reverse)[2]; + out[0] = ((char *)&reverse)[3]; + out += 4; + } + } + + void Int32tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + long d; + while (frames--) + { + ((char *)&d)[0] = in[3]; + ((char *)&d)[1] = in[2]; + ((char *)&d)[2] = in[1]; + ((char *)&d)[3] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT32)); + in += 3; + } + } + + /* some local helper functions */ inline void prepare_asio_drivernames(void)

1 0

pd/src s_audio_asio.cpp,1.1.2.3,1.1.2.4
by Tim Blechmann 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv935 Modified Files: Tag: devel_0_37 s_audio_asio.cpp Log Message: some improvements Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** s_audio_asio.cpp 4 Nov 2004 23:28:25 -0000 1.1.2.3 --- s_audio_asio.cpp 6 Nov 2004 15:22:38 -0000 1.1.2.4 *************** *** 24,27 **** --- 24,34 ---- #include "stdio.h" /* for sprintf */ + /* fast float to integer conversion adapted from Erik de Castro Lopo */ + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 + #define __USE_ISOC9X 1 + #define __USE_ISOC99 1 + #include "math.h" + #define ASIODEBUG *************** *** 43,53 **** ASIOBool directprocess); ! /* sample converting helper functions: ! * - global send / receive functions ! * - sample conversion functions (adapted from ASIOConvertSamples.cpp */ ! void asio_convert_and_send (t_sample* source, void* dest, ! ASIOSampleType format, long asio_bufsize); ! void asio_convert_and_receive (void* source, t_sample* dest, ! ASIOSampleType format, long asio_bufsize); void float32toInt16(float* inbuffer, void* outbuffer, long frames); void Int16tofloat32(void* inbuffer, float* outbuffer, long frames); --- 50,54 ---- ASIOBool directprocess); ! void float32copy(float* inbuffer, float* outbuffer, long frames); void float32toInt16(float* inbuffer, void* outbuffer, long frames); void Int16tofloat32(void* inbuffer, float* outbuffer, long frames); *************** *** 56,59 **** --- 57,84 ---- void float32toInt32(float* inbuffer, void* outbuffer, long frames); void Int32tofloat32(void* inbuffer, float* outbuffer, long frames); + void float32toInt16_S(float* inbuffer, void* outbuffer, long frames); + void Int16tofloat32_S(void* inbuffer, float* outbuffer, long frames); + void float32toInt24_S(float* inbuffer, void* outbuffer, long frames); + void Int24tofloat32_S(void* inbuffer, float* outbuffer, long frames); + void float32toInt32_S(float* inbuffer, void* outbuffer, long frames); + void Int32tofloat32_S(void* inbuffer, float* outbuffer, long frames); + + /* Swap LSB to MSB and vice versa */ + #define SwapLong(v) ((((v)>>24)&0xFF)|(((v)>>8)&0xFF00)|(((v)&0xFF00)<<8)|(((v)&0xFF)<<24)) ; + #define SwapShort(v) ((((v)>>8)&0xFF)|(((v)&0xFF)<<8)) ; + + typedef void converter_out_t(float* inbuffer, void* outbuffer, long frames); + typedef void converter_in_t(void* inbuffer, float* outbuffer, long frames); + + /* sample converting helper functions: + * - global send / receive functions + * - sample conversion functions (adapted from ASIOConvertSamples.cpp */ + void *asio_converter_send (ASIOSampleType format); + void *asio_converter_receive (ASIOSampleType format); + + /* pointers to the converter functions of each channel are stored here */ + static void **asio_converter = NULL; + + /* some local helper functions */ *************** *** 267,277 **** } ! for (i = 0; i != sys_inchannels + sys_outchannels; ++i) { asio_channelinfo[i].channel = asio_bufferinfo[i].channelNum; asio_channelinfo[i].isInput = asio_bufferinfo[i].isInput; ASIOGetChannelInfo(&asio_channelinfo[i]); - } /* get latencies */ --- 292,308 ---- } ! asio_converter = (void **)getbytes(channels * sizeof (void *)); ! ! for (i = 0; i != sys_outchannels + sys_inchannels; ++i) { asio_channelinfo[i].channel = asio_bufferinfo[i].channelNum; asio_channelinfo[i].isInput = asio_bufferinfo[i].isInput; ASIOGetChannelInfo(&asio_channelinfo[i]); + if (i < sys_outchannels) + asio_converter[i] = asio_converter_send(asio_channelinfo[i].type); + else + asio_converter[i] = asio_converter_receive(asio_channelinfo[i].type); + } /* get latencies */ *************** *** 330,334 **** { ASIOError status; ! int channels = asio_inchannels + asio_outchannels; int i; --- 361,365 ---- { ASIOError status; ! int channels = sys_inchannels + sys_outchannels; int i; *************** *** 350,353 **** --- 381,387 ---- asio_channelinfo = NULL; + if(asio_converter) freebytes(asio_converter, channels * sizeof (void *)); + asio_converter = NULL; + ASIOExit(); freebytes(asio_driver, sizeof (ASIODriverInfo)); *************** *** 482,500 **** * todo: improve input latency */ ! for (i = 0; i < asio_outchannels + asio_inchannels; i++) { if (asio_bufferinfo[i].isInput != ASIOTrue) { ! asio_convert_and_send(asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! (void*) asio_bufferinfo[i].buffers[db_idx], ! asio_channelinfo[i].type, asio_bufsize); } else /* these are the input channels */ { ! asio_convert_and_receive((void*)asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_channelinfo[i].type, asio_bufsize); } - } pthread_cond_broadcast(&asio_ringbuf_cond); --- 516,535 ---- * todo: improve input latency */ ! ! for (i = 0; i < sys_outchannels + sys_inchannels; i++) { + if(asio_converter[i]) if (asio_bufferinfo[i].isInput != ASIOTrue) { ! ((converter_out_t *)asio_converter[i])(asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! (void*) asio_bufferinfo[i].buffers[db_idx], ! asio_bufsize); } else /* these are the input channels */ { ! ((converter_in_t *)asio_converter[i])((void*)asio_bufferinfo[i].buffers[db_idx], ! asio_ringbuffer[i]+asio_ringbuffer_outoffset, ! asio_bufsize); } } pthread_cond_broadcast(&asio_ringbuf_cond); *************** *** 524,528 **** /* sample converting helper functions */ ! void asio_convert_and_send(t_sample* source, void* dest, ASIOSampleType format, long bufsize) { --- 559,563 ---- /* sample converting helper functions */ ! void *asio_converter_send(ASIOSampleType format) { *************** *** 533,548 **** { case ASIOSTInt16LSB: ! /* e.g. m audio quattro */ ! float32toInt16(source, dest, bufsize); ! break; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! memcpy (dest, source, bufsize * sizeof (float)); /* check */ ! break; case ASIOSTInt24LSB: // used for 20 bits as well ! float32toInt24(source, dest, bufsize); ! break; case ASIOSTInt32LSB: ! float32toInt32(source, dest, bufsize); ! break; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 568,585 ---- { case ASIOSTInt16LSB: ! return float32toInt16; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! return float32copy; case ASIOSTInt24LSB: // used for 20 bits as well ! return float32toInt24; case ASIOSTInt32LSB: ! return float32toInt32; ! ! case ASIOSTInt16MSB: ! return float32toInt16_S; ! case ASIOSTInt24MSB: // used for 20 bits as well ! return float32toInt24_S; ! case ASIOSTInt32MSB: ! return float32toInt32_S; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture *************** *** 555,564 **** case ASIOSTInt32LSB24: // 32 bit data with 24 bit alignment - case ASIOSTInt16MSB: - - case ASIOSTInt24MSB: // used for 20 bits as well - - case ASIOSTInt32MSB: - case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture --- 592,595 ---- *************** *** 570,584 **** case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! { ! static int written = 0; ! if(written < 3) { ! post("Output sample Type %d not supported, yet!!!",format); ! ++written; ! } ! } } } ! void asio_convert_and_receive (void* source, t_sample* dest, ASIOSampleType format, long bufsize) { #ifdef ASIODEBUG --- 601,611 ---- case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! default: ! post("Output sample Type %d not supported, yet!!!",format); ! return NULL; } } ! void *asio_converter_receive (ASIOSampleType format) { #ifdef ASIODEBUG *************** *** 589,603 **** { case ASIOSTInt16LSB: ! Int16tofloat32(source, dest, bufsize); ! break; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! memcpy (dest, source, bufsize * sizeof (float)); /* check */ ! break; case ASIOSTInt24LSB: // used for 20 bits as well ! Int24tofloat32(source, dest, bufsize); ! break; case ASIOSTInt32LSB: ! Int32tofloat32(source, dest, bufsize); ! break; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 616,633 ---- { case ASIOSTInt16LSB: ! return Int16tofloat32; case ASIOSTFloat32LSB: // IEEE 754 32 bit float, as found on Intel x86 architecture ! return float32copy; case ASIOSTInt24LSB: // used for 20 bits as well ! return Int24tofloat32; case ASIOSTInt32LSB: ! return Int32tofloat32; ! ! case ASIOSTInt16MSB: ! return Int16tofloat32_S; ! case ASIOSTInt24MSB: // used for 20 bits as well ! return Int24tofloat32_S; ! case ASIOSTInt32MSB: ! return Int32tofloat32_S; case ASIOSTFloat64LSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture *************** *** 610,616 **** case ASIOSTInt32LSB24: // 32 bit data with 24 bit alignment - case ASIOSTInt16MSB: - case ASIOSTInt24MSB: // used for 20 bits as well - case ASIOSTInt32MSB: case ASIOSTFloat32MSB: // IEEE 754 32 bit float, as found on Intel x86 architecture case ASIOSTFloat64MSB: // IEEE 754 64 bit double float, as found on Intel x86 architecture --- 640,643 ---- *************** *** 622,632 **** case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! { ! static int written = 0; ! if(written < 3) { post("Input sample Type %d not supported, yet!!!",format); ! ++written; ! } ! } } --- 649,655 ---- case ASIOSTInt32MSB20: // 32 bit data with 20 bit alignment case ASIOSTInt32MSB24: // 32 bit data with 24 bit alignment ! default: post("Input sample Type %d not supported, yet!!!",format); ! return NULL; } *************** *** 639,642 **** --- 662,670 ---- #define SCALE_INT32 2147483647.f /* (- (expt 2 31) 1) */ + void float32copy(float* inbuffer, float* outbuffer, long frames) + { + memcpy (outbuffer, inbuffer, frames* sizeof (float)); /* check */ + } + void float32toInt16(float* inbuffer, void* outbuffer, long frames) { *************** *** 644,648 **** while (frames--) { ! *out++ = (short)(*inbuffer++ * SCALE_INT16); } } --- 672,687 ---- while (frames--) { ! float o = (*inbuffer++ * SCALE_INT16); ! #ifdef __GNUC__ ! *out++ = (short)lrintf(o); ! #else ! short srt; ! __asm ! { ! fld o ! fistp srt ! }; ! *out++ = srt; ! #endif } } *************** *** 662,666 **** while (frames--) { ! *out++ = (int)(*inbuffer * SCALE_INT24); } } --- 701,716 ---- while (frames--) { ! float o = (*inbuffer * SCALE_INT24); ! #ifdef __GNUC__ ! *out++ = (int)lrintf(o); ! #else ! int intg; ! __asm ! { ! fld o ! fistp intg ! }; ! *out++ = intg; ! #endif } } *************** *** 680,684 **** while (frames--) { ! *out++ = (long)(*inbuffer * SCALE_INT32); } } --- 730,745 ---- while (frames--) { ! float o = (*inbuffer * SCALE_INT32); ! #ifdef __GNUC__ ! *out++ = lrintf(o); ! #else ! long lng; ! __asm ! { ! fld o ! fistp lng ! }; ! *out++ = lng; ! #endif } } *************** *** 693,696 **** --- 754,869 ---- } + void float32toInt16_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + float o = (*inbuffer++ * SCALE_INT16); + #ifdef __GNUC__ + short reverse = (short)lrintf(o); + #else + short reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[1] = ((char *)&reverse)[0]; + out[0] = ((char *)&reverse)[1]; + out += 2; + } + } + + void Int16tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + short d; + while (frames--) + { + ((char *)&d)[0] = in[1]; + ((char *)&d)[1] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT16)); + in += 2; + } + } + + void float32toInt24_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + int o = (*inbuffer * SCALE_INT24); + #ifdef __GNUC__ + int reverse = (int)lrintf(o); + #else + int reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[2] = ((char *)&reverse)[0]; + out[1] = ((char *)&reverse)[1]; + out[0] = ((char *)&reverse)[2]; + out += 3; + } + } + + void Int24tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + long d = 0; + while (frames--) + { + ((char *)&d)[1] = in[2]; + ((char *)&d)[2] = in[1]; + ((char *)&d)[3] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT24)); + in += 3; + } + } + + void float32toInt32_S(float* inbuffer, void* outbuffer, long frames) + { + char* out = (char*)outbuffer; + while (frames--) + { + float o = (*inbuffer * SCALE_INT32); + #ifdef __GNUC__ + long reverse = (long)lrintf(o); + #else + long reverse; + __asm + { + fld o + fistp reverse + }; + #endif + out[3] = ((char *)&reverse)[0]; + out[2] = ((char *)&reverse)[1]; + out[1] = ((char *)&reverse)[2]; + out[0] = ((char *)&reverse)[3]; + out += 4; + } + } + + void Int32tofloat32_S(void* inbuffer, float* outbuffer, long frames) + { + char* in = (char*)inbuffer; + long d; + while (frames--) + { + ((char *)&d)[0] = in[3]; + ((char *)&d)[1] = in[2]; + ((char *)&d)[2] = in[1]; + ((char *)&d)[3] = in[0]; + *outbuffer++ = (float)(d * (1.f / SCALE_INT32)); + in += 3; + } + } + + /* some local helper functions */ inline void prepare_asio_drivernames(void)

1 0

pd/src Makefile.am,1.1.4.1,1.1.4.2
by Tim Blechmann 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16798/src Modified Files: Tag: devel_0_38 Makefile.am Log Message: fix for the build systemx Index: Makefile.am =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/Makefile.am,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** Makefile.am 5 Nov 2004 13:24:50 -0000 1.1.4.1 --- Makefile.am 6 Nov 2004 13:58:13 -0000 1.1.4.2 *************** *** 106,111 **** t_tk.h bin/pd.tk: echo set pd_nt @OSNUMBER@ > bin/pd.tk ! grep -v "set pd_nt" < u_main.tk >> bin/pd.tk \ No newline at end of file --- 106,115 ---- t_tk.h + all-local: bin/pd.tk bin/pd.tk: echo set pd_nt @OSNUMBER@ > bin/pd.tk ! grep -v "set pd_nt" < u_main.tk >> bin/pd.tk ! ! install-exec-local: ! install -m644 ./bin/pd.tk $(libdir)/pd/bin/pd.tk

1 0

pd/extra/expr~ makefile,1.6,1.6.4.1
by Tim Blechmann 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/extra/expr~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16607/extra/expr~ Modified Files: Tag: devel_0_38 makefile Log Message: fix for the build system Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/makefile,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** makefile 6 Sep 2004 20:20:27 -0000 1.6 --- makefile 6 Nov 2004 13:56:45 -0000 1.6.4.1 *************** *** 1,5 **** ! ! current: expr.pd_linux expr~.pd_linux fexpr~.pd_linux \ ! ../expr.pd_linux ../expr~.pd_linux ../fexpr~.pd_linux install: install_linux --- 1,3 ---- ! current: pd_linux install: install_linux *************** *** 77,80 **** --- 75,81 ---- # ----------------------- LINUX i386 ----------------------- + pd_linux: expr.pd_linux expr~.pd_linux fexpr~.pd_linux \ + ../expr.pd_linux ../expr~.pd_linux ../fexpr~.pd_linux + LINUXOBJ = vexp.pd_linux_o vexp_fun.pd_linux_o vexp_if.pd_linux_o .SUFFIXES: .pd_linux_o

1 0

pd/src configure.in,1.5,1.5.4.1
by Tim Blechmann 06 Nov '04

06 Nov '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14703/src Modified Files: Tag: devel_0_38 configure.in Log Message: old build system Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** configure.in 6 Sep 2004 20:20:33 -0000 1.5 --- configure.in 6 Nov 2004 10:21:16 -0000 1.5.4.1 *************** *** 2,14 **** AC_INIT(d_arithmetic.c) - AC_SUBST(alsa, yes) - AC_SUBST(jack, no) - AC_SUBST(portaudio, no) AC_SUBST(binarymode, -m755) - AC_SUBST(PDLIB) AC_SUBST(MORECFLAGS) AC_SUBST(EXT) AC_SUBST(OPT_CFLAGS) - AC_SUBST(USE_OPT_CFLAGS, yes) AC_SUBST(SYSSRC) AC_SUBST(STRIPFLAG) --- 2,10 ---- AC_INIT(d_arithmetic.c) AC_SUBST(binarymode, -m755) AC_SUBST(MORECFLAGS) AC_SUBST(EXT) + AC_SUBST(DEFS) AC_SUBST(OPT_CFLAGS) AC_SUBST(SYSSRC) AC_SUBST(STRIPFLAG) *************** *** 17,39 **** AC_SUBST(OSNUMBER) AC_SUBST(EXTERNTARGET) - dnl other defaults - - dnl check for features ! AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA], ! alsa="no") ! AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], ! jack="yes") ! AC_ARG_ENABLE(portaudio,[ --enable-portaudio portaudio], ! portaudio="yes") ! AC_ARG_ENABLE(debug, [ --enable-debug debugging support], ! USE_OPT_CFLAGS="no") ! AC_ARG_ENABLE(static, [ --enable-static link statically], ! static=yes) ! AC_ARG_ENABLE(setuid, [ --enable-setuid install as setuid (linux)], ! setuid=yes) ! ! dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL --- 13,20 ---- AC_SUBST(OSNUMBER) AC_SUBST(EXTERNTARGET) + AC_SUBST(CC) ! dnl other defaults AC_PROG_CC AC_PROG_INSTALL *************** *** 59,146 **** dnl Checks for libraries. ! dnl Checking for `dlopen' function in -ldl: ! AC_CHECK_LIB(dl, dlopen,PDLIB="$PDLIB -ldl", ! echo "dynamic link support required" || exit 1) ! dnl Checking for `sin' function in -lffm: ! dnl ffm is the fast math library on the alpha ! AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm") - dnl Checking for `sin' function in -lm: - AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", - echo "math library required" || exit 1) ! dnl Checking for `pthread_create' function in -pthread ! AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", ! echo "pthreads required" || exit 1) dnl Find paths to includes and libraries for X11 AC_PATH_X dnl Checking for `XCreateWindow' function in -lX11: ! AC_CHECK_LIB(X11, XCreateWindow, LIBS="$LIBS -lX11 -L$x_libraries", echo "no X11 found" || exit 1, -L$x_libraries) ! dnl look for tcl 8.x... do I really have to go through all this!? ! foundit=no ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl.h,foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.7/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.6/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.5/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.4/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.3/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.2/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! echo no tcl header found ! exit -1 ! fi ! AC_CHECK_LIB(tcl8.7, main,, ! AC_CHECK_LIB(tcl8.6, main,, ! AC_CHECK_LIB(tcl8.5, main,, ! AC_CHECK_LIB(tcl8.4, main,, ! AC_CHECK_LIB(tcl8.3, main,, ! AC_CHECK_LIB(tcl8.2, main,, ! AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1))))))) ! AC_CHECK_LIB(tk8.7, main,, ! AC_CHECK_LIB(tk8.6, main,, ! AC_CHECK_LIB(tk8.5, main,, ! AC_CHECK_LIB(tk8.4, main,, ! AC_CHECK_LIB(tk8.3, main,, ! AC_CHECK_LIB(tk8.2, main,, ! AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1))))))) ! if test `uname -s` = Linux; then dnl Ckecking for ALSA --- 40,134 ---- dnl Checks for libraries. ! AC_CHECK_LIB(dl, dlopen, , ! echo "dynamic link support required" || exit 1) ! AC_CHECK_LIB(m, sin, , ! echo "math library required" || exit 1) ! AC_CHECK_LIB(pthread, pthread_create, , ! echo "pthreads required" || exit 1) ! dnl check for features ! AC_ARG_ENABLE(alsa, [ --disable-alsa disable ALSA], ! alsa="no", alsa="yes") ! ! AC_ARG_ENABLE(jack, [ --enable-jack jack audio server], ! AC_CHECK_LIB(rt,shm_open) ! AC_CHECK_LIB(jack,jack_set_error_function) ! AC_CHECK_LIB(jack,jack_set_xrun_callback, ! MORECFLAGS="$MORECFLAGS -DJACK_XRUN") ! ) ! ! AC_ARG_ENABLE(portaudio, [ --enable-portaudio portaudio], ! portaudio=$enableval,portaudio=no) ! ! AC_ARG_ENABLE(debug, [ --enable-debug debugging support], ! USE_DEBUG=$enableval,USE_DEBUG=no) ! ! AC_ARG_ENABLE(static, [ --enable-static link statically], ! LDFLAGS="$LDFLAGS -static") ! ! AC_ARG_ENABLE(setuid, [ --enable-setuid install as setuid (linux)], ! setuid=yes) ! ! AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support], ! AC_CHECK_LIB(fftw3f,fftwf_plan_dft_r2c_1d)) ! ! AC_ARG_ENABLE(icc, [ --enable-icc icc support], ! CC=icc; icc=yes) ! ! AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3, G4, G5], ! optimize=$enableval, ! MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD") ! ! AC_ARG_ENABLE(simd, [ --enable-simd use SIMD code (default=no)], ! simdcode=$enableval, ! MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD") ! ! AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch], ! MORECFLAGS=$MORECFLAGS" -DTHREADED_GUI") ! ! AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler], ! MORECFLAGS=$MORECFLAGS" -DTHREADED_SF -DGARRAY_THREAD_LOCK -D_GNU_SOURCE") ! ! AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlock], ! MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE") dnl Find paths to includes and libraries for X11 AC_PATH_X + LIBS="$LIBS -L$x_libraries" + dnl Checking for `XCreateWindow' function in -lX11: ! AC_CHECK_LIB(X11, XCreateWindow, , echo "no X11 found" || exit 1, -L$x_libraries) ! dnl look for tcl 8.x... ! tcllib="" ! AC_CHECK_LIB(tcl8.7, main,tcllib=tcl8.7, ! AC_CHECK_LIB(tcl8.6, main,tcllib=tcl8.6, ! AC_CHECK_LIB(tcl8.5, main,tcllib=tcl8.5, ! AC_CHECK_LIB(tcl8.4, main,tcllib=tcl8.4, ! AC_CHECK_LIB(tcl8.3, main,tcllib=tcl8.3, ! AC_CHECK_LIB(tcl8.2, main,tcllib=tcl8.2, ! AC_CHECK_LIB(tcl8.0, main,tcllib=tcl8.0,echo no tcl library found || exit 1))))))) ! LIBS="$LIBS -l$tcllib" ! tklib=${tcllib/tcl/tk} + AC_CHECK_LIB($tklib, main,,echo no tk library found || exit 1) ! foundit=no ! AC_CHECK_HEADER(tcl.h,foundit=yes) ! ! if test "$foundit" = "no"; then ! AC_CHECK_HEADER($tcllib/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/$tcllib", ! [echo no tcl header found];exit -1) ! fi ! ! if test `uname -s` == Linux; then dnl Ckecking for ALSA *************** *** 152,167 **** fi ! dnl Checking for JACK ! AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) - LDFLAGS="-Wl,-export-dynamic" - if test "$static" = "yes"; then - LDFLAGS="$LDFLAGS -static" - fi EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD\ -DUSEAPI_OSS \ -I../portaudio/pa_common -I../portaudio/pablio \ --- 140,172 ---- fi ! dnl Set processor flags ! if test "$icc" == "yes"; then ! if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-xN -ip -ipo_obj" ! fi ! if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-xK -ip -ipo_obj" ! fi ! else ! if test "$optimize" == "pentium4"; then ! ARCH_CFLAGS="-mtune=pentium4 -march=pentium4 -mmmx -msse -msse2 -mfpmath=sse" ! fi ! if test "$optimize" == "pentium3"; then ! ARCH_CFLAGS="-mtune=pentium3 -march=pentium3 -mmmx -msse -mfpmath=sse" ! fi ! if test "$optimize" == "pentium2"; then ! ARCH_CFLAGS="-mtune=pentium2 -march=pentium2 -mmmx"; ! MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" ! fi ! if test "$optimize" == "pentium"; then ! ARCH_CFLAGS="-mtune=pentium -march=pentium" ! MORECFLAGS=$MORECFLAGS" -DDONTUSESIMD" ! fi ! fi ! LDFLAGS="$LDFLAGS -Wl,-export-dynamic" EXT=pd_linux ! MORECFLAGS=$MORECFLAGS" -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUNIX -DUNISTDo\ -DUSEAPI_OSS \ -I../portaudio/pa_common -I../portaudio/pablio \ *************** *** 174,184 **** MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" LDFLAGS=$LDFLAGS" -lasound" ! fi if test x$portaudio == "xyes"; then ! MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 "$MORECFLAGS SYSSRC="s_audio_pa.c \ ! s_audio_pablio.c \ ! s_audio_paring.c \ ../portaudio/pa_common/pa_allocation.c \ ../portaudio/pa_common/pa_converters.c \ --- 179,189 ---- MORECFLAGS=$MORECFLAGS" -DPA_USE_ALSA -DUSEAPI_ALSA" LDFLAGS=$LDFLAGS" -lasound" ! if test x$portaudio == "xyes"; then ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_PORTAUDIO -DPA19"$MORECFLAGS SYSSRC="s_audio_pa.c \ ! s_audio_pablio.c \ ! s_audio_paring.c \ ../portaudio/pa_common/pa_allocation.c \ ../portaudio/pa_common/pa_converters.c \ *************** *** 196,236 **** then SYSSRC=$SYSSRC" ../portaudio/pa_linux_alsa/pa_linux_alsa.c" ! MORECFLAGS=$MORECFLAGS" -Wno-error" ! fi fi ! if test x$setuid == "xyes"; then binarymode="-m4755" fi STRIPFLAG=-s GUINAME="pd-gui" ! if test x$USE_OPT_CFLAGS == "xyes"; ! then ! OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer" else ! OPT_CFLAGS="-g" fi echo OPT_CFLAGS --------------- $OPT_CFLAGS OSNUMBER=0 fi ! if test `uname -s` = Darwin; then ! LDFLAGS="-Wl -framework CoreAudio \ -framework AudioUnit -framework AudioToolbox \ -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \ -I../portmidi_osx \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" ! SYSSRC="s_midi_pm.c s_audio_pa.c \ ! s_audio_pablio.c \ ! s_audio_paring.c \ ! ../portaudio_v18/pa_common/pa_lib.c \ ! ../portaudio_v18/pa_common/pa_trace.c \ ! ../portaudio_v18/pa_common/pa_convert.c \ ! ../portaudio_v18/pa_mac_core/pa_mac_core.c \ ../portmidi_osx/pmdarwin.c \ ../portmidi_osx/pmmacosx.c \ --- 201,251 ---- then SYSSRC=$SYSSRC" ../portaudio/pa_linux_alsa/pa_linux_alsa.c" ! MORECFLAGS=$MORECFLAGS" -Wno-error" ! fi fi ! ! if test x$setuid == "xyes"; then binarymode="-m4755" fi + STRIPFLAG=-s GUINAME="pd-gui" ! if test x$USE_DEBUG == "xyes"; then ! OPT_CFLAGS="-g" else ! if test "$icc" = "yes"; then ! OPT_CFLAGS=$ARCH_CFLAGS" -O3" ! else ! OPT_CFLAGS=$ARCH_CFLAGS" -O3 -funroll-loops -fomit-frame-pointer" ! fi ! fi ! ! dnl we have to add the OPT_CFLAGS to the LD_FLAGS to make sure that icc ! dnl links with the right libraries - timblechmann(a)gmx.de ! if test "$icc" = "yes"; then ! LDFLAGS=$LDFLAGS" "$OPT_CFLAGS fi + echo OPT_CFLAGS --------------- $OPT_CFLAGS OSNUMBER=0 fi ! if test `uname -s` == Darwin; then ! LDFLAGS=$LDFLAGS" -Wl -framework CoreAudio \ -framework AudioUnit -framework AudioToolbox \ -framework Carbon -framework CoreMIDI" EXT=pd_darwin ! MORECFLAGS=$MORECFLAGS" -DMACOSX -DUNISTD -I/usr/X11R6/include \ -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \ -I../portmidi_osx \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" ! SYSSRC="s_midi_pm.c s_audio_pa.c s_audio_pablio.c s_audio_paring.c \ ! ../portaudio/pa_common/pa_lib.c \ ! ../portaudio/pa_common/pa_trace.c \ ! ../portaudio/pa_common/pa_convert.c \ ! ../portaudio/pa_mac_core/pa_mac_core.c \ ../portmidi_osx/pmdarwin.c \ ../portmidi_osx/pmmacosx.c \ *************** *** 244,276 **** -I../../Frameworks/Tcl.framework/Versions/Current/Headers \ -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders" ! if test x$USE_OPT_CFLAGS == "xyes"; ! then ! OPT_CFLAGS="-O2" else ! OPT_CFLAGS="-g" fi OSNUMBER=2 EXTERNTARGET=pd_darwin ! if test x$jack == "xyes"; ! then ! LDFLAGS=$LDFLAGS" -framework Jack" ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! SYSSRC=$SYSSRC" s_audio_jack.c" fi ! fi ! ! # support for jack, on either linux or darwin: ! if test x$jack == "xyes"; ! then ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" ! SYSSRC=$SYSSRC" s_audio_jack.c" ! LDFLAGS=$LDFLAGS" -lrt -ljack" ! fi ! if test x$jack == "xrun"; ! then ! MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK -DJACK_XRUN" ! SYSSRC=$SYSSRC" s_audio_jack.c" ! LDFLAGS=$LDFLAGS" -lrt -ljack" fi --- 259,287 ---- -I../../Frameworks/Tcl.framework/Versions/Current/Headers \ -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders" ! ! if test x$USE_DEBUG == "xyes"; then ! OPT_CFLAGS="-g" else ! OPT_CFLAGS="-O3" fi + OSNUMBER=2 EXTERNTARGET=pd_darwin ! ! dnl Set processor flags ! if test "$optimize" == "G3"; then ! OPT_CFLAGS=$OPT_CFLAGS" -mtune=G3 -mcpu=G3 -malign-natural" fi ! if test "$optimize" == "G4"; then ! OPT_CFLAGS=$OPT_CFLAGS" -mtune=G4 -mcpu=G4 -maltivec -malign-natural" ! fi ! if test "$optimize" == "G5"; then ! OPT_CFLAGS=$OPT_CFLAGS" -march=G5 -cpu=G5 -maltivec -malign-natural" ! fi ! dnl Enable SIMD instructions ! if test "$simdcode" == "yes"; then ! OPT_CFLAGS=$OPT_CFLAGS" -faltivec" ! fi fi *************** *** 287,290 **** --- 298,305 ---- fi + dnl test for xmmintrin.h header file + CFLAGS=$OPT_CFLAGS + AC_TRY_COMPILE([#]include "xmmintrin.h", ,MORECFLAGS=$MORECFLAGS" -DDAZ",) + AC_OUTPUT(makefile)

1 0

← Newer
1
...
22
23
24
25
26
27
28
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 November 2004