Pd-cvs September 2004

pd-cvs@lists.iem.at

9 participants
149 discussions

externals/grill/flext/source flatom.cpp,1.9,1.10 flbind.cpp,1.14,1.15 flclass.h,1.44,1.45 flmeth.cpp,1.10,1.11 flqueue.cpp,1.16,1.17
by Thomas Grill 11 Sep '04

11 Sep '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10738/source Modified Files: flatom.cpp flbind.cpp flclass.h flmeth.cpp flqueue.cpp Log Message: "" Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** flqueue.cpp 21 Jun 2004 13:58:19 -0000 1.16 --- flqueue.cpp 11 Sep 2004 04:00:41 -0000 1.17 *************** *** 20,23 **** --- 20,24 ---- #include "flinternal.h" + #ifdef FLEXT_THREADS //! Thread id of message queue thread *************** *** 25,72 **** #endif class qmsg { public: ! qmsg(flext_base *b): nxt(NULL),th(b),tp(tp_none) {} ! ~qmsg(); ! ! qmsg *nxt; ! void Clear(); ! void SetBang(int o) { Clear(); out = o; tp = tp_bang; } ! void SetFloat(int o,float f) { Clear(); out = o; tp = tp_float; _float = f; } ! void SetInt(int o,int i) { Clear(); out = o; tp = tp_int; _int = i; } ! void SetSymbol(int o,const t_symbol *s) { Clear(); out = o; tp = tp_sym; _sym = s; } ! void SetList(int o,int argc,const t_atom *argv) { Clear(); out = o; tp = tp_list; _list.argc = argc,_list.argv = flext::CopyList(argc,argv); } ! void SetAny(int o,const t_symbol *s,int argc,const t_atom *argv) { Clear(); out = o; tp = tp_any; _any.s = s,_any.argc = argc,_any.argv = flext::CopyList(argc,argv); } flext_base *th; int out; ! enum { tp_none,tp_bang,tp_float,tp_int,tp_sym,tp_list,tp_any } tp; ! union { ! float _float; ! int _int; ! const t_symbol *_sym; ! struct { int argc; t_atom *argv; } _list; ! struct { const t_symbol *s; int argc; t_atom *argv; } _any; ! }; }; ! qmsg::~qmsg() ! { ! Clear(); ! if(nxt) delete nxt; ! } ! void qmsg::Clear() ! { ! if(tp == tp_list) { if(_list.argv) delete[] _list.argv; } ! else if(tp == tp_any) { if(_any.argv) delete[] _any.argv; } ! tp = tp_none; ! } - static volatile int qcnt = 0; - static qmsg *volatile qhead = NULL,*volatile qtail = NULL; #ifdef FLEXT_QTHR --- 26,177 ---- #endif + + #define QUEUE_LENGTH 256 + #define QUEUE_ATOMS 1024 + class qmsg { public: ! void Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) { th = t,out = o,sym = s,argc = ac,argv = av; } ! // \note PD lock must already be held by caller ! void Send() const ! { ! if(out < 0) ! // message to self ! th->m_methodmain(-1-out,sym,argc,argv); ! else ! // message to outlet ! th->ToSysAnything(out,sym,argc,argv); ! } ! int Args() const { return argc; } + private: flext_base *th; int out; ! const t_symbol *sym; ! int argc; ! const t_atom *argv; }; ! // _should_ work without locks.... have yet to check if it really does.... ! class Queue: ! public flext ! { ! public: ! Queue() ! { ! qhead = qtail = 0; ! ahead = atail = 0; ! } ! bool Empty() const { return qhead == qtail; } ! ! int Count() const ! { ! int c = qtail-qhead; ! return c >= 0?c:c+QUEUE_LENGTH; ! } ! ! const qmsg &Head() { return lst[qhead]; } ! ! void Pop() ! { ! PopAtoms(Head().Args()); ! qhead = (qhead+1)%QUEUE_LENGTH; ! } ! ! void Push(flext_base *th,int o) // bang ! { ! Set(th,o,sym_bang,0,NULL); ! } ! ! void Push(flext_base *th,int o,float dt) ! { ! t_atom *at = GetAtoms(1); ! SetFloat(*at,dt); ! Set(th,o,sym_float,1,at); ! } ! ! void Push(flext_base *th,int o,int dt) ! { ! t_atom *at = GetAtoms(1); ! SetInt(*at,dt); ! #if FLEXT_SYS == FLEXT_SYS_PD ! const t_symbol *sym = sym_float; ! #elif FLEXT_SYS == FLEXT_SYS_MAX ! const t_symbol *sym = sym_int; ! #else ! #error Not implemented! ! #endif ! Set(th,o,sym,1,at); ! } ! ! void Push(flext_base *th,int o,const t_symbol *dt) ! { ! t_atom *at = GetAtoms(1); ! SetSymbol(*at,dt); ! Set(th,o,sym_symbol,1,at); ! } ! ! void Push(flext_base *th,int o,int argc,const t_atom *argv) ! { ! t_atom *at = GetAtoms(argc); ! memcpy(at,argv,argc*sizeof(t_atom)); ! Set(th,o,sym_list,argc,at); ! } ! ! void Push(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) ! { ! t_atom *at = GetAtoms(argc); ! memcpy(at,argv,argc*sizeof(t_atom)); ! Set(th,o,sym,argc,at); ! } ! ! protected: ! void Set(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) ! { ! FLEXT_ASSERT(Count() < QUEUE_LENGTH-1); ! lst[qtail].Set(th,o,sym,argc,argv); ! qtail = (qtail+1)%QUEUE_LENGTH; ! } ! ! int CntAtoms() const ! { ! int c = atail-ahead; ! return c >= 0?c:c+QUEUE_ATOMS; ! } ! ! // must return contiguous region ! t_atom *GetAtoms(int argc) ! { ! // \todo check for available space ! ! if(atail+argc >= QUEUE_ATOMS) { ! atail = argc; ! return atoms; ! } ! else { ! t_atom *at = atoms+atail; ! atail += argc; ! return at; ! } ! } ! ! void PopAtoms(int argc) ! { ! const int p = ahead+argc; ! ahead = p >= QUEUE_ATOMS?argc:p; ! } ! ! int qhead,qtail; ! qmsg lst[QUEUE_LENGTH]; ! int ahead,atail; ! t_atom atoms[QUEUE_ATOMS]; ! }; ! ! static Queue queue; #ifdef FLEXT_QTHR *************** *** 76,86 **** #endif - #ifdef FLEXT_THREADS - static flext::ThrMutex qmutex; - #endif #define CHUNK 10 ! static void QWork(bool qlock,bool syslock) { for(;;) { --- 181,188 ---- #endif #define CHUNK 10 ! static void QWork(bool syslock) { for(;;) { *************** *** 89,93 **** // On the other hand, if new queue elements are added by the methods called // in the loop, these will be sent in the next tick to avoid recursion overflow. ! int qc = qcnt; if(!qc) break; --- 191,195 ---- // On the other hand, if new queue elements are added by the methods called // in the loop, these will be sent in the next tick to avoid recursion overflow. ! int qc = queue.Count(); if(!qc) break; *************** *** 96,168 **** #endif ! for(int i = 0; i < qc && qhead; ++i) { ! #ifdef FLEXT_THREADS ! if(qlock) qmutex.Lock(); ! #endif ! qmsg *m = qhead; ! qcnt--; ! qhead = m->nxt; ! if(!qhead) qtail = NULL; ! m->nxt = NULL; ! #ifdef FLEXT_THREADS ! if(qlock) qmutex.Unlock(); ! #endif ! ! if(m->out < 0) { ! // message to self ! ! const int n = -1-m->out; ! t_atom tmp; ! ! switch(m->tp) { ! case qmsg::tp_bang: ! m->th->m_methodmain(n,flext::sym_bang,0,&tmp); ! break; ! case qmsg::tp_float: ! flext::SetFloat(tmp,m->_float); ! m->th->m_methodmain(n,flext::sym_float,1,&tmp); ! break; ! case qmsg::tp_int: ! flext::SetInt(tmp,m->_int); ! #if FLEXT_SYS == FLEXT_SYS_PD ! m->th->m_methodmain(n,flext::sym_float,1,&tmp); ! #elif FLEXT_SYS == FLEXT_SYS_MAX ! m->th->m_methodmain(n,flext::sym_int,1,&tmp); ! #else ! #error Not implemented! ! #endif ! case qmsg::tp_sym: ! flext::SetSymbol(tmp,m->_sym); ! m->th->m_methodmain(n,flext::sym_symbol,1,&tmp); ! break; ! case qmsg::tp_list: ! m->th->m_methodmain(n,flext::sym_list,m->_list.argc,m->_list.argv); ! break; ! case qmsg::tp_any: ! m->th->m_methodmain(n,m->_any.s,m->_any.argc,m->_any.argv); ! break; ! #ifdef FLEXT_DEBUG ! default: ERRINTERNAL(); ! #endif ! } ! } ! else { ! // message to outlet ! ! switch(m->tp) { ! case qmsg::tp_bang: m->th->ToSysBang(m->out); break; ! case qmsg::tp_float: m->th->ToSysFloat(m->out,m->_float); break; ! case qmsg::tp_int: m->th->ToSysInt(m->out,m->_int); break; ! case qmsg::tp_sym: m->th->ToSysSymbol(m->out,m->_sym); break; ! case qmsg::tp_list: m->th->ToSysList(m->out,m->_list.argc,m->_list.argv); break; ! case qmsg::tp_any: m->th->ToSysAnything(m->out,m->_any.s,m->_any.argc,m->_any.argv); break; ! #ifdef FLEXT_DEBUG ! default: ERRINTERNAL(); ! #endif ! } ! } ! ! // delete processed queue element ! delete m; } // inner loop --- 198,204 ---- #endif ! for(int i = 0; i < qc; ++i) { ! queue.Head().Send(); ! queue.Pop(); } // inner loop *************** *** 171,175 **** #endif ! } // for(;;) } --- 207,211 ---- #endif ! } } *************** *** 182,190 **** { #endif - // post("qtick"); #ifdef FLEXT_THREADS FLEXT_ASSERT(flext::IsSystemThread()); #endif ! QWork(true,false); } #endif --- 218,225 ---- { #endif #ifdef FLEXT_THREADS FLEXT_ASSERT(flext::IsSystemThread()); #endif ! QWork(false); } #endif *************** *** 202,229 **** } #endif ! #ifdef FLEXT_THREADS ! qmutex.Lock(); ! #endif ! while(qcnt) QWork(false,false); ! #ifdef FLEXT_THREADS ! qmutex.Unlock(); ! #endif } ! static void Queue(qmsg *m) { - // post("Queue"); - - #ifdef FLEXT_THREADS - qmutex.Lock(); - #endif - if(qtail) qtail->nxt = m; - else qhead = m; - qtail = m; - qcnt++; - #ifdef FLEXT_THREADS - qmutex.Unlock(); - #endif - #if FLEXT_SYS == FLEXT_SYS_PD #ifdef FLEXT_QTHR --- 237,246 ---- } #endif ! ! while(!queue.Empty()) QWork(false); } ! static void Trigger() { #if FLEXT_SYS == FLEXT_SYS_PD #ifdef FLEXT_QTHR *************** *** 250,254 **** for(;;) { qthrcond.Wait(); ! QWork(true,true); } } --- 267,271 ---- for(;;) { qthrcond.Wait(); ! QWork(true); } } *************** *** 261,268 **** else started = true; - // message queue ticker - qhead = qtail = NULL; - qcnt = 0; - #ifdef FLEXT_QTHR LaunchThread(QWorker,NULL); --- 278,281 ---- *************** *** 278,362 **** void flext_base::ToQueueBang(int o) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetBang(o); ! Queue(m); } void flext_base::ToQueueFloat(int o,float f) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetFloat(o,f); ! Queue(m); } void flext_base::ToQueueInt(int o,int f) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetInt(o,f); ! Queue(m); } void flext_base::ToQueueSymbol(int o,const t_symbol *s) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetSymbol(o,s); ! Queue(m); } void flext_base::ToQueueList(int o,int argc,const t_atom *argv) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetList(o,argc,argv); ! Queue(m); } void flext_base::ToQueueAnything(int o,const t_symbol *s,int argc,const t_atom *argv) const { ! FLEXT_ASSERT(o >= 0); ! qmsg *m = new qmsg(const_cast<flext_base *>(this)); ! m->SetAny(o,s,argc,argv); ! Queue(m); ! } ! ! ! void flext_base::ToSelfBang(int n) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueBang(-1-n); ! } ! ! void flext_base::ToSelfFloat(int n,float f) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueFloat(-1-n,f); ! } ! ! void flext_base::ToSelfInt(int n,int f) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueInt(-1-n,f); ! } ! ! void flext_base::ToSelfSymbol(int n,const t_symbol *s) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueSymbol(-1-n,s); ! } ! ! void flext_base::ToSelfList(int n,int argc,const t_atom *argv) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueList(-1-n,argc,argv); ! } ! ! void flext_base::ToSelfAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const ! { ! FLEXT_ASSERT(n >= 0); ! ToQueueAnything(-1-n,s,argc,argv); } - --- 291,325 ---- void flext_base::ToQueueBang(int o) const { ! queue.Push(const_cast<flext_base *>(this),o); ! Trigger(); } void flext_base::ToQueueFloat(int o,float f) const { ! queue.Push(const_cast<flext_base *>(this),o,f); ! Trigger(); } void flext_base::ToQueueInt(int o,int f) const { ! queue.Push(const_cast<flext_base *>(this),o,f); ! Trigger(); } void flext_base::ToQueueSymbol(int o,const t_symbol *s) const { ! queue.Push(const_cast<flext_base *>(this),o,s); ! Trigger(); } void flext_base::ToQueueList(int o,int argc,const t_atom *argv) const { ! queue.Push(const_cast<flext_base *>(this),o,argc,argv); ! Trigger(); } void flext_base::ToQueueAnything(int o,const t_symbol *s,int argc,const t_atom *argv) const { ! queue.Push(const_cast<flext_base *>(this),o,s,argc,argv); ! Trigger(); } Index: flbind.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbind.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** flbind.cpp 21 Jun 2004 13:58:19 -0000 1.14 --- flbind.cpp 11 Sep 2004 04:00:41 -0000 1.15 *************** *** 36,40 **** pxbnd_class = new t_class; ! pxbnd_class->c_sym = gensym(""); pxbnd_class->c_freelist = &px_freelist; pxbnd_class->c_freefun = NULL; --- 36,40 ---- pxbnd_class = new t_class; ! pxbnd_class->c_sym = sym__; pxbnd_class->c_freelist = &px_freelist; pxbnd_class->c_freefun = NULL; *************** *** 44,48 **** px_messlist[0].m_sym = (t_symbol *)pxbnd_class; ! px_messlist[1].m_sym = gensym("anything"); px_messlist[1].m_fun = (method)pxbnd_object::px_method; px_messlist[1].m_type[0] = A_GIMME; --- 44,48 ---- px_messlist[0].m_sym = (t_symbol *)pxbnd_class; ! px_messlist[1].m_sym = sym_anything; px_messlist[1].m_fun = (method)pxbnd_object::px_method; px_messlist[1].m_type[0] = A_GIMME; Index: flatom.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flatom.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** flatom.cpp 3 Aug 2003 02:36:45 -0000 1.9 --- flatom.cpp 11 Sep 2004 04:00:41 -0000 1.10 *************** *** 43,49 **** t_atom *flext::CopyList(int argc,const t_atom *argv) { - int i; t_atom *dst = new t_atom[argc]; ! for(i = 0; i < argc; ++i) CopyAtom(dst+i,argv+i); return dst; } --- 43,48 ---- t_atom *flext::CopyList(int argc,const t_atom *argv) { t_atom *dst = new t_atom[argc]; ! memcpy(dst,argv,argc*sizeof(t_atom)); return dst; } Index: flmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmeth.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flmeth.cpp 21 Jun 2004 13:58:19 -0000 1.10 --- flmeth.cpp 11 Sep 2004 04:00:41 -0000 1.11 *************** *** 126,133 **** bool flext_base::ListMethods(int inlet) const { if(procattr) { AtomList la; ListMethods(la,inlet); ! ToOutAnything(GetOutAttr(),MakeSymbol("methods"),la.Count(),la.Atoms()); return true; } --- 126,135 ---- bool flext_base::ListMethods(int inlet) const { + static const t_symbol *sym_methods = MakeSymbol("methods"); + if(procattr) { AtomList la; ListMethods(la,inlet); ! ToOutAnything(GetOutAttr(),sym_methods,la.Count(),la.Atoms()); return true; } Index: flclass.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flclass.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** flclass.h 23 Apr 2004 22:14:12 -0000 1.44 --- flclass.h 11 Sep 2004 04:00:41 -0000 1.45 *************** *** 277,287 **** //! Send bang to self (inlet n) ! void ToSelfBang(int n) const; //! Send float to self (inlet n) ! void ToSelfFloat(int n,float f) const; //! Send integer to self (inlet n) ! void ToSelfInt(int n,int f) const; //! Send boolean to self (inlet n) --- 277,287 ---- //! Send bang to self (inlet n) ! void ToSelfBang(int n) const { ToQueueBang(-1-n); } //! Send float to self (inlet n) ! void ToSelfFloat(int n,float f) const { ToQueueFloat(-1-n,f); } //! Send integer to self (inlet n) ! void ToSelfInt(int n,int f) const { ToQueueInt(-1-n,f); } //! Send boolean to self (inlet n) *************** *** 289,303 **** //! Send symbol to self (inlet n) ! void ToSelfSymbol(int n,const t_symbol *s) const; //! Send string aka symbol to self (inlet 0) void ToSelfString(int n,const char *s) const { ToSelfSymbol(n,MakeSymbol(s)); } //! Send list to self (inlet n) ! void ToSelfList(int n,int argc,const t_atom *argv) const; //! Send list to self (inlet n) void ToSelfList(int n,const AtomList &list) const { ToSelfList(n,list.Count(),list.Atoms()); } //! Send anything to self (inlet n) ! void ToSelfAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const; //! Send anything to self (inlet n) void ToSelfAnything(int n,const AtomAnything &any) const { ToSelfAnything(n,any.Header(),any.Count(),any.Atoms()); } --- 289,303 ---- //! Send symbol to self (inlet n) ! void ToSelfSymbol(int n,const t_symbol *s) const { ToQueueSymbol(-1-n,s); } //! Send string aka symbol to self (inlet 0) void ToSelfString(int n,const char *s) const { ToSelfSymbol(n,MakeSymbol(s)); } //! Send list to self (inlet n) ! void ToSelfList(int n,int argc,const t_atom *argv) const { ToQueueList(-1-n,argc,argv); } //! Send list to self (inlet n) void ToSelfList(int n,const AtomList &list) const { ToSelfList(n,list.Count(),list.Atoms()); } //! Send anything to self (inlet n) ! void ToSelfAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const { ToQueueAnything(-1-n,s,argc,argv); } //! Send anything to self (inlet n) void ToSelfAnything(int n,const AtomAnything &any) const { ToSelfAnything(n,any.Header(),any.Count(),any.Atoms()); }

1 0

pd/src s_main.c,1.1.1.4.2.14,1.1.1.4.2.15
by Thomas Grill 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27651 Modified Files: Tag: devel_0_37 s_main.c Log Message: make help and lib paths adjustable Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.14 retrieving revision 1.1.1.4.2.15 diff -C2 -d -r1.1.1.4.2.14 -r1.1.1.4.2.15 *** s_main.c 23 Jul 2004 08:46:40 -0000 1.1.1.4.2.14 --- s_main.c 9 Sep 2004 20:05:03 -0000 1.1.1.4.2.15 *************** *** 32,35 **** --- 32,45 ---- #endif + /* T.Grill - make paths adjustable */ + #ifndef PD_HELP_PATH + #define PD_HELP_PATH "./doc/5.reference" + #endif + + #ifndef PD_EXTRA_PATH + #define PD_EXTRA_PATH "./extra" + #endif + + #ifdef MSW /* T.Grill - for Matju's GUI stuff */ *************** *** 800,804 **** } /* Matju { */ ! else if (!strcmp(*argv,"-console")) { console_scrollback = atoi(argv[1]); --- 810,814 ---- } /* Matju { */ ! else if (!strcmp(*argv,"-console")) { console_scrollback = atoi(argv[1]); *************** *** 841,854 **** char sbuf[MAXPDSTRING]; int i; ! /* add "extra" library to path */ ! strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); ! sbuf[MAXPDSTRING-30] = 0; ! strcat(sbuf, "/extra"); sys_addpath(sbuf); ! /* add "doc/5.reference" library to helppath */ ! strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); ! sbuf[MAXPDSTRING-30] = 0; ! strcat(sbuf, "/doc/5.reference"); sys_addhelppath(sbuf); /* correct to make audio and MIDI device lists zero based. On MMIO, however, "1" really means the second device (the first one --- 851,879 ---- char sbuf[MAXPDSTRING]; int i; ! ! /* add "extra" library to path */ ! if(PD_EXTRA_PATH[0] == '.') { ! /* relative */ ! strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); ! sbuf[MAXPDSTRING-30] = 0; ! strcat(sbuf, "/" PD_EXTRA_PATH); ! } ! else ! /* absolute */ ! strcpy(sbuf, PD_EXTRA_PATH); sys_addpath(sbuf); ! ! /* add "doc/5.reference" library to helppath */ ! if(PD_HELP_PATH[0] == '.') { ! /* relative */ ! strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30); ! sbuf[MAXPDSTRING-30] = 0; ! strcat(sbuf, "/" PD_HELP_PATH); ! } ! else ! /* absolute */ ! strcpy(sbuf, PD_HELP_PATH); sys_addhelppath(sbuf); + /* correct to make audio and MIDI device lists zero based. On MMIO, however, "1" really means the second device (the first one

1 0

externals/sc4pd/source LFDNoise0.cpp,NONE,1.1 LFDNoise1.cpp,NONE,1.1 LFDNoise2.cpp,NONE,1.1 sc*.cpp,NONE,1.1 sc+.cpp,NONE,1.1 sc-.cpp,NONE,1.1 scdiv.cpp,NONE,1.1 main.cpp,1.26,1.27 sc4pd.hpp,1.5,1.6 support.cpp,1.4,1.5 support.hpp,1.8,1.9
by Tim Blechmann 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/sc4pd/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30080/source Modified Files: main.cpp sc4pd.hpp support.cpp support.hpp Added Files: LFDNoise0.cpp LFDNoise1.cpp LFDNoise2.cpp sc*.cpp sc+.cpp sc-.cpp scdiv.cpp Log Message: lfdnoises and interpolating vector/scalar operations Index: support.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/support.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** support.hpp 8 Aug 2004 11:10:30 -0000 1.8 --- support.hpp 9 Sep 2004 08:45:18 -0000 1.9 *************** *** 51,54 **** --- 51,55 ---- float sc_getfloatarg (flext::AtomList a,int i); bool sc_ar(flext::AtomList a); + bool sc_inv(flext::AtomList a); *************** *** 95,99 **** ! /* this is copied from thomas grill's xsample: xsample - extended sample objects for Max/MSP and pd (pure data) --- 96,100 ---- ! /* this is adapted from thomas grill's xsample: xsample - extended sample objects for Max/MSP and pd (pure data) *************** *** 103,134 **** */ - #define F float - #define D double - #define I int - #define L long - #define C char - #define V void - #define BL bool - #define S t_sample - #define SETSIGFUN(VAR,FUN) v_##VAR = FUN ! #define DEFSIGFUN(NAME) V NAME(I n,S *const *in,S *const *out) #define DEFSIGCALL(NAME) \ ! inline V NAME(I n,S *const *in,S *const *out) \ { (this->*v_##NAME)(n,in,out); } \ ! V (thisType::*v_##NAME)(I n,S *const *invecs,S *const *outvecs) #define SIGFUN(FUN) &thisType::FUN - #undef F - #undef D - #undef I - #undef L - #undef C - #undef V - #undef BL - #undef S --- 104,118 ---- */ #define SETSIGFUN(VAR,FUN) v_##VAR = FUN ! #define DEFSIGFUN(NAME) void NAME(int n,t_sample *const *in,t_sample *const *out) #define DEFSIGCALL(NAME) \ ! inline void NAME(int n,t_sample *const *in,t_sample *const *out) \ { (this->*v_##NAME)(n,in,out); } \ ! void (thisType::*v_##NAME)(int n,t_sample *const *invecs,t_sample *const *outvecs) #define SIGFUN(FUN) &thisType::FUN --- NEW FILE: sc-.cpp --- /* sc4pd sc-~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways */ #include "sc4pd.hpp" /* ------------------------ sc-~ -------------------------------*/ class scsub_ar: public sc4pd_dsp { FLEXT_HEADER(scsub_ar,sc4pd_dsp); public: scsub_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); void m_set(float f) { m_nextsubtrahend = f; changed = true; } float m_nextsubtrahend, m_subtrahend; bool changed; bool invert; private: FLEXT_CALLBACK_1(m_set,float); }; FLEXT_LIB_DSP_V("sc-~",scsub_ar); scsub_ar::scsub_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD(1,m_set); //parse arguments AtomList Args(argc,argv); m_subtrahend = sc_getfloatarg(Args,0); invert = sc_inv(Args); AddInSignal("signal"); AddInFloat("scalar"); AddOutSignal(); changed = false; } void scsub_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nin = *in; t_sample *nout = *out; if (invert) { if (changed) { float xb = m_nextsubtrahend; float slope = CALCSLOPE(xb, m_subtrahend); for (int i = 0; i!=n; ++i) { ZXP(nout) = xb - ZXP(nin); xb += slope; } m_subtrahend = xb; changed = false; } else { float xb = m_subtrahend; for (int i = 0; i!=n; ++i) { ZXP(nout) = xb - ZXP(nin); } } } else { if (changed) { float xb = m_nextsubtrahend; float slope = CALCSLOPE(xb, m_subtrahend); for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) - xb; xb += slope; } m_subtrahend = xb; changed = false; } else { float xb = m_subtrahend; for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) - xb; } } } } Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** main.cpp 8 Aug 2004 17:30:20 -0000 1.26 --- main.cpp 9 Sep 2004 08:45:18 -0000 1.27 *************** *** 67,72 **** " TwoZero~, FOS(~), SOS~, RLPF~, RHPF~, LPF~, HPF~, BPF~, " "BRF~,\n" ! " LPZ1(~), HPZ1(~), LPZ2(~), HPZ2(~), BPZ2(~), BRZ2(~)" ! "\n" ); --- 67,73 ---- " TwoZero~, FOS(~), SOS~, RLPF~, RHPF~, LPF~, HPF~, BPF~, " "BRF~,\n" ! " LPZ1(~), HPZ1(~), LPZ2(~), HPZ2(~), BPZ2(~), BRZ2(~), " ! "LFDNoise0~,\n" ! " LFDNoise1~, LFDNoise2~, sc+~, sc-~, sc*~, sc/~\n" ); *************** *** 282,285 **** --- 283,300 ---- FLEXT_DSP_SETUP(BPZ2_ar); FLEXT_SETUP(BPZ2_kr); + + FLEXT_DSP_SETUP(LFDNoise0_ar); + + FLEXT_DSP_SETUP(LFDNoise1_ar); + + FLEXT_DSP_SETUP(LFDNoise2_ar); + + FLEXT_DSP_SETUP(scadd_ar); + + FLEXT_DSP_SETUP(scsub_ar); + + FLEXT_DSP_SETUP(scmul_ar); + + FLEXT_DSP_SETUP(scdiv_ar); } --- NEW FILE: sc+.cpp --- /* sc4pd sc+~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways Past */ #include "sc4pd.hpp" /* ------------------------ sc+~ -------------------------------*/ class scadd_ar: public sc4pd_dsp { FLEXT_HEADER(scadd_ar,sc4pd_dsp); public: scadd_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); void m_set(float f) { m_nextsummand = f; changed = true; } float m_nextsummand, m_summand; bool changed; private: FLEXT_CALLBACK_1(m_set,float); }; FLEXT_LIB_DSP_V("sc+~",scadd_ar); scadd_ar::scadd_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD(1,m_set); //parse arguments AtomList Args(argc,argv); m_summand = sc_getfloatarg(Args,0); AddInSignal("signal"); AddInFloat("scalar"); AddOutSignal(); changed = false; } void scadd_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nin = *in; t_sample *nout = *out; if (changed) { float xb = m_nextsummand; float slope = CALCSLOPE(xb, m_summand); for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) + xb; xb += slope; } m_summand = xb; changed = false; } else { float xb = m_summand; for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) + xb; } } } --- NEW FILE: sc*.cpp --- /* sc4pd sc*~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways */ #include "sc4pd.hpp" /* ------------------------ sc*~ -------------------------------*/ class scmul_ar: public sc4pd_dsp { FLEXT_HEADER(scmul_ar,sc4pd_dsp); public: scmul_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); void m_set(float f) { m_nextfactor = f; changed = true; } float m_nextfactor, m_factor; bool changed; private: FLEXT_CALLBACK_1(m_set,float); }; FLEXT_LIB_DSP_V("sc*~",scmul_ar); scmul_ar::scmul_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD(1,m_set); //parse arguments AtomList Args(argc,argv); m_factor = sc_getfloatarg(Args,0); AddInSignal("signal"); AddInFloat("scalar"); AddOutSignal(); changed = false; } void scmul_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nin = *in; t_sample *nout = *out; if (changed) { float xb = m_nextfactor; float slope = CALCSLOPE(xb, m_factor); for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) * xb; xb += slope; } m_factor = xb; changed = false; } else { float xb = m_factor; for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) * xb; } } } --- NEW FILE: LFDNoise0.cpp --- /* sc4pd LFDNoise0~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com * * DynNoiseUGens.cpp * xSC3plugins * * Created by Alberto de Campo, Sekhar Ramacrishnan, Julian Rohrhuber on Sun May 30 2004. * Copyright (c) 2004 HfbK. All rights reserved. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways Past */ #include "sc4pd.hpp" /* ------------------------ LFDNoise0~ -------------------------------*/ class LFDNoise0_ar: public sc4pd_dsp { FLEXT_HEADER(LFDNoise0_ar,sc4pd_dsp); public: LFDNoise0_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out); void m_seed(int i) { rgen.init(i); } void m_set(float f) { m_freq = f; } private: RGen rgen; float m_freq; float m_level; float m_phase; float m_smpdur; bool m_ar; FLEXT_CALLBACK_I(m_seed); FLEXT_CALLBACK_F(m_set); }; FLEXT_LIB_DSP_V("LFDNoise0~",LFDNoise0_ar); LFDNoise0_ar::LFDNoise0_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD_(0,"seed",m_seed); FLEXT_ADDMETHOD_(0,"set",m_set); //parse arguments AtomList Args(argc,argv); m_freq = sc_getfloatarg(Args,0); m_phase=0.f; m_level=0.f; rgen.init(timeseed()); m_ar = sc_ar(Args); if (m_ar) AddInSignal("freqency"); else AddInSignal("\"set\" frequency"); AddOutSignal(); } void LFDNoise0_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { m_smpdur = sc_sampledur(); } void LFDNoise0_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; float level = m_level; float phase = m_phase; RGET; if (m_ar) { t_sample *nin = *in; float smpdur = m_smpdur; for (int i = 0; i!= n; ++i) { phase -= ZXP(nin) * smpdur; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); level = frand2(s1,s2,s3); } ZXP(nout) = level; } } else { float dphase = m_smpdur * m_freq; for (int i = 0; i!= n; ++i) { phase -= dphase; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); level = frand2(s1,s2,s3); } ZXP(nout) = level; } } m_level = level; m_phase = phase; RPUT; } --- NEW FILE: LFDNoise2.cpp --- /* sc4pd LFDNoise2~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com * * DynNoiseUGens.cpp * xSC3plugins * * Created by Alberto de Campo, Sekhar Ramacrishnan, Julian Rohrhuber on Sun May 30 2004. * Copyright (c) 2004 HfbK. All rights reserved. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways Past */ #include "sc4pd.hpp" /* ------------------------ LFDNoise2~ -------------------------------*/ class LFDNoise2_ar: public sc4pd_dsp { FLEXT_HEADER(LFDNoise2_ar,sc4pd_dsp); public: LFDNoise2_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out); void m_seed(int i) { rgen.init(i); } void m_set(float f) { m_freq = f; } private: RGen rgen; float m_freq; float m_levela, m_levelb, m_levelc, m_leveld; float m_phase; float m_smpdur; bool m_ar; FLEXT_CALLBACK_I(m_seed); FLEXT_CALLBACK_F(m_set); }; FLEXT_LIB_DSP_V("LFDNoise2~",LFDNoise2_ar); LFDNoise2_ar::LFDNoise2_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD_(0,"seed",m_seed); FLEXT_ADDMETHOD_(0,"set",m_set); //parse arguments AtomList Args(argc,argv); m_freq = sc_getfloatarg(Args,0); rgen.init(timeseed()); RGET; m_phase=0.f; m_levela = frand2(s1, s2, s3) * 0.8f;// limits max interpol. overshoot to 1. m_levelb = frand2(s1, s2, s3) * 0.8f; m_levelc = frand2(s1, s2, s3) * 0.8f; m_leveld = frand2(s1, s2, s3) * 0.8f; RPUT; m_ar = sc_ar(Args); if (m_ar) AddInSignal("freqency"); else AddInSignal("\"set\" frequency"); AddOutSignal(); } void LFDNoise2_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { m_smpdur = sc_sampledur(); } void LFDNoise2_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; float a = m_levela; float b = m_levelb; float c = m_levelc; float d = m_leveld; float phase = m_phase; RGET; if (m_ar) { t_sample *nin = *in; float smpdur = m_smpdur; for (int i = 0; i!= n; ++i) { phase -= ZXP(nin) * smpdur; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); a = b; b = c; c = d; d = frand2(s1,s2,s3) * 0.8f; // limits max interpol. overshoot to 1. } ZXP(nout) = cubicinterp(1.f - phase, a, b, c, d); } } else { float dphase = m_smpdur * m_freq; for (int i = 0; i!= n; ++i) { phase -= dphase; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); a = b; b = c; c = d; d = frand2(s1,s2,s3) * 0.8f; // limits max interpol. overshoot to 1. } ZXP(nout) = cubicinterp(1.f - phase, a, b, c, d); } } m_phase = phase; m_levela = a; m_levelb = b; m_levelc = c; m_leveld = d; RPUT; } Index: support.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/support.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** support.cpp 2 Aug 2004 19:18:22 -0000 1.4 --- support.cpp 9 Sep 2004 08:45:18 -0000 1.5 *************** *** 78,91 **** } ! // macros to put rgen state in registers ! #define RGET \ ! uint32 s1 = rgen.s1; \ ! uint32 s2 = rgen.s2; \ ! uint32 s3 = rgen.s3; ! ! #define RPUT \ ! rgen.s1 = s1; \ ! rgen.s2 = s2; \ ! rgen.s3 = s3; int32 timeseed() --- 78,95 ---- } ! bool sc_inv(flext::AtomList a) ! { ! for (int i = 0; i!=a.Count();++i) ! { ! if ( flext::IsSymbol(a[i]) ) ! { ! const char * teststring; ! teststring = flext::GetString(a[i]); ! if((strcmp(teststring,"inv"))==0) ! return true; ! } ! } ! return false; ! } int32 timeseed() --- NEW FILE: LFDNoise1.cpp --- /* sc4pd LFDNoise1~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com * * DynNoiseUGens.cpp * xSC3plugins * * Created by Alberto de Campo, Sekhar Ramacrishnan, Julian Rohrhuber on Sun May 30 2004. * Copyright (c) 2004 HfbK. All rights reserved. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways Past */ #include "sc4pd.hpp" /* ------------------------ LFDNoise1~ -------------------------------*/ class LFDNoise1_ar: public sc4pd_dsp { FLEXT_HEADER(LFDNoise1_ar,sc4pd_dsp); public: LFDNoise1_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out); void m_seed(int i) { rgen.init(i); } void m_set(float f) { m_freq = f; } private: RGen rgen; float m_freq; float m_prevlevel; float m_nextlevel; float m_phase; float m_smpdur; bool m_ar; FLEXT_CALLBACK_I(m_seed); FLEXT_CALLBACK_F(m_set); }; FLEXT_LIB_DSP_V("LFDNoise1~",LFDNoise1_ar); LFDNoise1_ar::LFDNoise1_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD_(0,"seed",m_seed); FLEXT_ADDMETHOD_(0,"set",m_set); //parse arguments AtomList Args(argc,argv); m_freq = sc_getfloatarg(Args,0); rgen.init(timeseed()); m_phase=0.f; m_prevlevel=0.f; m_nextlevel = rgen.frand2(); m_ar = sc_ar(Args); if (m_ar) AddInSignal("freqency"); else AddInSignal("\"set\" frequency"); AddOutSignal(); } void LFDNoise1_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { m_smpdur = sc_sampledur(); } void LFDNoise1_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; float prevLevel = m_prevlevel; float nextLevel = m_nextlevel; float phase = m_phase; RGET; if (m_ar) { t_sample *nin = *in; float smpdur = m_smpdur; for (int i = 0; i!= n; ++i) { phase -= ZXP(nin) * smpdur; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); prevLevel = nextLevel; nextLevel = frand2(s1,s2,s3); } ZXP(nout) = nextLevel + ( phase * (prevLevel - nextLevel) ); } } else { float dphase = m_smpdur * m_freq; for (int i = 0; i!= n; ++i) { phase -= dphase; if (phase <= 0) { phase = sc_wrap(phase, 0.f, 1.f); prevLevel = nextLevel; nextLevel = frand2(s1,s2,s3); } ZXP(nout) = nextLevel + ( phase * (prevLevel - nextLevel) ); } } m_prevlevel = prevLevel; m_nextlevel = nextLevel; m_phase = phase; RPUT; } Index: sc4pd.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/sc4pd.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sc4pd.hpp 7 Aug 2004 20:43:57 -0000 1.5 --- sc4pd.hpp 9 Sep 2004 08:45:18 -0000 1.6 *************** *** 125,128 **** ! #define _SC$PD_HPP #endif --- 125,128 ---- ! #define _SC4PD_HPP #endif --- NEW FILE: scdiv.cpp --- /* sc4pd sc/~ Copyright (c) 2004 Tim Blechmann. This code is derived from: SuperCollider real time audio synthesis system Copyright (c) 2002 James McCartney. All rights reserved. http://www.audiosynth.com This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Based on: PureData by Miller Puckette and others. http://www.crca.ucsd.edu/~msp/software.html FLEXT by Thomas Grill http://www.parasitaere-kapazitaeten.net/ext SuperCollider by James McCartney http://www.audiosynth.com Coded while listening to: Phil Minton & Veryan Weston: Ways */ #include "sc4pd.hpp" /* ------------------------ sc/~ -------------------------------*/ class scdiv_ar: public sc4pd_dsp { FLEXT_HEADER(scdiv_ar,sc4pd_dsp); public: scdiv_ar(int argc, t_atom *argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); void m_set(float f) { m_nextdivisor = f; changed = true; } float m_nextdivisor, m_divisor; bool changed; bool invert; private: FLEXT_CALLBACK_1(m_set,float); }; FLEXT_LIB_DSP_V("sc/~",scdiv_ar); scdiv_ar::scdiv_ar(int argc, t_atom *argv) { FLEXT_ADDMETHOD(1,m_set); //parse arguments AtomList Args(argc,argv); m_divisor = sc_getfloatarg(Args,0); invert = sc_inv(Args); AddInSignal("signal"); AddInFloat("scalar"); AddOutSignal(); changed = false; } void scdiv_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nin = *in; t_sample *nout = *out; if (invert) { if (changed) { float xb = m_nextdivisor; float slope = CALCSLOPE(xb, m_divisor); for (int i = 0; i!=n; ++i) { ZXP(nout) = xb / ZXP(nin); xb += slope; } m_divisor = xb; changed = false; } else { float xb = m_divisor; for (int i = 0; i!=n; ++i) { ZXP(nout) = xb / ZXP(nin); } } } else { if (changed) { float xb = m_nextdivisor; float slope = CALCSLOPE(xb, m_divisor); for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) / xb; xb += slope; } m_divisor = xb; changed = false; } else { float xb = m_divisor; for (int i = 0; i!=n; ++i) { ZXP(nout) = ZXP(nin) / xb; } } } }

1 0

externals/sc4pd config-pd-linux.txt,1.8,1.9 make-files.txt,1.24,1.25
by Tim Blechmann 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/sc4pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30080 Modified Files: config-pd-linux.txt make-files.txt Log Message: lfdnoises and interpolating vector/scalar operations Index: config-pd-linux.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/config-pd-linux.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config-pd-linux.txt 8 Aug 2004 11:10:29 -0000 1.8 --- config-pd-linux.txt 9 Sep 2004 08:45:15 -0000 1.9 *************** *** 2,6 **** # your c++ compiler (if not g++) ! CXX=icc --- 2,6 ---- # your c++ compiler (if not g++) ! # CXX=icc *************** *** 30,35 **** # (check whether they fit to your system!) #UFLAGS=-xN -tpp7 -ip -ipo_obj # icc ! UFLAGS=-g -mcpu=pentium4 -mmmx -msse2 -msse -mfpmath=sse # gcc 3.2 ! # define to link against shared flext library (flext version >= 0.5.0) --- 30,34 ---- # (check whether they fit to your system!) #UFLAGS=-xN -tpp7 -ip -ipo_obj # icc ! UFLAGS=-march=pentium4 -mmmx -msse2 -msse -mfpmath=sse -g # gcc 3.2 # define to link against shared flext library (flext version >= 0.5.0) Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/make-files.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** make-files.txt 8 Aug 2004 17:30:20 -0000 1.24 --- make-files.txt 9 Sep 2004 08:45:16 -0000 1.25 *************** *** 16,18 **** TwoPole.cpp TwoZero.cpp FOS.cpp SOS.cpp RLPF.cpp RHPF.cpp LPF.cpp \ HPF.cpp BPF.cpp BRF.cpp LPZ1.cpp HPZ1.cpp LPZ2.cpp HPZ2.cpp \ ! BPZ2.cpp BRZ2.cpp --- 16,19 ---- TwoPole.cpp TwoZero.cpp FOS.cpp SOS.cpp RLPF.cpp RHPF.cpp LPF.cpp \ HPF.cpp BPF.cpp BRF.cpp LPZ1.cpp HPZ1.cpp LPZ2.cpp HPZ2.cpp \ ! BPZ2.cpp BRZ2.cpp LFDNoise0.cpp LFDNoise1.cpp LFDNoise2.cpp \ ! sc+.cpp sc-.cpp

1 0

externals/sc4pd/pd lfdnoise0.pd,NONE,1.1
by Tim Blechmann 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/sc4pd/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30080/pd Added Files: lfdnoise0.pd Log Message: lfdnoises and interpolating vector/scalar operations --- NEW FILE: lfdnoise0.pd --- #N canvas 0 0 450 300 10; #X obj 133 22 LFDNoise0~ 100; #X obj 131 56 dac~; #X connect 0 0 1 0; #X connect 0 0 1 1;

1 0

externals/grill/py/source bound.cpp,1.10,1.11 pyext.cpp,1.19,1.20 pyext.h,1.15,1.16
by Thomas Grill 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20494/source Modified Files: bound.cpp pyext.cpp pyext.h Log Message: "" Index: pyext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pyext.h 21 Aug 2004 04:13:48 -0000 1.15 --- pyext.h 9 Sep 2004 04:06:33 -0000 1.16 *************** *** 66,69 **** --- 66,71 ---- static pyext *GetThis(PyObject *self); + void SetThis(); + V ClearBinding(); BL MakeInstance(); Index: bound.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/bound.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bound.cpp 31 Aug 2004 04:07:35 -0000 1.10 --- bound.cpp 9 Sep 2004 04:06:33 -0000 1.11 *************** *** 133,136 **** --- 133,138 ---- if(!pyobj) return; + FLEXT_ASSERT(GetThis(pyobj)); + void *data = NULL; const t_symbol *sym = NULL; Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pyext.cpp 31 Aug 2004 04:07:35 -0000 1.19 --- pyext.cpp 9 Sep 2004 04:06:33 -0000 1.20 *************** *** 88,91 **** --- 88,98 ---- } + void pyext::SetThis() + { + // remember the this pointer + PyObject *th = PyLong_FromVoidPtr(this); + int ret = PyObject_SetAttrString(pyobj,"_this",th); // ref is taken + } + #if FLEXT_SYS == FLEXT_SYS_MAX *************** *** 255,263 **** BL pyext::DoInit() { ! // remember the this pointer ! PyObject *th = PyLong_FromVoidPtr(this); ! int ret = PyObject_SetAttrString(pyobj,"_this",th); // ref is taken ! // call init now, after _this has been set, which is // important for eventual callbacks from __init__ to c PyObject *pargs = MakePyArgs(NULL,args.Count(),args.Atoms(),-1,true); --- 262,268 ---- BL pyext::DoInit() { ! SetThis(); ! // call init now, after _this has been set, which is // important for eventual callbacks from __init__ to c PyObject *pargs = MakePyArgs(NULL,args.Count(),args.Atoms(),-1,true); *************** *** 331,334 **** --- 336,341 ---- Register("_pyext"); // self + SetThis(); + PY_UNLOCK }

1 0

externals/grill/py py.vcproj,1.7,1.8 readme.txt,1.19,1.20
by Thomas Grill 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20494 Modified Files: py.vcproj readme.txt Log Message: "" Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** py.vcproj 21 Jun 2004 14:04:14 -0000 1.7 --- py.vcproj 9 Sep 2004 04:06:32 -0000 1.8 *************** *** 4,7 **** --- 4,8 ---- Version="7.10" Name="py" + ProjectGUID="{98512688-BE2E-4C17-A7D4-92BC21DC6FFE}" SccProjectName="py" SccAuxPath="" *************** *** 292,303 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib pthreadVC.lib" OutputFile="$(outdir)/py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""f:\prog\pd\pd-cvs/bin";f:\prog\packs\pthreads;"f:\prog\packs\Python-2.3.2\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\td/py.pdb" ! ImportLibrary=".\pd-msvc\td/py.lib" TargetMachine="1"/> <Tool --- 293,304 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="flext_ld.lib pd.lib pthreadVC.lib" OutputFile="$(outdir)/py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;"f:\prog\pd\pd-cvs/bin";f:\prog\packs\pthreads;"f:\prog\packs\Python-2.3.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\td/py.pdb" ! ImportLibrary=".\pd-msvc\sd/py.lib" TargetMachine="1"/> <Tool *************** *** 342,346 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\packs\pthreads;f:\prog\max\flext\source,C:\Programme\prog\Python22\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" --- 343,347 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=""f:\prog\pd\pd-cvs\src";f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" *************** *** 356,366 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib pthreadVC.lib" OutputFile="$(outdir)\py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\pd\pd-cvs/bin;f:\prog\packs\pthreads,C:\Programme\prog\Python22\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ! ImportLibrary=".\pd-msvc\tr/py.lib" TargetMachine="1"/> <Tool --- 357,367 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="flext_l.lib pd.lib pthreadVC.lib" OutputFile="$(outdir)\py.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;"f:\prog\pd\pd-cvs/bin";f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ! ImportLibrary=".\pd-msvc\sr/py.lib" TargetMachine="1"/> <Tool Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** readme.txt 31 Aug 2004 04:07:34 -0000 1.19 --- readme.txt 9 Sep 2004 04:06:32 -0000 1.20 *************** *** 86,89 **** --- 86,90 ---- - ADD: better (and independent) handling of inlet and outlet count (as class variables or dynamically initialized in __init__) - FIX: many memory leaks associated to ***GetItem stuff (big thanks to sven!) + - FIX: set "this" memory in object after reloading script 0.1.3:

1 0

externals/grill/flext/source flattr.cpp,1.24,1.25 flattr_ed.cpp,1.21,1.22 flext.cpp,1.28,1.29
by Thomas Grill 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19518/source Modified Files: flattr.cpp flattr_ed.cpp flext.cpp Log Message: "" Index: flattr_ed.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flattr_ed.cpp 21 Jun 2004 13:58:19 -0000 1.21 --- flattr_ed.cpp 9 Sep 2004 04:00:46 -0000 1.22 *************** *** 79,148 **** sys_gui( ! "proc flext_apply {id alen} {\n" // strip "." from the TK id to make a variable name suffix "set vid [string trimleft $id .]\n" ! // make a list of the attribute values (including save flags) "set lst {}\n" - "for {set ix 1} {$ix <= $alen} {incr ix} {\n" - "set var_attr_name [concat [concat var_name_$ix]_$vid ]\n" - "set var_attr_init [concat [concat var_init_$ix]_$vid ]\n" - "set var_attr_val [concat [concat var_val_$ix]_$vid ]\n" - "set var_attr_save [concat [concat var_save_$ix]_$vid ]\n" - "set var_attr_type [concat [concat var_type_$ix]_$vid ]\n" ! "global $var_attr_name $var_attr_init $var_attr_val $var_attr_save $var_attr_type\n" ! ! "if { [expr $$var_attr_type] != 0 } {\n" ! // attribute is puttable ! "lappend lst [eval concat $$var_attr_name]\n" ! // process current value ! "set tmp [eval concat $$var_attr_val]\n" ! "set len [llength $tmp]\n" ! "if { $len == 1 } {\n" ! // it's an atom ! // if atom starts with $, replace it by # ($ can't be passed by TCL) ! "if { [string index $tmp 0] == \"$\" } {\n" ! "set tmp [string replace $tmp 0 0 #]\n" ! "}\n" ! "lappend lst $tmp\n" ! "} else {\n" ! // it's a list ! "set lst [concat $lst {list} $len $tmp]\n" ! "}\n" ! // process init value ! "set tmp [eval concat $$var_attr_init]\n" ! "set len [llength $tmp]\n" ! "if { $len == 1 } {\n" ! // it's an atom ! // if atom starts with $, replace it by # ($ can't be passed by TCL) ! "if { [string index $tmp 0] == \"$\" } {\n" ! "set tmp [string replace $tmp 0 0 #]\n" ! "}\n" ! "lappend lst $tmp\n" ! "} else {\n" ! // it's a list ! "set lst [concat $lst {list} $len $tmp]\n" ! "}\n" ! "lappend lst [eval concat $$var_attr_save]\n" ! "}\n" "}\n" ! "set cmd [concat $id attributedialog $lst \\;]\n" ! "pd $cmd\n" "}\n" "proc flext_cancel {id} {\n" ! "set cmd [concat $id cancel \\;]\n" ! "pd $cmd\n" "}\n" "proc flext_ok {id alen} {\n" ! "flext_apply $id $alen\n" "flext_cancel $id\n" "}\n" --- 79,151 ---- sys_gui( ! "proc flext_escatoms {lst} {\n" ! "set tmp {}\n" ! "foreach a $lst {\n" ! "set a [regsub {\\$} $a \\\\$]\n" // replace $ with \$ ! "set a [regsub {,} $a \\\\,]\n" // replace , with \, ! "set a [regsub {;} $a \\\\\\;]\n" // replace ; with \; ! "lappend tmp $a\n" ! "}\n" ! "return $tmp\n" ! "}\n" ! ! "proc flext_makevalue {id ix} {\n" // strip "." from the TK id to make a variable name suffix "set vid [string trimleft $id .]\n" ! "set var_attr_name [concat [concat var_name_$ix]_$vid ]\n" ! "set var_attr_init [concat [concat var_init_$ix]_$vid ]\n" ! "set var_attr_val [concat [concat var_val_$ix]_$vid ]\n" ! "set var_attr_save [concat [concat var_save_$ix]_$vid ]\n" ! "set var_attr_type [concat [concat var_type_$ix]_$vid ]\n" ! ! "global $var_attr_name $var_attr_init $var_attr_val $var_attr_save $var_attr_type\n" "set lst {}\n" ! "if { [expr $$var_attr_type] != 0 } {\n" ! // attribute is puttable ! "lappend lst [eval concat $$var_attr_name]\n" ! // process current value ! "set tmp [flext_escatoms [eval concat $$var_attr_val]]\n" ! "set lst [concat $lst [llength $tmp] $tmp]\n" ! // process init value ! "set tmp [flext_escatoms [eval concat $$var_attr_init]]\n" ! "set lst [concat $lst [llength $tmp] $tmp]\n" ! "lappend lst [eval concat $$var_attr_save]\n" "}\n" ! // return list ! "return $lst\n" ! "}\n" ! ! "proc flext_apply {id ix} {\n" ! "set lst [flext_makevalue $id $ix]\n" ! "set lst [eval concat $lst]\n" // remove curly braces from character escaping ! "pd [concat $id attributedialog $lst \\;]\n" ! "}\n" ! ! "proc flext_applyall {id alen} {\n" ! // make a list of the attribute values (including save flags) ! ! "set lst {}\n" ! "for {set ix 1} {$ix <= $alen} {incr ix} {\n" ! "set lst [concat $lst [flext_makevalue $id $ix]]\n" ! "}\n" ! "set lst [eval concat $lst]\n" // remove curly braces from character escaping ! ! "pd [concat $id attributedialog $lst \\;]\n" "}\n" "proc flext_cancel {id} {\n" ! "pd [concat $id cancel \\;]\n" "}\n" "proc flext_ok {id alen} {\n" ! "flext_applyall $id $alen\n" "flext_cancel $id\n" "}\n" *************** *** 182,186 **** "proc flext_textcopy {id idtxt var} {\n" "global $var\n" ! "set $var [eval $idtxt get 0.0 end]\n" "destroy $id\n" "}\n" --- 185,193 ---- "proc flext_textcopy {id idtxt var} {\n" "global $var\n" ! "set txt [eval $idtxt get 0.0 end]\n" ! // strip newline characters ! "set tmp {}\n" ! "foreach t $txt { lappend tmp [string trim $t] }\n" ! "set $var $tmp\n" "destroy $id\n" "}\n" *************** *** 201,205 **** "pack $id.w.text -expand yes -fill both\n" ! "$id.w.text insert 0.0 [expr $$var]\n" "$id.w.text mark set insert 0.0\n" --- 208,220 ---- "pack $id.w.text -expand yes -fill both\n" ! // insert text with newlines ! "set txt [split [expr $$var] ,]\n" ! "set lines [llength $txt]\n" ! "for {set ix 0} {$ix < ($lines-1)} {incr ix} {\n" ! "$id.w.text insert end [string trim [lindex $txt $ix] ]\n" ! "$id.w.text insert end \" ,\\n\"\n" ! "}\n" ! "$id.w.text insert end [string trim [lindex $txt end] ]\n" ! "$id.w.text mark set insert 0.0\n" *************** *** 230,234 **** "grid columnconfigure $id {1 4} -weight 3\n" // value entry "grid columnconfigure $id {2 3} -weight 0\n" // copy buttons ! "grid columnconfigure $id {5 6 7} -weight 0\n" // radio buttons // "grid rowconfigure $id {0 1 2} -weight 0\n" --- 245,250 ---- "grid columnconfigure $id {1 4} -weight 3\n" // value entry "grid columnconfigure $id {2 3} -weight 0\n" // copy buttons ! "grid columnconfigure $id 5 -weight 1\n" // apply button ! "grid columnconfigure $id {6 7 8} -weight 0\n" // radio buttons // "grid rowconfigure $id {0 1 2} -weight 0\n" *************** *** 239,242 **** --- 255,259 ---- "label $id.copy -text {copy} -height 2 -font {Helvetica 9 bold}\n" "label $id.val -text {current value} -height 2 -font {Helvetica 9 bold}\n" + "label $id.apply -text {} -height 2 -font {Helvetica 9 bold}\n" // why must this be empty? "foreach {i txt} {0 {don't\rsave} 1 {do\rinit} 2 {always\rsave} } {\n" "label $id.b$i -text $txt -height 2 -font {Helvetica 9 bold}\n" *************** *** 248,252 **** "grid config $id.copy -column 2 -columnspan 2 -row $row \n" "grid config $id.val -column 4 -row $row \n" ! "foreach i {0 1 2} { grid config $id.b$i -column [expr $i + 5] -row $row }\n" // "grid config $id.options -column 3 -row 0 \n" "incr row\n" --- 265,270 ---- "grid config $id.copy -column 2 -columnspan 2 -row $row \n" "grid config $id.val -column 4 -row $row \n" ! "grid config $id.apply -column 5 -row $row \n" ! "foreach i {0 1 2} { grid config $id.b$i -column [expr $i + 6] -row $row }\n" // "grid config $id.options -column 3 -row 0 \n" "incr row\n" *************** *** 254,258 **** // Separator "frame $id.sep -relief ridge -bd 1 -height 2\n" ! "grid config $id.sep -column 0 -columnspan 8 -row $row -pady 2 -sticky {snew}\n" "incr row\n" --- 272,276 ---- // Separator "frame $id.sep -relief ridge -bd 1 -height 2\n" ! "grid config $id.sep -column 0 -columnspan 9 -row $row -pady 2 -sticky {snew}\n" "incr row\n" *************** *** 323,326 **** --- 341,345 ---- "grid config $id.val-$ix -column 4 -row $row -padx 5 -sticky {ew}\n" + // copy buttons "button $id.b2i-$ix -text {<-} -height 1 -command \" flext_copyval $var_attr_init $var_attr_val \"\n" "grid config $id.b2i-$ix -column 2 -row $row -sticky {ew}\n" *************** *** 328,331 **** --- 347,354 ---- "grid config $id.b2c-$ix -column 3 -row $row -sticky {ew}\n" + // apply button + "button $id.apply-$ix -text {Apply} -height 1 -command \" flext_apply $id $ix \"\n" + "grid config $id.apply-$ix -column 5 -row $row -sticky {ew}\n" + // "tk_optionMenu $id.opt-$ix $var_attr_save {don't save} {initialize} {always save}\n" // "grid config $id.opt-$ix -column 5 -row $ix \n" *************** *** 334,338 **** "foreach {i c} {0 black 1 blue 2 red} {\n" "radiobutton $id.b$i-$ix -value $i -foreground $c -variable $var_attr_save \n" ! "grid config $id.b$i-$ix -column [expr $i + 5] -row $row \n" "}\n" "} else {\n" --- 357,361 ---- "foreach {i c} {0 black 1 blue 2 red} {\n" "radiobutton $id.b$i-$ix -value $i -foreground $c -variable $var_attr_save \n" ! "grid config $id.b$i-$ix -column [expr $i + 6] -row $row \n" "}\n" "} else {\n" *************** *** 362,366 **** "label $id.readonly-$ix -text \"read-only\"\n" ! "grid config $id.readonly-$ix -column 5 -columnspan 3 -row $row -padx 5 -sticky {ew}\n" "}\n" --- 385,389 ---- "label $id.readonly-$ix -text \"read-only\"\n" ! "grid config $id.readonly-$ix -column 6 -columnspan 3 -row $row -padx 5 -sticky {ew}\n" "}\n" *************** *** 373,377 **** "frame $id.sep2 -relief ridge -bd 1 -height 2\n" // "grid rowconfigure $id $row -weight 0\n" ! "grid config $id.sep2 -column 0 -columnspan 8 -row $row -pady 5 -sticky {snew}\n" "incr row\n" --- 396,400 ---- "frame $id.sep2 -relief ridge -bd 1 -height 2\n" // "grid rowconfigure $id $row -weight 0\n" ! "grid config $id.sep2 -column 0 -columnspan 9 -row $row -pady 5 -sticky {snew}\n" "incr row\n" *************** *** 380,386 **** "pack $id.buttonframe -side bottom -fill x\n" ! "button $id.buttonframe.cancel -text {Cancel} -width 20 -command \" flext_cancel $id \"\n" ! "button $id.buttonframe.apply -text {Apply} -width 20 -command \" flext_apply $id $alen \"\n" ! "button $id.buttonframe.ok -text {OK} -width 20 -command \" flext_ok $id $alen \"\n" "button $id.buttonframe.help -text {Help} -width 10 -command \" flext_help $id \"\n" --- 403,409 ---- "pack $id.buttonframe -side bottom -fill x\n" ! "button $id.buttonframe.cancel -text {Leave} -width 20 -command \" flext_cancel $id \"\n" ! "button $id.buttonframe.apply -text {Apply all} -width 20 -command \" flext_applyall $id $alen \"\n" ! "button $id.buttonframe.ok -text {Apply & Leave} -width 20 -command \" flext_ok $id $alen \"\n" "button $id.buttonframe.help -text {Help} -width 10 -command \" flext_help $id \"\n" *************** *** 391,400 **** // "grid rowconfigure $id $row -weight 0\n" ! "grid config $id.buttonframe -column 0 -columnspan 8 -row $row -pady 5 -sticky {ew}\n" // Key bindings "bind $id {<KeyPress-Escape>} \" flext_cancel $id \"\n" "bind $id {<KeyPress-Return>} \" flext_ok $id $alen \"\n" ! "bind $id {<Shift-KeyPress-Return>} \" flext_apply $id $alen \"\n" "}\n" ); --- 414,423 ---- // "grid rowconfigure $id $row -weight 0\n" ! "grid config $id.buttonframe -column 0 -columnspan 9 -row $row -pady 5 -sticky {ew}\n" // Key bindings "bind $id {<KeyPress-Escape>} \" flext_cancel $id \"\n" "bind $id {<KeyPress-Return>} \" flext_ok $id $alen \"\n" ! "bind $id {<Shift-KeyPress-Return>} \" flext_applyall $id $alen \"\n" "}\n" ); *************** *** 622,629 **** bool flext_base::cb_AttrDialog(flext_base *th,int argc,const t_atom *argv) { ! int i = 0; ! if(IsSymbol(argv[i]) && GetSymbol(argv[i]) == sym_list) ++i; ! ! for(; i < argc; ) { FLEXT_ASSERT(IsSymbol(argv[i])); --- 645,649 ---- bool flext_base::cb_AttrDialog(flext_base *th,int argc,const t_atom *argv) { ! for(int i = 0; i < argc; ) { FLEXT_ASSERT(IsSymbol(argv[i])); *************** *** 633,657 **** // get current value int ccnt,coffs; ! if(IsSymbol(argv[i]) && GetSymbol(argv[i]) == sym_list) { ! i++; ! FLEXT_ASSERT(CanbeInt(argv[i])); ! ccnt = GetAInt(argv[i]); ! coffs = ++i; ! } ! else ! coffs = i,ccnt = 1; i += ccnt; // get init value int icnt,ioffs; ! if(IsSymbol(argv[i]) && GetSymbol(argv[i]) == sym_list) { ! i++; ! FLEXT_ASSERT(CanbeInt(argv[i])); ! icnt = GetAInt(argv[i]); ! ioffs = ++i; ! } ! else ! ioffs = i,icnt = 1; i += icnt; --- 653,667 ---- // get current value + FLEXT_ASSERT(CanbeInt(argv[i])); int ccnt,coffs; ! ccnt = GetAInt(argv[i]); ! coffs = ++i; i += ccnt; // get init value + FLEXT_ASSERT(CanbeInt(argv[i])); int icnt,ioffs; ! icnt = GetAInt(argv[i]); ! ioffs = ++i; i += icnt; Index: flattr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flattr.cpp 24 Aug 2004 02:34:30 -0000 1.24 --- flattr.cpp 9 Sep 2004 04:00:46 -0000 1.25 *************** *** 49,52 **** --- 49,54 ---- AttrItem *a,*b; + FLEXT_ASSERT(asym != sym__ && asym != sym_list && asym != sym_float && asym != sym_symbol && asym != sym_anything); + if(sfun) // if commented out, there will be a warning at run-time (more user-friendly) { *************** *** 239,245 **** case a_symbol: if(argc == 1 && IsSymbol(argv[0])) { ! // \todo shall we analyze the patcher args???? ! // any.st = const_cast<t_symbol *>(GetParamSym(GetSymbol(argv[0]),thisCanvas())); ! any.st = GetSymbol(argv[0]); ((methfun_1)a->fun)(this,any); } --- 241,247 ---- case a_symbol: if(argc == 1 && IsSymbol(argv[0])) { ! t_atom at; ! GetParamSym(at,GetSymbol(argv[0]),thisCanvas()); ! any.st = const_cast<t_symbol *>(GetSymbol(at)); ((methfun_1)a->fun)(this,any); } Index: flext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flext.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** flext.cpp 21 Jun 2004 13:58:19 -0000 1.28 --- flext.cpp 9 Sep 2004 04:00:47 -0000 1.29 *************** *** 55,58 **** --- 55,63 ---- flext_base::~FLEXT_CLASSDEF(flext_base)() { + #if FLEXT_SYS == FLEXT_SYS_PD && !defined(FLEXT_NOATTREDIT) + // attribute editor window may still be open -> close it + gfxstub_deleteforkey(thisHdr()); + #endif + #if FLEXT_SYS == FLEXT_SYS_MAX // according to David Z. one should do that first...

1 0

externals/grill/flext changes.txt,1.53,1.54 flext.vcproj,1.27,1.28
by Thomas Grill 09 Sep '04

09 Sep '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19518 Modified Files: changes.txt flext.vcproj Log Message: "" Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** flext.vcproj 23 Apr 2004 22:14:11 -0000 1.27 --- flext.vcproj 9 Sep 2004 04:00:44 -0000 1.28 *************** *** 348,358 **** GenerateDebugInformation="TRUE" OptimizeReferences="1" ! ImportLibrary="./pd-msvc/flext_ld.lib"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" ! Description="copy flext to maestra" ! CommandLine="copy F:\prog\max\flext\pd-msvc\flext_d.dll f:\prog\maestra\dev\debug"/> <Tool Name="VCPreBuildEventTool"/> --- 348,359 ---- GenerateDebugInformation="TRUE" OptimizeReferences="1" ! ImportLibrary="./pd-msvc/flext_ld.lib" ! TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" ! Description="copy flext to vibrez" ! CommandLine="copy F:\prog\max\flext\pd-msvc\flext_d.dll f:\prog\vibrez\debug"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 411,423 **** GenerateDebugInformation="FALSE" OptimizeReferences="1" ! ImportLibrary="./pd-msvc/flext_l.lib"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" ! Description="copy flext to maestra" ! CommandLine="copy F:\prog\max\flext\source\*.h f:\prog\maestra\dev\api\include ! copy F:\prog\max\flext\pd-msvc\flext_l.lib f:\prog\maestra\dev\api\lib ! copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\maestra\dev\release copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\dll "/> --- 412,425 ---- GenerateDebugInformation="FALSE" OptimizeReferences="1" ! ImportLibrary="./pd-msvc/flext_l.lib" ! TargetMachine="1"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool" ! Description="copy flext to vibrez" ! CommandLine="copy F:\prog\max\flext\source\*.h f:\prog\vibrez\api\include ! copy F:\prog\max\flext\pd-msvc\flext_l.lib f:\prog\vibrez\api\lib ! copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\vibrez\release copy F:\prog\max\flext\pd-msvc\flext.dll f:\prog\dll "/> Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** changes.txt 31 Aug 2004 04:01:12 -0000 1.53 --- changes.txt 9 Sep 2004 04:00:44 -0000 1.54 *************** *** 24,27 **** --- 24,32 ---- - in flext::StopThread don't wait for thread to have stopped! - support PD tooltips (only in devel branch at the moment) + - attribute editor: added individual apply buttons + - attribute editor: added escaping for , and ; + - attribute editor: zoomed editor accepts , as newline separator + - attribute editor: close editor window on object destruction + - fixed $0-arguments in attribute saving 0.4.6: *************** *** 303,315 **** for 0.4.7: - SIMD for gcc - - individual apply buttons for each attribute in the attribute editor - Max/MSP MachO support bugs: - recreation of object with different argument line forgets about eventually present attributes - - deletion of object with open attribute editor: press apply -> crash - - - attributes and attribute editor saving with patcher arguments (like $0-gugu ) - PD: problems with timed buffer redrawing (takes a lot of cpu time) - hard thread termination upon object destruction doesn't seem to work properly -> crash --- 308,317 ---- for 0.4.7: - SIMD for gcc - Max/MSP MachO support bugs: - recreation of object with different argument line forgets about eventually present attributes + TEST: - PD: problems with timed buffer redrawing (takes a lot of cpu time) - hard thread termination upon object destruction doesn't seem to work properly -> crash

1 0

pd/src s_inter.c,1.1.1.3.2.14,1.1.1.3.2.15 s_entry.c,1.1.1.2,1.1.1.2.2.1
by carmen rocco 07 Sep '04

07 Sep '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29687 Modified Files: Tag: devel_0_37 s_inter.c s_entry.c Log Message: searchpath fix Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.14 retrieving revision 1.1.1.3.2.15 diff -C2 -d -r1.1.1.3.2.14 -r1.1.1.3.2.15 *** s_inter.c 25 May 2004 10:08:21 -0000 1.1.1.3.2.14 --- s_inter.c 7 Sep 2004 19:24:17 -0000 1.1.1.3.2.15 *************** *** 54,58 **** #ifndef WISHAPP ! #define WISHAPP "wish83.exe" #endif --- 54,58 ---- #ifndef WISHAPP ! #define WISHAPP "wish85.exe" #endif *************** *** 934,938 **** sys_bashfilename(wishbuf, wishbuf); ! spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) { --- 934,938 ---- sys_bashfilename(wishbuf, wishbuf); ! spawnret = _spawnlp(P_NOWAIT, WISHAPP, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) { Index: s_entry.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.2.1 diff -C2 -d -r1.1.1.2 -r1.1.1.2.2.1 *** s_entry.c 9 May 2003 16:03:44 -0000 1.1.1.2 --- s_entry.c 7 Sep 2004 19:24:27 -0000 1.1.1.2.2.1 *************** *** 10,16 **** PVECTORED_EXCEPTION_HANDLER VectoredHandler ); */ ! #ifdef MSW #if 0 ! #incldue "winbase.h" LONG NTAPI VectoredExceptionHandler(void *PEXCEPTION_POINTERS) --- 10,16 ---- PVECTORED_EXCEPTION_HANDLER VectoredHandler ); */ ! #if defined(MSW) && !defined (__GNUC__) #if 0 ! #include "winbase.h" LONG NTAPI VectoredExceptionHandler(void *PEXCEPTION_POINTERS)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
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 September 2004