Pd-cvs January 2005

pd-cvs@lists.iem.at

8 participants
348 discussions

externals/grill/py/source bound.cpp,1.12,1.13 clmeth.cpp,1.11,1.12 main.cpp,1.18,1.19 main.h,1.25,1.26 modmeth.cpp,1.12,1.13 py.cpp,1.15,1.16 pyargs.cpp,1.9,1.10 pyext.cpp,1.22,1.23 pyext.h,1.17,1.18 register.cpp,1.4,1.5
by Thomas Grill 09 Jan '05

09 Jan '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7214/source Modified Files: bound.cpp clmeth.cpp main.cpp main.h modmeth.cpp py.cpp pyargs.cpp pyext.cpp pyext.h register.cpp Log Message: support for Python threads, at last small fixes merged in 20041229-newdetach branch. renamed locking functions Index: clmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/clmeth.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** clmeth.cpp 17 Dec 2004 05:04:29 -0000 1.11 --- clmeth.cpp 9 Jan 2005 04:59:30 -0000 1.12 *************** *** 3,7 **** py/pyext - python external object for PD and Max/MSP ! Copyright (c) 2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 40,45 **** ! const C *pyext::pyext_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2004 Thomas Grill\n" "\n" "This is the pyext base class. Available methods:\n" --- 40,45 ---- ! const char *pyext::pyext_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2005 Thomas Grill\n" "\n" "This is the pyext base class. Available methods:\n" *************** *** 82,86 **** } ! BL handled = false; if(PyString_Check(name)) { char* sname = PyString_AsString(name); --- 82,86 ---- } ! bool handled = false; if(PyString_Check(name)) { char* sname = PyString_AsString(name); *************** *** 137,141 **** PyObject *pyext::pyext_outlet(PyObject *,PyObject *args) { ! BL ok = false; // should always be a tuple! --- 137,141 ---- PyObject *pyext::pyext_outlet(PyObject *,PyObject *args) { ! bool ok = false; // should always be a tuple! *************** *** 151,158 **** pyext *ext = GetThis(self); ! I sz = PyTuple_Size(args); PyObject *val; ! BL tp = sz == 3 && PySequence_Check( --- 151,158 ---- pyext *ext = GetThis(self); ! int sz = PyTuple_Size(args); PyObject *val; ! bool tp = sz == 3 && PySequence_Check( *************** *** 165,169 **** AtomList *lst = GetPyArgs(val); if(lst) { ! I o = PyInt_AsLong(outl); if(o >= 1 && o <= ext->Outlets()) { // by using the queue there is no immediate call of the next object --- 165,169 ---- AtomList *lst = GetPyArgs(val); if(lst) { ! int o = PyInt_AsLong(outl); if(o >= 1 && o <= ext->Outlets()) { // by using the queue there is no immediate call of the next object *************** *** 226,230 **** else { pyext *ext = GetThis(self); ! I cnt = 0; t_atom at; if(val >= 0) flext::SetInt(at,val); --- 226,230 ---- else { pyext *ext = GetThis(self); ! int cnt = 0; t_atom at; if(val >= 0) flext::SetInt(at,val); *************** *** 256,268 **** FLEXT_ASSERT(PyTuple_Check(args)); ! BL ok = false; PyObject *self = PyTuple_GetItem(args,0); // borrowed ref if(self && PyInstance_Check(self)) { pyext *ext = GetThis(self); ! I sz = PySequence_Size(args); PyObject *val; ! BL tp = sz == 2 && PySequence_Check( --- 256,268 ---- FLEXT_ASSERT(PyTuple_Check(args)); ! bool ok = false; PyObject *self = PyTuple_GetItem(args,0); // borrowed ref if(self && PyInstance_Check(self)) { pyext *ext = GetThis(self); ! int sz = PySequence_Size(args); PyObject *val; ! bool tp = sz == 2 && PySequence_Check( Index: pyargs.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pyargs.cpp 10 Nov 2004 03:31:34 -0000 1.9 --- pyargs.cpp 9 Jan 2005 04:59:30 -0000 1.10 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 22,26 **** } // these following should never happen ! else if(flext::IsFloat(at)) return PyFloat_FromDouble((D)flext::GetFloat(at)); else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at)); --- 22,26 ---- } // these following should never happen ! else if(flext::IsFloat(at)) return PyFloat_FromDouble((double)flext::GetFloat(at)); else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at)); *************** *** 28,32 **** } ! PyObject *py::MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,I inlet,BL withself) { PyObject *pArgs; --- 28,32 ---- } ! PyObject *py::MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet,bool withself) { PyObject *pArgs; *************** *** 41,48 **** */ { ! BL any = IsAnything(s); pArgs = PyTuple_New(argc+(any?1:0)+(inlet >= 0?1:0)); ! I pix = 0; if(inlet >= 0) { --- 41,48 ---- */ { ! bool any = IsAnything(s); pArgs = PyTuple_New(argc+(any?1:0)+(inlet >= 0?1:0)); ! int pix = 0; if(inlet >= 0) { *************** *** 53,57 **** } ! I ix; PyObject *tmp; if(!withself || argc < (any?1:2)) tmp = pArgs,ix = pix; --- 53,57 ---- } ! int ix; PyObject *tmp; if(!withself || argc < (any?1:2)) tmp = pArgs,ix = pix; *************** *** 65,69 **** } ! for(I i = 0; i < argc; ++i) { PyObject *pValue = MakePyAtom(argv[i]); if(!pValue) { --- 65,69 ---- } ! for(int i = 0; i < argc; ++i) { PyObject *pValue = MakePyAtom(argv[i]); if(!pValue) { *************** *** 96,101 **** // analyze return value or tuple ! I rargc = 0; ! BL ok = true; retval tp = nothing; --- 96,101 ---- // analyze return value or tuple ! int rargc = 0; ! bool ok = true; retval tp = nothing; *************** *** 117,121 **** ret = new AtomList(rargc); ! for(I ix = 0; ix < rargc; ++ix) { PyObject *arg; if(tp == sequ) --- 117,121 ---- ret = new AtomList(rargc); ! for(int ix = 0; ix < rargc; ++ix) { PyObject *arg; if(tp == sequ) *************** *** 126,130 **** if(PyInt_Check(arg)) SetInt((*ret)[ix],PyInt_AsLong(arg)); else if(PyLong_Check(arg)) SetInt((*ret)[ix],PyLong_AsLong(arg)); ! else if(PyFloat_Check(arg)) SetFloat((*ret)[ix],(F)PyFloat_AsDouble(arg)); else if(PyString_Check(arg)) SetString((*ret)[ix],PyString_AsString(arg)); else if(ix == 0 && self && PyInstance_Check(arg)) { --- 126,130 ---- if(PyInt_Check(arg)) SetInt((*ret)[ix],PyInt_AsLong(arg)); else if(PyLong_Check(arg)) SetInt((*ret)[ix],PyLong_AsLong(arg)); ! else if(PyFloat_Check(arg)) SetFloat((*ret)[ix],(float)PyFloat_AsDouble(arg)); else if(PyString_Check(arg)) SetString((*ret)[ix],PyString_AsString(arg)); else if(ix == 0 && self && PyInstance_Check(arg)) { *************** *** 136,140 **** PyObject *tp = PyObject_Type(arg); PyObject *stp = tp?PyObject_Str(tp):NULL; ! C *tmp = ""; if(stp) tmp = PyString_AsString(stp); post("py/pyext: Could not convert argument %s",tmp); --- 136,140 ---- PyObject *tp = PyObject_Type(arg); PyObject *stp = tp?PyObject_Str(tp):NULL; ! char *tmp = ""; if(stp) tmp = PyString_AsString(stp); post("py/pyext: Could not convert argument %s",tmp); Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** main.cpp 10 Nov 2004 03:31:34 -0000 1.18 --- main.cpp 9 Jan 2005 04:59:30 -0000 1.19 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 56,66 **** ! V py::lib_setup() { post(""); ! post("py/pyext %s - python script objects, (C)2002-2004 Thomas Grill",PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG version compiled on %s %s",__DATE__,__TIME__); #endif post(""); --- 56,71 ---- ! void py::lib_setup() { post(""); ! post("--------------------------------------"); ! post("py/pyext %s - python script objects",PY__VERSION); ! post(" (C)2002-2005 Thomas Grill"); ! post(" http://grrrr.org/ext"); #ifdef FLEXT_DEBUG + post(""); post("DEBUG version compiled on %s %s",__DATE__,__TIME__); #endif + post("--------------------------------------"); post(""); *************** *** 91,99 **** module_dict = PyModule_GetDict(module_obj); // borrowed reference ! PyModule_AddStringConstant(module_obj,"__doc__",(C *)py_doc); // redirect stdout ! PyObject* py_out = Py_InitModule("stdout", StdOut_Methods); PySys_SetObject("stdout", py_out); #ifdef FLEXT_THREADS --- 96,107 ---- module_dict = PyModule_GetDict(module_obj); // borrowed reference ! PyModule_AddStringConstant(module_obj,"__doc__",(char *)py_doc); // redirect stdout ! PyObject* py_out; ! py_out = Py_InitModule("stdout", StdOut_Methods); PySys_SetObject("stdout", py_out); + py_out = Py_InitModule("stderr", StdOut_Methods); + PySys_SetObject("stderr", py_out); #ifdef FLEXT_THREADS *************** *** 117,137 **** py::py(): module(NULL), ! detach(false),shouldexit(false),thrcount(0), stoptick(0) { ! PY_LOCK Py_INCREF(module_obj); ! PY_UNLOCK FLEXT_ADDTIMER(stoptmr,tick); } py::~py() { ! if(thrcount) { ! shouldexit = true; ! // Wait for a certain time ! for(int i = 0; i < (PY_STOP_WAIT/PY_STOP_TICK) && thrcount; ++i) Sleep((F)(PY_STOP_TICK/1000.)); // Wait forever --- 125,151 ---- py::py(): module(NULL), ! detach(0),shouldexit(false),thrcount(0), stoptick(0) { ! // interpreter = PyInterpreterState_New(); ! ! PyThreadState *state = PyLock(); Py_INCREF(module_obj); ! PyUnlock(state); FLEXT_ADDTIMER(stoptmr,tick); + + // launch thread worker + FLEXT_CALLMETHOD(threadworker); } py::~py() { ! shouldexit = true; ! qucond.Signal(); ! ! if(thrcount) { // Wait for a certain time ! for(int i = 0; i < (PY_STOP_WAIT/PY_STOP_TICK) && thrcount; ++i) Sleep((float)(PY_STOP_TICK/1000.)); // Wait forever *************** *** 142,145 **** --- 156,165 ---- Py_XDECREF(module_obj); + /* + PyEval_AcquireLock(); + PyInterpreterState_Clear(interpreter); + PyInterpreterState_Delete(interpreter); + PyEval_ReleaseLock(); + */ } *************** *** 148,152 **** { if(obj) { ! PY_LOCK PyObject *pvar = PyObject_Dir(obj); --- 168,172 ---- { if(obj) { ! PyThreadState *state = PyLock(); PyObject *pvar = PyObject_Dir(obj); *************** *** 163,167 **** } ! PY_UNLOCK } } --- 183,187 ---- } ! PyUnlock(state); } } *************** *** 175,182 **** } ! V py::m__doc(PyObject *obj) { if(obj) { ! PY_LOCK PyObject *docf = PyDict_GetItemString(obj,"__doc__"); // borrowed!!! --- 195,202 ---- } ! void py::m__doc(PyObject *obj) { if(obj) { ! PyThreadState *state = PyLock(); PyObject *docf = PyDict_GetItemString(obj,"__doc__"); // borrowed!!! *************** *** 207,221 **** } ! PY_UNLOCK } } ! V py::SetArgs(I argc,const t_atom *argv) { // script arguments ! C **sargv = new C *[argc+1]; for(int i = 0; i <= argc; ++i) { ! sargv[i] = new C[256]; if(!i) strcpy(sargv[i],thisName()); --- 227,241 ---- } ! PyUnlock(state); } } ! void py::SetArgs(int argc,const t_atom *argv) { // script arguments ! char **sargv = new char *[argc+1]; for(int i = 0; i <= argc; ++i) { ! sargv[i] = new char[256]; if(!i) strcpy(sargv[i],thisName()); *************** *** 231,239 **** } ! V py::ImportModule(const C *name) { if(!name) return; ! module = PyImport_ImportModule((C *)name); // increases module_obj ref count by one if (!module) { --- 251,259 ---- } ! void py::ImportModule(const char *name) { if(!name) return; ! module = PyImport_ImportModule((char *)name); // increases module_obj ref count by one if (!module) { *************** *** 245,249 **** } ! V py::UnimportModule() { if(!module) return; --- 265,269 ---- } ! void py::UnimportModule() { if(!module) return; *************** *** 261,265 **** } ! V py::ReloadModule() { if(module) { --- 281,285 ---- } ! void py::ReloadModule() { if(module) { *************** *** 280,290 **** } ! V py::GetModulePath(const C *mod,C *dir,I len) { #if FLEXT_SYS == FLEXT_SYS_PD // uarghh... pd doesn't show its path for extra modules ! C *name; ! I fd = open_via_path("",mod,".py",dir,&name,len,0); if(fd > 0) close(fd); else name = NULL; --- 300,310 ---- } ! void py::GetModulePath(const char *mod,char *dir,int len) { #if FLEXT_SYS == FLEXT_SYS_PD // uarghh... pd doesn't show its path for extra modules ! char *name; ! int fd = open_via_path("",mod,".py",dir,&name,len,0); if(fd > 0) close(fd); else name = NULL; *************** *** 296,303 **** short path; long type; ! char smod[256]; strcat(strcpy(smod,mod),".py"); ! if(!locatefile_extended(smod,&path,&type,&type,-1)) path_topathname(path,NULL,dir); else // not found --- 316,338 ---- short path; long type; ! char smod[1024]; strcat(strcpy(smod,mod),".py"); ! if(!locatefile_extended(smod,&path,&type,&type,-1)) { ! #if FLEXT_OS == FLEXT_OS_WIN path_topathname(path,NULL,dir); + #else + // convert pathname to unix style + path_topathname(path,NULL,smod); + char *colon = strchr(smod,':'); + if(colon) { + *colon = 0; + strcpy(dir,"/Volumes/"); + strcat(dir,smod); + strcat(dir,colon+1); + } + else + strcpy(dir,smod); + #endif + } else // not found *************** *** 308,312 **** } ! V py::AddToPath(const C *dir) { if(dir && *dir) { --- 343,347 ---- } ! void py::AddToPath(const char *dir) { if(dir && *dir) { *************** *** 327,330 **** --- 362,378 ---- } + static const t_symbol *sym_response = flext::MakeSymbol("response"); + + void py::Respond(bool b) + { + if(respond) { + t_atom a; + SetBool(a,b); + ToOutAnything(GetOutAttr(),sym_response,1,&a); + } + } + + + static PyObject *output = NULL; *************** *** 369,370 **** --- 417,542 ---- return Py_None; } + + + class work_data + { + public: + work_data(PyObject *f,PyObject *a): fun(f),args(a) {} + ~work_data() { Py_DECREF(fun); Py_DECREF(args); } + + PyObject *fun,*args; + }; + + bool py::gencall(PyObject *pmeth,PyObject *pargs) + { + bool ret = false; + + // Now call method + switch(detach) { + case 0: + ret = callpy(pmeth,pargs); + Py_DECREF(pargs); + Py_DECREF(pmeth); + break; + case 1: + // put call into queue + ret = qucall(pmeth,pargs); + break; + case 2: + // each call a new thread + if(!shouldexit) { + ret = FLEXT_CALLMETHOD_X(work_wrapper,new work_data(pmeth,pargs)); + if(!ret) post("%s - Failed to launch thread!",thisName()); + } + break; + default: + FLEXT_ASSERT(false); + } + return ret; + } + + void py::work_wrapper(void *data) + { + FLEXT_ASSERT(data); + + ++thrcount; + + PyThreadState *state = PyLock(); + + // call worker + work_data *w = (work_data *)data; + callpy(w->fun,w->args); + delete w; + + PyUnlock(state); + + --thrcount; + } + + bool py::qucall(PyObject *fun,PyObject *args) + { + if(qufifo.Push(fun,args)) { + qucond.Signal(); + return true; + } + else + return false; + } + + void py::threadworker() + { + PyObject *fun,*args; + PyThreadState *state; + + while(!shouldexit) { + state = PyLock(); + while(qufifo.Pop(fun,args)) { + callpy(fun,args); + Py_XDECREF(fun); + Py_XDECREF(args); + } + PyUnlock(state); + qucond.Wait(); + } + + state = PyLock(); + // unref remaining Python objects + while(qufifo.Pop(fun,args)) { + Py_XDECREF(fun); + Py_XDECREF(args); + } + PyUnlock(state); + } + + Fifo::~Fifo() + { + FifoEl *el = head; + while(el) { + FifoEl *n = el->nxt; + delete el; + el = n; + } + } + + bool Fifo::Push(PyObject *f,PyObject *a) + { + FifoEl *el = new FifoEl; + el->fun = f; + el->args = a; + if(tail) tail->nxt = el; + else head = el; + tail = el; + return true; + } + + bool Fifo::Pop(PyObject *&f,PyObject *&a) + { + if(!head) return false; + FifoEl *el = head; + head = el->nxt; + f = el->fun; + a = el->args; + if(tail == el) tail = NULL; + delete el; + return true; + } Index: pyext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pyext.h 10 Nov 2004 03:31:34 -0000 1.17 --- pyext.h 9 Jan 2005 04:59:30 -0000 1.18 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 20,24 **** public: ! pyext(I argc,const t_atom *argv); ~pyext(); --- 20,24 ---- public: ! pyext(int argc,const t_atom *argv); ~pyext(); *************** *** 39,82 **** static PyObject *pyext_isthreaded(PyObject *,PyObject *); ! I Inlets() const { return inlets; } ! I Outlets() const { return outlets; } protected: ! virtual BL m_method_(I n,const t_symbol *s,I argc,const t_atom *argv); ! BL work(I n,const t_symbol *s,I argc,const t_atom *argv); ! V m_reload(); ! V m_reload_(I argc,const t_atom *argv); ! V ms_args(const AtomList &a) { m_reload_(a.Count(),a.Atoms()); } ! V m_dir_() { m__dir(pyobj); } ! V mg_dir_(AtomList &lst) { GetDir(pyobj,lst); } ! V m_doc_() { m__doc(((PyInstanceObject *)pyobj)->in_class->cl_dict); } ! virtual V m_help(); ! V m_get(const t_symbol *s); ! V m_set(I argc,const t_atom *argv); const t_symbol *methname; PyObject *pyobj; ! I inlets,outlets; private: ! static V Setup(t_classid); static pyext *GetThis(PyObject *self); void SetThis(); ! V ClearBinding(); ! BL MakeInstance(); ! BL DoInit(); AtomList args; ! virtual V Reload(); static PyObject *class_obj,*class_dict; static PyMethodDef attr_tbl[],meth_tbl[]; ! static const C *pyext_doc; // -------- bind stuff ------------------ --- 39,82 ---- static PyObject *pyext_isthreaded(PyObject *,PyObject *); ! int Inlets() const { return inlets; } ! int Outlets() const { return outlets; } protected: ! virtual bool m_method_(int n,const t_symbol *s,int argc,const t_atom *argv); ! bool work(int n,const t_symbol *s,int argc,const t_atom *argv); ! void m_reload(); ! void m_reload_(int argc,const t_atom *argv); ! void ms_args(const AtomList &a) { m_reload_(a.Count(),a.Atoms()); } ! void m_dir_() { m__dir(pyobj); } ! void mg_dir_(AtomList &lst) { GetDir(pyobj,lst); } ! void m_doc_() { m__doc(((PyInstanceObject *)pyobj)->in_class->cl_dict); } ! virtual void m_help(); ! void m_get(const t_symbol *s); ! void m_set(int argc,const t_atom *argv); const t_symbol *methname; PyObject *pyobj; ! int inlets,outlets; private: ! static void Setup(t_classid); static pyext *GetThis(PyObject *self); void SetThis(); ! void ClearBinding(); ! bool MakeInstance(); ! bool DoInit(); AtomList args; ! virtual void Reload(); static PyObject *class_obj,*class_dict; static PyMethodDef attr_tbl[],meth_tbl[]; ! static const char *pyext_doc; // -------- bind stuff ------------------ *************** *** 86,107 **** // --------------------------- ! PyObject *call(const C *meth,I inlet,const t_symbol *s,I argc,const t_atom *argv); ! ! V work_wrapper(void *data); ! BL callwork(I n,const t_symbol *s,I argc,const t_atom *argv); ! ! class work_data: ! public flext::AtomAnything ! { ! public: ! work_data(I _n,const t_symbol *_s,I _argc,const t_atom *_argv): n(_n),AtomAnything(_s,_argc,_argv) {} ! I n; ! }; ! #ifdef FLEXT_THREADS ! FLEXT_THREAD_X(work_wrapper) ! #else ! FLEXT_CALLBACK_X(work_wrapper) ! #endif PyThreadState *pythr; --- 86,93 ---- // --------------------------- ! bool call(const char *meth,int inlet,const t_symbol *s,int argc,const t_atom *argv); ! virtual bool callpy(PyObject *fun,PyObject *args); ! static bool stcallpy(PyObject *fun,PyObject *args); PyThreadState *pythr; Index: modmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/modmeth.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** modmeth.cpp 10 Nov 2004 03:31:34 -0000 1.12 --- modmeth.cpp 9 Jan 2005 04:59:30 -0000 1.13 *************** *** 3,7 **** py/pyext - python external object for PD and Max/MSP ! Copyright (c) 2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 22,27 **** { "_samplerate", py::py_samplerate, METH_NOARGS,"Get system sample rate" }, { "_blocksize", py::py_blocksize, METH_NOARGS,"Get system block size" }, - { "_inchannels", py::py_inchannels, METH_NOARGS,"Get number of audio in channels" }, - { "_outchannels", py::py_outchannels, METH_NOARGS,"Get number of audio out channels" }, #if FLEXT_SYS == FLEXT_SYS_PD --- 22,25 ---- *************** *** 33,38 **** }; ! const C *py::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2004 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" --- 31,36 ---- }; ! const char *py::py_doc = ! "py/pyext - python external object for PD and Max/MSP, (C)2002-2005 Thomas Grill\n" "\n" "This is the pyext module. Available function:\n" *************** *** 43,48 **** "_samplerate(): Get system sample rate\n" "_blocksize(): Get current blocksize\n" - "_inchannels(): Get number of audio in channels\n" - "_outchannels(): Get number of audio out channels\n" "_getvalue(name): Get value of a 'value' object\n" "_setvalue(name,float): Set value of a 'value' object\n" --- 41,44 ---- *************** *** 51,55 **** ! V py::tick(V *) { Lock(); --- 47,51 ---- ! void py::tick(void *) { Lock(); *************** *** 74,86 **** } ! V py::m_stop(int argc,const t_atom *argv) { if(thrcount) { Lock(); ! I wait = PY_STOP_WAIT; if(argc >= 1 && CanbeInt(argv[0])) wait = GetAInt(argv[0]); ! I ticks = wait/PY_STOP_TICK; if(stoptick) { // already stopping --- 70,82 ---- } ! void py::m_stop(int argc,const t_atom *argv) { if(thrcount) { Lock(); ! int wait = PY_STOP_WAIT; if(argc >= 1 && CanbeInt(argv[0])) wait = GetAInt(argv[0]); ! int ticks = wait/PY_STOP_TICK; if(stoptick) { // already stopping *************** *** 107,136 **** } - PyObject *py::py_inchannels(PyObject *self,PyObject *args) - { - #if FLEXT_SYS == FLEXT_SYS_PD - I ch = sys_get_inchannels(); - #elif FLEXT_SYS == FLEXT_SYS_MAX - I ch = sys_getch(); // not working - #else - #pragma message("Not implemented!") - ch = 0; - #endif - return PyLong_FromLong(ch); - } - - PyObject *py::py_outchannels(PyObject *self,PyObject *args) - { - #if FLEXT_SYS == FLEXT_SYS_PD - I ch = sys_get_outchannels(); - #elif FLEXT_SYS == FLEXT_SYS_MAX - I ch = sys_getch(); // not working - #else - #pragma message("Not implemented!") - ch = 0; - #endif - return PyLong_FromLong(ch); - } - PyObject *py::py_send(PyObject *,PyObject *args) { --- 103,106 ---- Index: bound.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/bound.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bound.cpp 10 Nov 2004 03:31:34 -0000 1.12 --- bound.cpp 9 Jan 2005 04:59:30 -0000 1.13 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 22,30 **** }; ! bool pyext::boundmeth(flext_base *,t_symbol *sym,int argc,t_atom *argv,void *data) { bounddata *obj = (bounddata *)data; ! PY_LOCK PyObject *args = MakePyArgs(sym,argc,argv,-1,obj->self != NULL); --- 22,31 ---- }; ! bool pyext::boundmeth(flext_base *th,t_symbol *sym,int argc,t_atom *argv,void *data) { bounddata *obj = (bounddata *)data; + py *pyth = static_cast<py *>(th); ! PyThreadState *state = pyth->PyLock(); PyObject *args = MakePyArgs(sym,argc,argv,-1,obj->self != NULL); *************** *** 41,45 **** Py_XDECREF(args); ! PY_UNLOCK return true; } --- 42,46 ---- Py_XDECREF(args); ! pyth->PyUnlock(state); return true; } *************** *** 48,52 **** { PyObject *self,*meth; ! C *name; if(!PyArg_ParseTuple(args, "OsO:pyext_bind", &self,&name,&meth)) post("py/pyext - Wrong arguments!"); --- 49,53 ---- { PyObject *self,*meth; ! char *name; if(!PyArg_ParseTuple(args, "OsO:pyext_bind", &self,&name,&meth)) post("py/pyext - Wrong arguments!"); *************** *** 92,96 **** { PyObject *self,*meth; ! C *name; if(!PyArg_ParseTuple(args, "OsO:pyext_bind", &self,&name,&meth)) post("py/pyext - Wrong arguments!"); --- 93,97 ---- { PyObject *self,*meth; ! char *name; if(!PyArg_ParseTuple(args, "OsO:pyext_bind", &self,&name,&meth)) post("py/pyext - Wrong arguments!"); *************** *** 128,132 **** ! V pyext::ClearBinding() { // in case the object couldn't be constructed... --- 129,133 ---- ! void pyext::ClearBinding() { // in case the object couldn't be constructed... Index: register.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/register.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** register.cpp 10 Nov 2004 03:31:34 -0000 1.4 --- register.cpp 9 Jan 2005 04:59:30 -0000 1.5 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 12,27 **** ! V py::Register(const C *regnm) { if(module) { // add this to module registry ! PyObject *reg = PyDict_GetItemString(dict,(C *)regnm); // borrowed!!! PyObject *add = Py_BuildValue("[i]",(long)this); if(!reg || !PyList_Check(reg)) { ! if(PyDict_SetItemString(dict,(C *)regnm,add)) { post("%s - Could not set registry",thisName()); } - // Py_XDECREF(reg); } else { --- 12,26 ---- ! void py::Register(const char *regnm) { if(module) { // add this to module registry ! PyObject *reg = PyDict_GetItemString(dict,(char *)regnm); // borrowed!!! PyObject *add = Py_BuildValue("[i]",(long)this); if(!reg || !PyList_Check(reg)) { ! if(PyDict_SetItemString(dict,(char *)regnm,add)) { post("%s - Could not set registry",thisName()); } } else { *************** *** 29,48 **** } } - } ! V py::Unregister(const C *regnm) { if(module) { // remove this from module registry ! PyObject *reg = PyDict_GetItemString(dict,(C *)regnm); // borrowed!!! PyObject *add = Py_BuildValue("i",(int)this); if(!reg || !PySequence_Check(reg)) ! post("%s - Registry not found!?",thisName()); else { ! I ix = PySequence_Index(reg,add); if(ix < 0) { ! post("%s - This object not found in registry?!",thisName()); } else { --- 28,46 ---- } } } ! void py::Unregister(const char *regnm) { if(module) { // remove this from module registry ! PyObject *reg = PyDict_GetItemString(dict,(char *)regnm); // borrowed!!! PyObject *add = Py_BuildValue("i",(int)this); if(!reg || !PySequence_Check(reg)) ! post("%s - Internal error: Registry not found!?",thisName()); else { ! int ix = PySequence_Index(reg,add); if(ix < 0) { ! post("%s - Internal error: object not found in registry?!",thisName()); } else { *************** *** 52,73 **** Py_DECREF(add); } - } ! V py::Reregister(const C *regnm) { if(module) { // remove this from module registry ! PyObject *reg = PyDict_GetItemString(dict,(C *)regnm); // borrowed!!! if(!reg || !PySequence_Check(reg)) ! post("%s - Registry not found!?",thisName()); else { ! I cnt = PySequence_Size(reg); ! for(I i = 0; i < cnt; ++i) { PyObject *it = PySequence_GetItem(reg,i); // new reference if(!it || !PyInt_Check(it)) { ! post("%s - Corrupt registry?!",thisName()); } else { --- 50,70 ---- Py_DECREF(add); } } ! void py::Reregister(const char *regnm) { if(module) { // remove this from module registry ! PyObject *reg = PyDict_GetItemString(dict,(char *)regnm); // borrowed!!! if(!reg || !PySequence_Check(reg)) ! post("%s - Internal error: Registry not found!?",thisName()); else { ! int cnt = PySequence_Size(reg); ! for(int i = 0; i < cnt; ++i) { PyObject *it = PySequence_GetItem(reg,i); // new reference if(!it || !PyInt_Check(it)) { ! post("%s - Internal error: Corrupt registry?!",thisName()); } else { *************** *** 82,88 **** } } - } - - - --- 79,81 ---- Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.h 17 Dec 2004 05:04:29 -0000 1.25 --- main.h 9 Jan 2005 04:59:30 -0000 1.26 *************** *** 3,7 **** py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python script object for PD and MaxMSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 25,30 **** #endif ! #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 408) ! #error You need at least flext version 0.4.8 #endif --- 25,30 ---- #endif ! #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 500) ! #error You need at least flext version 0.5.0 #endif *************** *** 39,52 **** ! #define I int ! #define C char ! #define V void ! #define BL bool ! #define F float ! #define D double ! #include "main.h" class py: --- 39,64 ---- + class Fifo + { + protected: + struct FifoEl { + PyObject *fun; + PyObject *args; + FifoEl *nxt; + }; + public: + Fifo(): head(NULL),tail(NULL) {} + ~Fifo(); ! bool Push(PyObject *f,PyObject *a); ! bool Pop(PyObject *&f,PyObject *&a); ! ! protected: ! FifoEl *head,*tail; ! }; ! PyThreadState *FindThreadState(); ! void FreeThreadState(); class py: *************** *** 58,98 **** py(); ~py(); ! static V lib_setup(); ! static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,I inlet = -1,BL withself = false); static AtomList *GetPyArgs(PyObject *pValue,PyObject **self = NULL); protected: ! V m__dir(PyObject *obj); ! V m__doc(PyObject *obj); ! V m_dir() { m__dir(module); } ! V mg_dir(AtomList &lst) { m__dir(module); } ! V m_doc() { m__doc(dict); } PyObject *module,*dict; // inherited user class module and associated dictionary ! static const C *py_doc; ! V GetDir(PyObject *obj,AtomList &lst); ! V GetModulePath(const C *mod,C *dir,I len); ! V AddToPath(const C *dir); ! V SetArgs(I argc,const t_atom *argv); ! V ImportModule(const C *name); ! V UnimportModule(); ! V ReloadModule(); ! V Register(const C *reg); ! V Unregister(const C *reg); ! V Reregister(const C *reg); ! virtual V Reload() = 0; ! V Respond(BL b) { if(respond) { t_atom a[1]; SetBool(a[0],b); ToOutAnything(GetOutAttr(),MakeSymbol("response"),1,a); } } ! static BL IsAnything(const t_symbol *s) { return s && s != sym_bang && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; } ! enum retval { nothing,atom,sequ /*,tuple,list*/ }; // --- module stuff ----- --- 70,110 ---- py(); ~py(); ! static void lib_setup(); ! static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1,bool withself = false); static AtomList *GetPyArgs(PyObject *pValue,PyObject **self = NULL); protected: ! void m__dir(PyObject *obj); ! void m__doc(PyObject *obj); ! void m_dir() { m__dir(module); } ! void mg_dir(AtomList &lst) { m__dir(module); } ! void m_doc() { m__doc(dict); } PyObject *module,*dict; // inherited user class module and associated dictionary ! static const char *py_doc; ! void GetDir(PyObject *obj,AtomList &lst); ! void GetModulePath(const char *mod,char *dir,int len); ! void AddToPath(const char *dir); ! void SetArgs(int argc,const t_atom *argv); ! void ImportModule(const char *name); ! void UnimportModule(); ! void ReloadModule(); ! void Register(const char *reg); ! void Unregister(const char *reg); ! void Reregister(const char *reg); ! virtual void Reload() = 0; ! void Respond(bool b); ! static bool IsAnything(const t_symbol *s) { return s && s != sym_bang && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; } ! enum retval { nothing,atom,sequ }; // --- module stuff ----- *************** *** 109,114 **** static PyObject *py_samplerate(PyObject *,PyObject *args); static PyObject *py_blocksize(PyObject *,PyObject *args); ! static PyObject *py_inchannels(PyObject *,PyObject *args); ! static PyObject *py_outchannels(PyObject *,PyObject *args); #if FLEXT_SYS == FLEXT_SYS_PD static PyObject *py_getvalue(PyObject *,PyObject *args); --- 121,125 ---- static PyObject *py_samplerate(PyObject *,PyObject *args); static PyObject *py_blocksize(PyObject *,PyObject *args); ! #if FLEXT_SYS == FLEXT_SYS_PD static PyObject *py_getvalue(PyObject *,PyObject *args); *************** *** 118,129 **** // ----thread stuff ------------ ! virtual V m_stop(int argc,const t_atom *argv); ! BL detach,shouldexit,respond; ! I thrcount; ! I stoptick; Timer stoptmr; ! V tick(V *); public: --- 129,160 ---- // ----thread stuff ------------ ! virtual void m_stop(int argc,const t_atom *argv); ! bool shouldexit,respond; ! int thrcount; ! int stoptick; Timer stoptmr; + int detach; ! void tick(void *); ! ! bool gencall(PyObject *fun,PyObject *args); ! virtual bool callpy(PyObject *fun,PyObject *args) = 0; ! ! private: ! // PyInterpreterState *interpreter; ! ! bool qucall(PyObject *fun,PyObject *args); ! void threadworker(); ! Fifo qufifo; ! ThrCond qucond; ! ! void work_wrapper(void *data); ! ! #ifdef FLEXT_THREADS ! FLEXT_THREAD_X(work_wrapper) ! #else ! FLEXT_CALLBACK_X(work_wrapper) ! #endif public: *************** *** 131,139 **** #ifdef FLEXT_THREADS ThrMutex mutex; ! inline V Lock() { mutex.Unlock(); } ! inline V Unlock() { mutex.Unlock(); } #else ! inline V Lock() {} ! inline V Unlock() {} #endif --- 162,185 ---- #ifdef FLEXT_THREADS ThrMutex mutex; ! inline void Lock() { mutex.Unlock(); } ! inline void Unlock() { mutex.Unlock(); } ! ! inline PyThreadState *PyLock() ! { ! PyEval_AcquireLock(); ! return PyThreadState_Swap(FindThreadState()); ! } ! ! inline void PyUnlock(PyThreadState *st) ! { ! PyThreadState_Swap(st); ! PyEval_ReleaseLock(); ! } #else ! inline void Lock() {} ! inline void Unlock() {} ! ! inline PyThreadState *PyLock() { return NULL; } ! inline void PyUnlock(PyThreadState *st) {} #endif *************** *** 143,147 **** // callbacks ! FLEXT_ATTRVAR_B(detach) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) --- 189,193 ---- // callbacks ! FLEXT_ATTRVAR_I(detach) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) *************** *** 150,175 **** FLEXT_CALLBACK(m_doc) FLEXT_CALLBACK_T(tick) - }; ! #ifdef FLEXT_THREADS ! ! PyThreadState *FindThreadState(); ! void FreeThreadState(); ! ! #define PY_LOCK \ ! { \ ! PyEval_AcquireLock(); \ ! PyThreadState *__st = FindThreadState(); \ ! PyThreadState *__oldst = PyThreadState_Swap(__st); ! ! #define PY_UNLOCK \ ! PyThreadState_Swap(__oldst); \ ! PyEval_ReleaseLock(); \ ! } ! ! #else ! #define PY_LOCK ! #define PY_UNLOCK ! #endif #endif --- 196,202 ---- FLEXT_CALLBACK(m_doc) FLEXT_CALLBACK_T(tick) ! FLEXT_THREAD(threadworker) ! }; #endif Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pyext.cpp 10 Nov 2004 03:31:34 -0000 1.22 --- pyext.cpp 9 Jan 2005 04:59:30 -0000 1.23 *************** *** 3,7 **** py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 14,20 **** FLEXT_LIB_V("pyext pyext. pyx pyx.",pyext) ! V pyext::Setup(t_classid c) { ! FLEXT_CADDMETHOD_(c,0,"reload.",m_reload); FLEXT_CADDMETHOD_(c,0,"reload",m_reload_); FLEXT_CADDMETHOD_(c,0,"dir",m_dir); --- 14,25 ---- FLEXT_LIB_V("pyext pyext. pyx pyx.",pyext) ! ! static const t_symbol *sym_get; ! ! void pyext::Setup(t_classid c) { ! sym_get = flext::MakeSymbol("get"); ! ! FLEXT_CADDMETHOD_(c,0,"reload.",m_reload); FLEXT_CADDMETHOD_(c,0,"reload",m_reload_); FLEXT_CADDMETHOD_(c,0,"dir",m_dir); *************** *** 36,40 **** FLEXT_CADDATTR_VAR1(c,"respond",respond); - // ---------------------------------------------------- --- 41,44 ---- *************** *** 113,117 **** PyObject *pyext::class_dict = NULL; ! pyext::pyext(I argc,const t_atom *argv): pyobj(NULL),pythr(NULL), inlets(-1),outlets(-1), --- 117,121 ---- PyObject *pyext::class_dict = NULL; ! pyext::pyext(int argc,const t_atom *argv): pyobj(NULL),pythr(NULL), inlets(-1),outlets(-1), *************** *** 128,132 **** const t_atom *clname = NULL; ! PY_LOCK // init script module --- 132,136 ---- const t_atom *clname = NULL; ! PyThreadState *state = PyLock(); // init script module *************** *** 239,243 **** inlets = outlets = 0; ! PY_UNLOCK if(inlets < 0 || outlets < 0) --- 243,247 ---- inlets = outlets = 0; ! PyUnlock(state); if(inlets < 0 || outlets < 0) *************** *** 254,258 **** pyext::~pyext() { ! PY_LOCK ClearBinding(); --- 258,262 ---- pyext::~pyext() { ! PyThreadState *state = PyLock(); ClearBinding(); *************** *** 266,273 **** UnimportModule(); ! PY_UNLOCK } ! BL pyext::DoInit() { SetThis(); --- 270,277 ---- UnimportModule(); ! PyUnlock(state); } ! bool pyext::DoInit() { SetThis(); *************** *** 294,303 **** } ! BL pyext::MakeInstance() { // pyobj should already have been decref'd / cleared before getting here!! if(module && methname) { ! PyObject *pref = PyObject_GetAttrString(module,const_cast<C *>(GetString(methname))); if(!pref) PyErr_Print(); --- 298,307 ---- } ! bool pyext::MakeInstance() { // pyobj should already have been decref'd / cleared before getting here!! if(module && methname) { ! PyObject *pref = PyObject_GetAttrString(module,const_cast<char *>(GetString(methname))); if(!pref) PyErr_Print(); *************** *** 320,324 **** } ! V pyext::Reload() { ClearBinding(); --- 324,328 ---- } ! void pyext::Reload() { ClearBinding(); *************** *** 334,340 **** ! V pyext::m_reload() { ! PY_LOCK Unregister("_pyext"); // self --- 338,344 ---- ! void pyext::m_reload() { ! PyThreadState *state = PyLock(); Unregister("_pyext"); // self *************** *** 347,354 **** SetThis(); ! PY_UNLOCK } ! V pyext::m_reload_(I argc,const t_atom *argv) { args(argc,argv); --- 351,358 ---- SetThis(); ! PyUnlock(state); } ! void pyext::m_reload_(int argc,const t_atom *argv) { args(argc,argv); *************** *** 358,362 **** void pyext::m_get(const t_symbol *s) { ! PY_LOCK PyObject *pvar = PyObject_GetAttrString(pyobj,const_cast<char *>(GetString(s))); /* fetch bound method */ --- 362,366 ---- void pyext::m_get(const t_symbol *s) { ! PyThreadState *state = PyLock(); PyObject *pvar = PyObject_GetAttrString(pyobj,const_cast<char *>(GetString(s))); /* fetch bound method */ *************** *** 369,373 **** if(lst) { // dump value to attribute outlet ! AtomAnything out("get",lst->Count()+1); SetSymbol(out[0],s); out.Set(lst->Count(),lst->Atoms(),1); --- 373,377 ---- if(lst) { // dump value to attribute outlet ! AtomAnything out(sym_get,lst->Count()+1); SetSymbol(out[0],s); out.Set(lst->Count(),lst->Atoms(),1); *************** *** 381,390 **** } ! PY_UNLOCK } void pyext::m_set(int argc,const t_atom *argv) { ! PY_LOCK if(argc < 2 || !IsString(argv[0])) --- 385,394 ---- } ! PyUnlock(state); } void pyext::m_set(int argc,const t_atom *argv) { ! PyThreadState *state = PyLock(); if(argc < 2 || !IsString(argv[0])) *************** *** 418,430 **** } ! PY_UNLOCK } ! BL pyext::m_method_(I n,const t_symbol *s,I argc,const t_atom *argv) { ! BL ret = false; if(pyobj && n >= 1) ! ret = callwork(n,s,argc,argv); else post("%s - no method for type '%s' into inlet %i",thisName(),GetString(s),n); --- 422,434 ---- } ! PyUnlock(state); } ! bool pyext::m_method_(int n,const t_symbol *s,int argc,const t_atom *argv) { ! bool ret = false; if(pyobj && n >= 1) ! ret = work(n,s,argc,argv); else post("%s - no method for type '%s' into inlet %i",thisName(),GetString(s),n); *************** *** 433,440 **** ! V pyext::m_help() { post(""); ! post("%s %s - python class object, (C)2002-2004 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 437,444 ---- ! void pyext::m_help() { post(""); ! post("%s %s - python class object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); *************** *** 461,469 **** } ! PyObject *pyext::call(const C *meth,I inlet,const t_symbol *s,I argc,const t_atom *argv) { ! PyObject *ret = NULL; ! PyObject *pmeth = PyObject_GetAttrString(pyobj,const_cast<char *>(meth)); /* fetch bound method */ if(pmeth == NULL) { PyErr_Clear(); // no method found --- 465,489 ---- } ! bool pyext::callpy(PyObject *fun,PyObject *args) { ! PyObject *ret = PyObject_Call(fun,args,NULL); ! if(ret == NULL) { ! // function not found resp. arguments not matching ! PyErr_Print(); ! return false; ! } ! else { ! if(!PyObject_Not(ret)) post("pyext - returned value is ignored"); ! Py_DECREF(ret); ! return true; ! } ! } ! ! bool pyext::call(const char *meth,int inlet,const t_symbol *s,int argc,const t_atom *argv) ! { ! bool ret = false; ! ! PyObject *pmeth = PyObject_GetAttrString(pyobj,const_cast<char *>(meth)); /* fetch bound method */ if(pmeth == NULL) { PyErr_Clear(); // no method found *************** *** 471,555 **** else { PyObject *pargs = MakePyArgs(s,argc,argv,inlet?inlet:-1,true); ! if(!pargs) PyErr_Print(); ! else { ! ret = PyEval_CallObject(pmeth, pargs); ! if (ret == NULL) // function not found resp. arguments not matching ! PyErr_Print(); ! ! Py_DECREF(pargs); ! } ! Py_DECREF(pmeth); ! } ! ! return ret; ! } ! ! V pyext::work_wrapper(V *data) ! { ! ++thrcount; ! #ifdef FLEXT_DEBUG ! if(!data) ! post("%s - no data!",thisName()); ! else ! #endif ! { ! #ifdef FLEXT_THREADS ! // --- make new Python thread --- ! // get the global lock ! PyEval_AcquireLock(); ! // create a thread state object for this thread ! PyThreadState *newthr = FindThreadState(); ! // free the lock ! PyEval_ReleaseLock(); ! #endif ! { ! // call worker ! work_data *w = (work_data *)data; ! work(w->n,w->Header(),w->Count(),w->Atoms()); ! delete w; } ! ! #ifdef FLEXT_THREADS ! // --- delete Python thread --- ! // grab the lock ! PyEval_AcquireLock(); ! // swap my thread state out of the interpreter ! PyThreadState_Swap(NULL); ! // delete mapped thread state ! FreeThreadState(); ! // release the lock ! PyEval_ReleaseLock(); ! // ----------------------------- ! #endif ! } ! --thrcount; ! } ! ! BL pyext::callwork(I n,const t_symbol *s,I argc,const t_atom *argv) ! { ! BL ret = true,ok = false; ! if(detach) { ! if(shouldexit) ! post("%s - Stopping.... new threads can't be launched now!",thisName()); ! else { ! ret = FLEXT_CALLMETHOD_X(work_wrapper,new work_data(n,s,argc,argv)); ! if(!ret) post("%s - Failed to launch thread!",thisName()); ! } } ! else ! ret = ok = work(n,s,argc,argv); ! Respond(ok); ! return ret; } ! BL pyext::work(I n,const t_symbol *s,I argc,const t_atom *argv) { ! BL retv = false; ! PY_LOCK ! PyObject *ret = NULL; ! char *str = new char[strlen(GetString(s))+10]; { --- 491,512 ---- else { PyObject *pargs = MakePyArgs(s,argc,argv,inlet?inlet:-1,true); ! if(!pargs) { PyErr_Print(); ! Py_DECREF(pmeth); } ! else ! ret = gencall(pmeth,pargs); } ! return ret; } ! bool pyext::work(int n,const t_symbol *s,int argc,const t_atom *argv) { ! bool ret = false; ! PyThreadState *state = PyLock(); ! // should be enough... ! char str[256]; { *************** *** 564,568 **** if(s == sym_bang && !argc) { t_atom argv; ! SetString(argv,""); ret = call(str,0,s,1,&argv); } --- 521,525 ---- if(s == sym_bang && !argc) { t_atom argv; ! SetSymbol(argv,sym__); ret = call(str,0,s,1,&argv); } *************** *** 577,588 **** if(!ret) { // try anything at any inlet ! strcpy(str,"_anything_"); if(s == sym_bang && !argc) { t_atom argv; ! SetString(argv,""); ! ret = call(str,n,s,1,&argv); } else ! ret = call(str,n,s,argc,argv); } --- 534,545 ---- if(!ret) { // try anything at any inlet ! const char *str1 = "_anything_"; if(s == sym_bang && !argc) { t_atom argv; ! SetSymbol(argv,sym__); ! ret = call(str1,n,s,1,&argv); } else ! ret = call(str1,n,s,argc,argv); } *************** *** 591,604 **** post("%s - no matching method found for '%s' into inlet %i",thisName(),GetString(s),n); ! if(str) delete[] str; ! ! if(ret) { ! if(!PyObject_Not(ret)) post("%s - returned value is ignored",thisName()); ! Py_DECREF(ret); ! retv = true; ! } ! ! PY_UNLOCK ! return retv; } --- 548,554 ---- post("%s - no matching method found for '%s' into inlet %i",thisName(),GetString(s),n); ! PyUnlock(state); ! Respond(ret); ! return ret; } Index: py.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/py.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** py.cpp 10 Nov 2004 03:31:34 -0000 1.15 --- py.cpp 9 Jan 2005 04:59:30 -0000 1.16 *************** *** 3,7 **** py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2004 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python script object for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 18,55 **** public: ! pyobj(I argc,const t_atom *argv); ~pyobj(); protected: ! BL m_method_(I n,const t_symbol *s,I argc,const t_atom *argv); ! BL work(const t_symbol *s,I argc,const t_atom *argv); ! V m_bang() { callwork(sym_bang,0,NULL); } ! V m_reload(); ! V m_reload_(I argc,const t_atom *argv); ! V m_set(I argc,const t_atom *argv); ! V m_dir_() { m__dir(function); } ! V m_doc_() { m__doc(function); } ! virtual V m_help(); // methods for python arguments ! V callwork(const t_symbol *s,I argc,const t_atom *argv); ! V m_py_list(I argc,const t_atom *argv) { callwork(sym_list,argc,argv); } ! V m_py_float(I argc,const t_atom *argv) { callwork(sym_float,argc,argv); } ! V m_py_int(I argc,const t_atom *argv) { callwork(sym_int,argc,argv); } ! V m_py_any(const t_symbol *s,I argc,const t_atom *argv) { callwork(s,argc,argv); } const t_symbol *funname; PyObject *function; ! virtual V Reload(); ! V SetFunction(const C *func); ! V ResetFunction(); private: static void Setup(t_classid c); --- 18,58 ---- public: ! pyobj(int argc,const t_atom *argv); ~pyobj(); protected: ! bool m_method_(int n,const t_symbol *s,int argc,const t_atom *argv); ! bool work(const t_symbol *s,int argc,const t_atom *argv); ! void m_bang() { callwork(sym_bang,0,NULL); } ! void m_reload(); ! void m_reload_(int argc,const t_atom *argv); ! void m_set(int argc,const t_atom *argv); ! void m_dir_() { m__dir(function); } ! void m_doc_() { m__doc(function); } ! virtual void m_help(); // methods for python arguments ! void callwork(const t_symbol *s,int argc,const t_atom *argv); ! void m_py_list(int argc,const t_atom *argv) { callwork(sym_list,argc,argv); } ! void m_py_float(int argc,const t_atom *argv) { callwork(sym_float,argc,argv); } ! void m_py_int(int argc,const t_atom *argv) { callwork(sym_int,argc,argv); } ! void m_py_any(const t_symbol *s,int argc,const t_atom *argv) { callwork(s,argc,argv); } const t_symbol *funname; PyObject *function; ! virtual void Reload(); ! void SetFunction(const char *func); ! void ResetFunction(); private: + + virtual bool callpy(PyObject *fun,PyObject *args); + static void Setup(t_classid c); *************** *** 99,106 **** } ! pyobj::pyobj(I argc,const t_atom *argv): function(NULL),funname(NULL) { ! PY_LOCK AddInAnything(2); --- 102,109 ---- } ! pyobj::pyobj(int argc,const t_atom *argv): function(NULL),funname(NULL) { ! PyThreadState *state = PyLock(); AddInAnything(2); *************** *** 117,121 **** post("%s - script name argument is invalid",thisName()); else { ! C dir[1024]; GetModulePath(GetString(argv[0]),dir,sizeof(dir)); // set script path --- 120,124 ---- post("%s - script name argument is invalid",thisName()); else { ! char dir[1024]; GetModulePath(GetString(argv[0]),dir,sizeof(dir)); // set script path *************** *** 128,137 **** AddToPath(GetString(canvas_getcurrentdir())); #elif FLEXT_SYS == FLEXT_SYS_MAX ! #if FLEXT_OS == FLEXT_OS_WIN ! #else short path = patcher_myvol(thisCanvas()); path_topathname(path,NULL,dir); AddToPath(dir); ! #endif #else #pragma message("Adding current dir to path is not implemented") --- 131,139 ---- AddToPath(GetString(canvas_getcurrentdir())); #elif FLEXT_SYS == FLEXT_SYS_MAX ! /* short path = patcher_myvol(thisCanvas()); path_topathname(path,NULL,dir); AddToPath(dir); ! */ #else #pragma message("Adding current dir to path is not implemented") *************** *** 154,165 **** } ! PY_UNLOCK } pyobj::~pyobj() { ! PY_LOCK Unregister("_py"); ! PY_UNLOCK } --- 156,167 ---- } ! PyUnlock(state); } pyobj::~pyobj() { ! PyThreadState *state = PyLock(); Unregister("_py"); ! PyUnlock(state); } *************** *** 167,171 **** ! BL pyobj::m_method_(I n,const t_symbol *s,I argc,const t_atom *argv) { if(n == 1) --- 169,173 ---- ! bool pyobj::m_method_(int n,const t_symbol *s,int argc,const t_atom *argv) { if(n == 1) *************** *** 174,180 **** } ! V pyobj::m_reload() { ! PY_LOCK Unregister("_py"); --- 176,182 ---- } ! void pyobj::m_reload() { ! PyThreadState *state = PyLock(); Unregister("_py"); *************** *** 185,205 **** SetFunction(funname?GetString(funname):NULL); ! PY_UNLOCK } ! V pyobj::m_reload_(I argc,const t_atom *argv) { ! PY_LOCK SetArgs(argc,argv); ! PY_UNLOCK m_reload(); } ! V pyobj::m_set(I argc,const t_atom *argv) { ! PY_LOCK ! I ix = 0; if(argc >= 2) { if(!IsString(argv[ix])) { --- 187,207 ---- SetFunction(funname?GetString(funname):NULL); ! PyUnlock(state); } ! void pyobj::m_reload_(int argc,const t_atom *argv) { ! PyThreadState *state = PyLock(); SetArgs(argc,argv); ! PyUnlock(state); m_reload(); } ! void pyobj::m_set(int argc,const t_atom *argv) { ! PyThreadState *state = PyLock(); ! int ix = 0; if(argc >= 2) { if(!IsString(argv[ix])) { *************** *** 207,211 **** return; } ! const C *sn = GetString(argv[ix]); if(!module || !strcmp(sn,PyModule_GetName(module))) { --- 209,213 ---- return; } ! const char *sn = GetString(argv[ix]); if(!module || !strcmp(sn,PyModule_GetName(module))) { *************** *** 222,232 **** SetFunction(GetString(argv[ix])); ! PY_UNLOCK } ! V pyobj::m_help() { post(""); ! post("%s %s - python script object, (C)2002-2004 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 224,234 ---- SetFunction(GetString(argv[ix])); ! PyUnlock(state); } ! void pyobj::m_help() { post(""); ! post("%s %s - python script object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); *************** *** 249,253 **** post("\tdir+: dump function dictionary"); #ifdef FLEXT_THREADS ! post("\tdetach 0/1: detach threads"); post("\tstop {wait time (ms)}: stop threads"); #endif --- 251,255 ---- post("\tdir+: dump function dictionary"); #ifdef FLEXT_THREADS ! post("\tdetach 0/1/2: detach threads"); post("\tstop {wait time (ms)}: stop threads"); #endif *************** *** 255,259 **** } ! V pyobj::ResetFunction() { if(!module || !dict) --- 257,261 ---- } ! void pyobj::ResetFunction() { if(!module || !dict) *************** *** 264,268 **** } ! function = funname?PyDict_GetItemString(dict,(C *)GetString(funname)):NULL; // borrowed!!! if(!function) { PyErr_Clear(); --- 266,270 ---- } ! function = funname?PyDict_GetItemString(dict,(char *)GetString(funname)):NULL; // borrowed!!! if(!function) { PyErr_Clear(); *************** *** 275,279 **** } ! V pyobj::SetFunction(const C *func) { if(func) { --- 277,281 ---- } ! void pyobj::SetFunction(const char *func) { if(func) { *************** *** 286,314 **** ! V pyobj::Reload() { ResetFunction(); } ! ! BL pyobj::work(const t_symbol *s,I argc,const t_atom *argv) { ! AtomList *rargs = NULL; ! BL ret; ! ! ++thrcount; ! PY_LOCK if(function) { ! PyObject *pArgs = MakePyArgs(s,argc,argv); ! PyObject *pValue = PyObject_CallObject(function, pArgs); ! ! rargs = GetPyArgs(pValue); ! if(!rargs) PyErr_Print(); ! Py_XDECREF(pArgs); ! Py_XDECREF(pValue); ! ret = true; ! } else { post("%s: no function defined",thisName()); --- 288,332 ---- ! void pyobj::Reload() { ResetFunction(); } ! bool pyobj::callpy(PyObject *fun,PyObject *args) { ! PyObject *ret = PyObject_Call(fun,args,NULL); ! if(ret == NULL) { ! // function not found resp. arguments not matching ! PyErr_Print(); ! return false; ! } ! else { ! AtomList *rargs = GetPyArgs(ret); ! if(!rargs) ! PyErr_Print(); ! else { ! // call to outlet _outside_ the Mutex lock! ! // otherwise (if not detached) deadlock will occur ! if(rargs->Count()) ToOutList(0,*rargs); ! delete rargs; ! } ! Py_DECREF(ret); ! return true; ! } ! } + void pyobj::callwork(const t_symbol *s,int argc,const t_atom *argv) + { + bool ret = false; + if(function) { ! PyThreadState *state = PyLock(); ! ! PyObject *pargs = MakePyArgs(s,argc,argv); ! Py_INCREF(function); ! ret = gencall(function,pargs); ! PyUnlock(state); ! } else { post("%s: no function defined",thisName()); *************** *** 316,347 **** } - PY_UNLOCK - --thrcount; - - if(rargs) { - // call to outlet _outside_ the Mutex lock! - // otherwise (if not detached) deadlock will occur - if(rargs->Count()) ToOutList(0,*rargs); - delete rargs; - } - - return ret; - } - - V pyobj::callwork(const t_symbol *s,I argc,const t_atom *argv) - { - BL ret = false; - if(detach) { - if(shouldexit) - post("%s - New threads can't be launched now!",thisName()); - else { - ret = FLEXT_CALLMETHOD_A(work,s,argc,argv); - if(!ret) post("%s - Failed to launch thread!",thisName()); - } - } - else - ret = work(s,argc,argv); Respond(ret); } - - --- 334,337 ----

1 0

externals/tb/volctl~ volctl~.c,1.2,1.3
by Tim Blechmann 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/tb/volctl~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25349 Modified Files: volctl~.c Log Message: improvement for zero factor ... x * 0 = 0 Index: volctl~.c =================================================================== RCS file: /cvsroot/pure-data/externals/tb/volctl~/volctl~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** volctl~.c 28 Dec 2004 15:48:19 -0000 1.2 --- volctl~.c 8 Jan 2005 22:13:53 -0000 1.3 *************** *** 40,45 **** t_float x_h; //interpolation time t_float x_value; //current factor ! int x_ticksleft; //ticks to go t_float x_samples_per_ms; //ms per sample t_float x_slope; //slope --- 40,46 ---- t_float x_h; //interpolation time t_float x_value; //current factor + t_float x_target; //target factor ! int x_ticksleft; //dsp ticks to go t_float x_samples_per_ms; //ms per sample t_float x_slope; //slope *************** *** 47,51 **** t_float x_slope_step; int x_line; ! } t_volctl; --- 48,53 ---- t_float x_slope_step; int x_line; ! int x_blocksize; ! t_float x_1overblocksize; } t_volctl; *************** *** 64,67 **** --- 66,71 ---- x->x_samples_per_ms = 44100.f / 1000.f; // assume default samplerate + x->x_blocksize = 64; + x->x_1overblocksize = 1.f/64.f; outlet_new(&x->x_obj, &s_signal); *************** *** 78,83 **** } ! ! t_int *volctl_perform(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); --- 82,86 ---- } ! static t_int *volctl_perform(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); *************** *** 86,123 **** int n = (int)(w[4]); - t_float f = x->x_value; if (x->x_ticksleft) { t_float x_slope = x->x_slope; ! if (x->x_ticksleft < n) ! { ! int remain = x->x_ticksleft; ! n-=remain; ! while (remain--) ! { ! f+=x_slope; ! *out++ = *in++ * f; ! } ! while (n--) ! { ! *out++ = *in++ * f; ! } ! x->x_value = f; ! x->x_ticksleft = 0; ! } ! else { ! x->x_ticksleft -=n; ! while (n--) ! { ! f+=x_slope; ! *out++ = *in++ * f; ! } ! x->x_value = f; } } else while (n--) *out++ = *in++ * f; return (w+5); --- 89,111 ---- int n = (int)(w[4]); if (x->x_ticksleft) { + t_float f = x->x_value; t_float x_slope = x->x_slope; ! ! x->x_ticksleft--; ! while (n--) { ! f+=x_slope; ! *out++ = *in++ * f; } + x->x_value = f; } else + { + t_float f = x->x_target; while (n--) *out++ = *in++ * f; + } return (w+5); *************** *** 125,129 **** ! t_int *volctl_perf8(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); --- 113,117 ---- ! static t_int *volctl_perf8(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); *************** *** 132,197 **** int n = (int)(w[4]); - t_float f = x->x_value; - if (x->x_ticksleft) { t_float x_slope = x->x_slope; ! if (x->x_ticksleft < n) { ! int remain = x->x_ticksleft; ! n-=remain; ! while (remain--) ! { ! *out++ = *in++ * f; ! f+=x_slope; ! } ! while (n--) { ! *out++ = *in++ * f; } - x->x_value = f; - x->x_ticksleft = 0; - } else ! { ! x->x_ticksleft -= n; ! n = n>>3; ! while (n--) { ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; } ! x->x_value = f; ! } ! } ! else ! { ! for (; n; n -= 8, in += 8, out += 8) ! { ! t_float f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; ! t_float f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; ! ! out[0] = f0 * f; out[1] = f1 * f; out[2] = f2 * f; out[3] = f3 * f; ! out[4] = f4 * f; out[5] = f5 * f; out[6] = f6 * f; out[7] = f7 * f; ! } } return (w+5); } ! t_int *volctl_perf_simd(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); --- 120,176 ---- int n = (int)(w[4]); if (x->x_ticksleft) { + t_float f = x->x_value; + t_float x_slope = x->x_slope; ! x->x_ticksleft--; ! n = n>>3; ! while (n--) { ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! *out++ = *in++ * f; ! f+=x_slope; ! } ! x->x_value = f; ! } ! else ! { ! t_float f = x->x_target; ! ! if (f) ! for (; n; n -= 8, in += 8, out += 8) { ! t_float f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; ! t_float f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; ! ! out[0] = f0 * f; out[1] = f1 * f; out[2] = f2 * f; out[3] = f3 * f; ! out[4] = f4 * f; out[5] = f5 * f; out[6] = f6 * f; out[7] = f7 * f; } else ! for (; n; n -= 8, in += 8, out += 8) { ! out[0] = 0; out[1] = 0; out[2] = 0; out[3] = 0; ! out[4] = 0; out[5] = 0; out[6] = 0; out[7] = 0; } ! } return (w+5); } ! static t_int *volctl_perf_simd(t_int *w) { t_volctl * x = (t_volctl *)(w[1]); *************** *** 203,304 **** int n = (int)(w[4]); ! t_float x_slope = x->x_slope; ! if (x->x_ticksleft < n) ! { ! t_float f = x->x_value; ! int remain = x->x_ticksleft; ! n-=remain; ! while (remain--) ! { ! *out++ = *in++ * f; ! f+=x_slope; ! } ! while (n--) ! { ! *out++ = *in++ * f; ! } ! x->x_value = f; ! x->x_ticksleft = 0; ! } ! else ! { ! x->x_ticksleft -= n; asm( ".set T_FLOAT,4 \n" ! "movss (%3),%%xmm0 \n" /* value */ "shufps $0, %%xmm0, %%xmm0 \n" ! "movaps (%4), %%xmm1 \n" /* x_slopes */ ! "addps %%xmm0, %%xmm1 \n" ! ! "movss (%5), %%xmm0 \n" ! "shufps $0, %%xmm0, %%xmm0 \n" /* x_slope_step */ ! ! "shrl $4, %2 \n" /* n>>4 */ ! "1: \n" ! "movaps (%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, (%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! "movaps 4*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" "movaps %%xmm2, 4*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! ! "movaps 8*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, 8*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! ! "movaps 12*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, 12*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" /* one instr. obsolete */ ! "addl $16*T_FLOAT, %0 \n" "addl $16*T_FLOAT, %1 \n" "loop 1b \n" - : ! :"r"(in), "r"(out), "c"(n), "r"(&(t_float)(x->x_value)), ! "r"((t_float*)x->x_slopes), "r"(&(t_float)(x->x_slope_step)) ! :"%xmm0", "%xmm1", "%xmm2"); ! /* post("value %f", x->x_value); */ ! x->x_value += n*(x->x_slope); ! } ! } ! else ! { ! asm( ! ".set T_FLOAT,4 \n" ! "movss (%3), %%xmm0 \n" ! "shufps $0, %%xmm0, %%xmm0 \n" ! "shrl $4, %2 \n" - "volctl_loop: \n" - "movaps (%0), %%xmm1 \n" - "mulps %%xmm0, %%xmm1 \n" - "movaps %%xmm1, (%1) \n" - "movaps 4*T_FLOAT(%0), %%xmm2 \n" - "mulps %%xmm0, %%xmm2 \n" - "movaps %%xmm2, 4*T_FLOAT(%1) \n" - "movaps 8*T_FLOAT(%0), %%xmm3 \n" - "mulps %%xmm0, %%xmm3 \n" - "movaps %%xmm3, 8*T_FLOAT(%1) \n" - "movaps 12*T_FLOAT(%0), %%xmm4 \n" - "mulps %%xmm0, %%xmm4 \n" - "movaps %%xmm4, 12*T_FLOAT(%1) \n" - "addl $16*T_FLOAT, %0 \n" - "addl $16*T_FLOAT, %1 \n" - "loop volctl_loop \n" - : - : "r"(in), "r"(out), - "c"(w[4]),"r"(&(t_float)(x->x_value)) - : "%xmm0", "%xmm1","%xmm2","%xmm3","%xmm4"); } return (w+5); --- 182,280 ---- int n = (int)(w[4]); ! x->x_ticksleft--; ! ! asm( ! ".set T_FLOAT,4 \n" ! "movss (%3),%%xmm0 \n" /* value */ ! "shufps $0, %%xmm0, %%xmm0 \n" ! "movaps (%4), %%xmm1 \n" /* x_slopes */ ! "addps %%xmm0, %%xmm1 \n" ! "movss (%5), %%xmm0 \n" ! "shufps $0, %%xmm0, %%xmm0 \n" /* x_slope_step */ ! ! "shrl $4, %2 \n" /* n>>4 */ ! ! "1: \n" ! "movaps (%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, (%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! ! "movaps 4*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, 4*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! ! "movaps 8*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, 8*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" ! ! "movaps 12*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm1, %%xmm2 \n" ! "movaps %%xmm2, 12*T_FLOAT(%1) \n" ! "addps %%xmm0, %%xmm1 \n" /* one instr. obsolete */ ! ! "addl $16*T_FLOAT, %0 \n" ! "addl $16*T_FLOAT, %1 \n" ! "loop 1b \n" + : + :"r"(in), "r"(out), "c"(n), "r"(&(t_float)(x->x_value)), + "r"((t_float*)x->x_slopes), "r"(&(t_float)(x->x_slope_step)) + :"%xmm0", "%xmm1", "%xmm2"); + + x->x_value += n*(x->x_slope); + } + else + { + if(x->x_target) asm( ".set T_FLOAT,4 \n" ! ! "movss (%3), %%xmm0 \n" "shufps $0, %%xmm0, %%xmm0 \n" ! "shrl $4, %2 \n" ! "1: \n" ! "movaps (%0), %%xmm1 \n" ! "mulps %%xmm0, %%xmm1 \n" ! "movaps %%xmm1, (%1) \n" "movaps 4*T_FLOAT(%0), %%xmm2 \n" ! "mulps %%xmm0, %%xmm2 \n" "movaps %%xmm2, 4*T_FLOAT(%1) \n" ! "movaps 8*T_FLOAT(%0), %%xmm3 \n" ! "mulps %%xmm0, %%xmm3 \n" ! "movaps %%xmm3, 8*T_FLOAT(%1) \n" ! "movaps 12*T_FLOAT(%0), %%xmm4 \n" ! "mulps %%xmm0, %%xmm4 \n" ! "movaps %%xmm4, 12*T_FLOAT(%1) \n" "addl $16*T_FLOAT, %0 \n" "addl $16*T_FLOAT, %1 \n" "loop 1b \n" : ! : "r"(in), "r"(out), ! "c"(w[4]),"r"(&(t_float)(x->x_target)) ! : "%xmm0", "%xmm1","%xmm2","%xmm3","%xmm4"); ! else ! asm( ! ".set T_FLOAT,4 \n" ! "xorps %%xmm0, %%xmm0 \n" ! "shrl $4, %1 \n" ! "1: \n" ! "movaps %%xmm0, (%0) \n" ! "movaps %%xmm0, 4*T_FLOAT(%0) \n" ! "movaps %%xmm0, 8*T_FLOAT(%0) \n" ! "movaps %%xmm0, 12*T_FLOAT(%0) \n" ! "addl $16*T_FLOAT, %0 \n" ! "loop 1b \n" ! : ! :"r"(out), ! "c"(w[4]) ! : "%xmm0"); } return (w+5); *************** *** 306,316 **** ! void volctl_set(t_volctl *x, t_float f) { t_float slope; int i; ! ! x->x_ticksleft = x->x_h * x->x_samples_per_ms; ! slope = (f - x->x_value) / x->x_ticksleft; x->x_slope = slope; --- 282,294 ---- ! static void volctl_set(t_volctl *x, t_float f) { t_float slope; int i; ! int samplesleft = x->x_h * x->x_samples_per_ms; ! samplesleft += x->x_blocksize - ( samplesleft & (x->x_blocksize - 1)); ! x->x_ticksleft = (int) (t_float)samplesleft * x->x_1overblocksize; ! ! slope = (f - x->x_value) / samplesleft; x->x_slope = slope; *************** *** 320,326 **** } x->x_slope_step = 4*slope; } ! void volctl_dsp(t_volctl *x, t_signal **sp) { const int n = sp[0]->s_n; --- 298,306 ---- } x->x_slope_step = 4*slope; + + x->x_target = f; } ! static void volctl_dsp(t_volctl *x, t_signal **sp) { const int n = sp[0]->s_n; *************** *** 334,338 **** dsp_add(volctl_perf8, 4, x, sp[0]->s_vec, sp[1]->s_vec, n); } ! x->x_samples_per_ms = sp[0]->s_sr / 1000.f; } --- 314,321 ---- dsp_add(volctl_perf8, 4, x, sp[0]->s_vec, sp[1]->s_vec, n); } ! ! x->x_blocksize = n; ! x->x_1overblocksize = 1./n; ! x->x_samples_per_ms = sp[0]->s_sr / 1000.f; }

1 0

pd/src m_simd_sse_gcc.c,1.1.4.8,1.1.4.9 m_simd_sse_vc.h,1.1.4.4,1.1.4.5 m_simd_sse_gcc.h,1.1.4.4,1.1.4.5 m_simd_ve_gcc.h,1.1.4.2,1.1.4.3 m_simd.c,1.1.4.2,1.1.4.3 d_ctl.c,1.3.4.4,1.3.4.5
by Tim Blechmann 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25230 Modified Files: Tag: devel_0_38 m_simd_sse_gcc.c m_simd_sse_vc.h m_simd_sse_gcc.h m_simd_ve_gcc.h m_simd.c d_ctl.c Log Message: oops ... reversed hanning ... this should work Index: m_simd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** m_simd.c 8 Jan 2005 19:43:52 -0000 1.1.4.2 --- m_simd.c 8 Jan 2005 22:13:40 -0000 1.1.4.3 *************** *** 111,112 **** --- 111,161 ---- #endif /* DONTUSESIMD */ + + float sumvec_8(t_float* in, t_int n) + { + int i; + float result = 0; + + n>>=3; + for (i = 0; i != n; ++i) + { + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + } + return result; + } + + float env_tilde_accum(t_float* in, t_float* hp, t_int n) + { + float ret = 0; + int i; + + n>>=3; + for (i = 0; i !=n; ++i) + { + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + in--; + ret += *hp++ * (*in * *in); + } + + return ret; + } Index: d_ctl.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ctl.c,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -C2 -d -r1.3.4.4 -r1.3.4.5 *** d_ctl.c 8 Jan 2005 19:43:51 -0000 1.3.4.4 --- d_ctl.c 8 Jan 2005 22:13:40 -0000 1.3.4.5 *************** *** 653,658 **** float x_sumbuf[MAXOVERLAP]; /* summing buffer */ float x_f; - float *x_tmpbuf; /* tb: temporary buffer for simd */ - int x_blocksize; /* tb: only for freealignedbytes */ } t_sigenv; --- 653,656 ---- *************** *** 689,694 **** x->x_outlet = outlet_new(&x->x_obj, gensym("float")); x->x_f = 0; - x->x_blocksize = 64; - x->x_tmpbuf = getalignedbytes(x->x_blocksize * sizeof(float)); return (x); } --- 687,690 ---- *************** *** 734,757 **** /* tb: loop unrolling and simd */ ! float sumvec_8(t_float* in, t_int n) ! { ! int i; ! float result = 0; ! ! n>>=3; ! for (i = 0; i != n; ++i) ! { ! result += *in++; ! result += *in++; ! result += *in++; ! result += *in++; ! result += *in++; ! result += *in++; ! result += *in++; ! result += *in++; ! } ! return result; ! } ! static t_int *env_tilde_perf8(t_int *w) --- 730,734 ---- /* tb: loop unrolling and simd */ ! float env_tilde_accum(t_float* in, t_float* hp, t_int n); static t_int *env_tilde_perf8(t_int *w) *************** *** 762,788 **** int count; float *sump; for (count = x->x_phase, sump = x->x_sumbuf; count < x->x_npoints; count += x->x_realperiod, sump++) { float *hp = x->x_buf + count; - float *fp = in; - float sum = *sump; - float *tmp = x->x_tmpbuf; - int i; - t_int sqrargs[4]; - t_int timesargs[5]; ! sqrargs[1] = (t_int)in; ! sqrargs[2] = (t_int)tmp; ! sqrargs[3] = (t_int) n; ! timesargs[1] = (t_int)tmp; ! timesargs[2] = (t_int)hp; ! timesargs[3] = (t_int)tmp; ! timesargs[4] = (t_int)n; ! ! sqr_perf8(sqrargs); ! times_perf8(timesargs); ! ! *sump += sumvec_8(tmp,n); } sump[0] = 0; --- 739,749 ---- int count; float *sump; + in += n; for (count = x->x_phase, sump = x->x_sumbuf; count < x->x_npoints; count += x->x_realperiod, sump++) { float *hp = x->x_buf + count; ! *sump += env_tilde_accum(in, hp, n); } sump[0] = 0; *************** *** 808,834 **** int count; float *sump; for (count = x->x_phase, sump = x->x_sumbuf; count < x->x_npoints; count += x->x_realperiod, sump++) { float *hp = x->x_buf + count; - float *fp = in; - float sum = *sump; - float *tmp = x->x_tmpbuf; - int i; - t_int sqrargs[4]; - t_int timesargs[5]; - - sqrargs[1] = (t_int)in; - sqrargs[2] = (t_int)tmp; - sqrargs[3] = (t_int) n; - timesargs[1] = (t_int)tmp; - timesargs[2] = (t_int)hp; - timesargs[3] = (t_int)tmp; - timesargs[4] = (t_int)n; ! sqr_perf_simd(sqrargs); ! times_perf_simd(timesargs); ! ! *sump += sumvec_simd(tmp,n); } sump[0] = 0; --- 769,779 ---- int count; float *sump; + in += n; for (count = x->x_phase, sump = x->x_sumbuf; count < x->x_npoints; count += x->x_realperiod, sump++) { float *hp = x->x_buf + count; ! *sump += env_tilde_accum_simd(in, hp, n); } sump[0] = 0; *************** *** 863,868 **** if (sp[0]->s_n > MAXVSTAKEN) bug("env_tilde_dsp"); - - x->x_blocksize = sp[0]->s_n; } --- 808,811 ---- Index: m_simd_sse_vc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_vc.h,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** m_simd_sse_vc.h 8 Jan 2005 19:43:52 -0000 1.1.4.4 --- m_simd_sse_vc.h 8 Jan 2005 22:13:40 -0000 1.1.4.5 *************** *** 42,45 **** --- 42,46 ---- #define sum_vecsimd sumvec_8 + #define env_tilde_accum_simd env_tilde_accum #define sigwrap_perf_simd sigwrap_perform /* SIMD not implemented */ Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.4.8 retrieving revision 1.1.4.9 diff -C2 -d -r1.1.4.8 -r1.1.4.9 *** m_simd_sse_gcc.c 8 Jan 2005 19:43:52 -0000 1.1.4.8 --- m_simd_sse_gcc.c 8 Jan 2005 22:13:40 -0000 1.1.4.9 *************** *** 815,819 **** float sumvec_simd(t_float* in, t_int n) { ! float ret = 0; asm( ".set T_FLOAT,4 \n" --- 815,819 ---- float sumvec_simd(t_float* in, t_int n) { ! float ret; asm( ".set T_FLOAT,4 \n" *************** *** 859,862 **** --- 859,929 ---- + float env_tilde_accum_simd(t_float* in, t_float* hp, t_int n) + { + float ret; + asm( + ".set T_FLOAT,4 \n" + + "shrl $4, %2 \n" /* divide by 16 */ + "xorps %%xmm2, %%xmm2 \n" /* zero values */ + "xorps %%xmm3, %%xmm3 \n" + "xorps %%xmm4, %%xmm4 \n" + "xorps %0, %0 \n" + + "1: \n" + "movaps -4*T_FLOAT(%1), %%xmm0 \n" + "movhlps %%xmm0, %%xmm1 \n" /* reversing xmm0 CHECK!!!*/ + "shufps $68, %%xmm1, %%xmm0 \n" + "movaps (%3), %%xmm1 \n" + "mulps %%xmm0, %%xmm0 \n" + "mulps %%xmm1, %%xmm0 \n" + "addps %%xmm0, %%xmm2 \n" + + "movaps -8*T_FLOAT(%1), %%xmm0 \n" + "movhlps %%xmm0, %%xmm1 \n" /* reversing xmm0 */ + "shufps $68, %%xmm1, %%xmm0 \n" + "movaps 4*T_FLOAT(%3), %%xmm1 \n" + "mulps %%xmm0, %%xmm0 \n" + "mulps %%xmm1, %%xmm0 \n" + "addps %%xmm0, %%xmm2 \n" + + "movaps -12*T_FLOAT(%1), %%xmm0 \n" + "movhlps %%xmm0, %%xmm1 \n" /* reversing xmm0 */ + "shufps $68, %%xmm1, %%xmm0 \n" + "movaps 8*T_FLOAT(%3), %%xmm1 \n" + "mulps %%xmm0, %%xmm0 \n" + "mulps %%xmm1, %%xmm0 \n" + "addps %%xmm0, %%xmm2 \n" + + "movaps -16*T_FLOAT(%1), %%xmm0 \n" + "movhlps %%xmm0, %%xmm1 \n" /* reversing xmm0 */ + "shufps $68, %%xmm1, %%xmm0 \n" + "movaps 12*T_FLOAT(%3), %%xmm1 \n" + "mulps %%xmm0, %%xmm0 \n" + "mulps %%xmm1, %%xmm0 \n" + "addps %%xmm0, %%xmm2 \n" + + "addl $-16*T_FLOAT,%1 \n" + "addl $16*T_FLOAT,%3 \n" + "loop 1b \n" + + "movhlps %%xmm2, %%xmm3 \n" + "movups %%xmm2, %%xmm4 \n" + "movups %%xmm3, %0 \n" + "shufps $81, %%xmm4, %%xmm4 \n" + "shufps $81, %0, %0 \n" + + "addss %%xmm2, %%xmm3 \n" + "addss %%xmm3, %%xmm4 \n" + "addss %%xmm4, %0 \n" + + + :"=x"(ret) + :"r"(in),"c"(n), "r"(hp) + :"%xmm0","%xmm1","%xmm2","%xmm3", "%xmm4", "%xmm5"); + return ret; + } + + #endif Index: m_simd_sse_gcc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.h,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** m_simd_sse_gcc.h 8 Jan 2005 19:43:52 -0000 1.1.4.4 --- m_simd_sse_gcc.h 8 Jan 2005 22:13:40 -0000 1.1.4.5 *************** *** 19,22 **** --- 19,23 ---- /* functions in d_ctl.c */ t_int *sig_tilde_perf_simd(t_int *w); + float env_tilde_accum_simd(t_float* in, t_float* hp, t_int n); /* functions in d_arithmetic.c */ Index: m_simd_ve_gcc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_ve_gcc.h,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** m_simd_ve_gcc.h 8 Jan 2005 19:43:52 -0000 1.1.4.2 --- m_simd_ve_gcc.h 8 Jan 2005 22:13:40 -0000 1.1.4.3 *************** *** 41,44 **** --- 41,45 ---- t_int *sigrsqrt_perf_simd(t_int *w); + #define env_tilde_accum_simdc env_tilde_accum #define sum_vecsimd sumvec_8 /* SIMD not implemented */

1 0

pd/src d_ctl.c,1.3.4.3,1.3.4.4 m_simd.c,1.1.4.1,1.1.4.2 m_simd_sse_gcc.c,1.1.4.7,1.1.4.8 m_simd_sse_gcc.h,1.1.4.3,1.1.4.4 m_simd_sse_vc.h,1.1.4.3,1.1.4.4 m_simd_ve_gcc.h,1.1.4.1,1.1.4.2 m_pd.h,1.4.4.5,1.4.4.6
by Tim Blechmann 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27025 Modified Files: Tag: devel_0_38 d_ctl.c m_simd.c m_simd_sse_gcc.c m_simd_sse_gcc.h m_simd_sse_vc.h m_simd_ve_gcc.h m_pd.h Log Message: simd code and loop unrolling for env~ (gcc / sse only at the moment) Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** m_pd.h 2 Dec 2004 09:25:15 -0000 1.4.4.5 --- m_pd.h 8 Jan 2005 19:43:52 -0000 1.4.4.6 *************** *** 481,485 **** /* tb: to be called at idle time */ ! EXTERN void set_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc); --- 481,485 ---- /* tb: to be called at idle time */ ! EXTERN void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc); *************** *** 658,661 **** --- 658,662 ---- EXTERN void testcopyvec_8(t_float *dst,const t_float *src,int n); EXTERN void testaddvec_8(t_float *dst,const t_float *src,int n); + EXTERN float sumvec_8(t_float* in, t_int n); /* vectorized, simd functions * *************** *** 667,670 **** --- 668,672 ---- EXTERN void testcopyvec_simd(t_float *dst,const t_float *src,int n); EXTERN void testaddvec_simd(t_float *dst,const t_float *src,int n); + EXTERN float sumvec_simd(t_float* in, t_int n); EXTERN int simd_runtime_check(void); Index: m_simd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd.c,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** m_simd.c 5 Nov 2004 13:33:19 -0000 1.1.4.1 --- m_simd.c 8 Jan 2005 19:43:52 -0000 1.1.4.2 *************** *** 66,71 **** } - - #ifdef DONTUSESIMD int simd_runtime_check() --- 66,69 ---- *************** *** 105,107 **** --- 103,112 ---- } + float sumvec_simd(t_float* in, t_int n) + { + return sumvec_8(in,n); + } + + #endif /* DONTUSESIMD */ + Index: m_simd_sse_gcc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.h,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** m_simd_sse_gcc.h 29 Nov 2004 18:11:38 -0000 1.1.4.3 --- m_simd_sse_gcc.h 8 Jan 2005 19:43:52 -0000 1.1.4.4 *************** *** 41,44 **** --- 41,47 ---- t_int *sigrsqrt_perf_simd(t_int *w); + float sumvec_simd(t_float* in, t_int n); + + //#define sum_vecsimd sumvec_8 #define sigwrap_perf_simd sigwrap_perform /* SIMD not implemented */ Index: m_simd_sse_vc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_vc.h,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** m_simd_sse_vc.h 29 Nov 2004 18:11:38 -0000 1.1.4.3 --- m_simd_sse_vc.h 8 Jan 2005 19:43:52 -0000 1.1.4.4 *************** *** 41,44 **** --- 41,45 ---- t_int *sigrsqrt_perf_simd(t_int *w); + #define sum_vecsimd sumvec_8 #define sigwrap_perf_simd sigwrap_perform /* SIMD not implemented */ Index: m_simd_ve_gcc.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_ve_gcc.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** m_simd_ve_gcc.h 5 Nov 2004 13:33:20 -0000 1.1.4.1 --- m_simd_ve_gcc.h 8 Jan 2005 19:43:52 -0000 1.1.4.2 *************** *** 41,43 **** --- 41,45 ---- t_int *sigrsqrt_perf_simd(t_int *w); + #define sum_vecsimd sumvec_8 /* SIMD not implemented */ + #endif /* __M_SIMD_VE_GCC_H */ Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.4.7 retrieving revision 1.1.4.8 diff -C2 -d -r1.1.4.7 -r1.1.4.8 *** m_simd_sse_gcc.c 29 Nov 2004 18:11:34 -0000 1.1.4.7 --- m_simd_sse_gcc.c 8 Jan 2005 19:43:52 -0000 1.1.4.8 *************** *** 813,816 **** --- 813,861 ---- } + float sumvec_simd(t_float* in, t_int n) + { + float ret = 0; + asm( + ".set T_FLOAT,4 \n" + + "shrl $4, %2 \n" /* divide by 16 */ + "xorps %%xmm4, %%xmm4 \n" /* zero values */ + "xorps %%xmm5, %%xmm5 \n" + "xorps %%xmm6, %%xmm6 \n" + "xorps %0, %0 \n" + + + "1: \n" + "movaps (%1), %%xmm0 \n" + "movaps 4*T_FLOAT(%1), %%xmm1 \n" + "movaps 8*T_FLOAT(%1), %%xmm2 \n" + "movaps 12*T_FLOAT(%1), %%xmm3 \n" + + "addps %%xmm0,%%xmm4 \n" + "addps %%xmm1,%%xmm4 \n" + "addps %%xmm2,%%xmm4 \n" + "addps %%xmm3,%%xmm4 \n" + + "addl $16*T_FLOAT,%1 \n" + "loop 1b \n" + + "movhlps %%xmm4, %%xmm5 \n" + "movups %%xmm4, %%xmm6 \n" + "movups %%xmm5, %0 \n" + "shufps $81, %%xmm6, %%xmm6 \n" + "shufps $81, %0, %0 \n" + + "addss %%xmm4, %%xmm5 \n" + "addss %%xmm5, %%xmm6 \n" + "addss %%xmm6, %0 \n" + + + :"=x"(ret) + :"r"(in),"c"(n) + :"%xmm0","%xmm1","%xmm2","%xmm3", "%xmm4","%xmm5","%xmm6"); + return ret; + } + + #endif Index: d_ctl.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ctl.c,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -C2 -d -r1.3.4.3 -r1.3.4.4 *** d_ctl.c 8 Jan 2005 09:41:02 -0000 1.3.4.3 --- d_ctl.c 8 Jan 2005 19:43:51 -0000 1.3.4.4 *************** *** 653,656 **** --- 653,658 ---- float x_sumbuf[MAXOVERLAP]; /* summing buffer */ float x_f; + float *x_tmpbuf; /* tb: temporary buffer for simd */ + int x_blocksize; /* tb: only for freealignedbytes */ } t_sigenv; *************** *** 670,674 **** if (period < npoints / MAXOVERLAP + 1) period = npoints / MAXOVERLAP + 1; ! if (!(buf = getbytes(sizeof(float) * (npoints + MAXVSTAKEN)))) { error("env: couldn't allocate buffer"); --- 672,676 ---- if (period < npoints / MAXOVERLAP + 1) period = npoints / MAXOVERLAP + 1; ! if (!(buf = getalignedbytes(sizeof(float) * (npoints + MAXVSTAKEN)))) { error("env: couldn't allocate buffer"); *************** *** 687,690 **** --- 689,694 ---- x->x_outlet = outlet_new(&x->x_obj, gensym("float")); x->x_f = 0; + x->x_blocksize = 64; + x->x_tmpbuf = getalignedbytes(x->x_blocksize * sizeof(float)); return (x); } *************** *** 728,731 **** --- 732,851 ---- } + + /* tb: loop unrolling and simd */ + float sumvec_8(t_float* in, t_int n) + { + int i; + float result = 0; + + n>>=3; + for (i = 0; i != n; ++i) + { + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + result += *in++; + } + return result; + } + + + static t_int *env_tilde_perf8(t_int *w) + { + t_sigenv *x = (t_sigenv *)(w[1]); + t_float *in = (t_float *)(w[2]); + int n = (int)(w[3]); + int count; + float *sump; + for (count = x->x_phase, sump = x->x_sumbuf; + count < x->x_npoints; count += x->x_realperiod, sump++) + { + float *hp = x->x_buf + count; + float *fp = in; + float sum = *sump; + float *tmp = x->x_tmpbuf; + int i; + t_int sqrargs[4]; + t_int timesargs[5]; + + sqrargs[1] = (t_int)in; + sqrargs[2] = (t_int)tmp; + sqrargs[3] = (t_int) n; + timesargs[1] = (t_int)tmp; + timesargs[2] = (t_int)hp; + timesargs[3] = (t_int)tmp; + timesargs[4] = (t_int)n; + + sqr_perf8(sqrargs); + times_perf8(timesargs); + + *sump += sumvec_8(tmp,n); + } + sump[0] = 0; + x->x_phase -= n; + if (x->x_phase < 0) + { + x->x_result = x->x_sumbuf[0]; + for (count = x->x_realperiod, sump = x->x_sumbuf; + count < x->x_npoints; count += x->x_realperiod, sump++) + sump[0] = sump[1]; + sump[0] = 0; + x->x_phase = x->x_realperiod - n; + clock_delay(x->x_clock, 0L); + } + return (w+4); + } + + static t_int *env_tilde_perf_simd(t_int *w) + { + t_sigenv *x = (t_sigenv *)(w[1]); + t_float *in = (t_float *)(w[2]); + int n = (int)(w[3]); + int count; + float *sump; + for (count = x->x_phase, sump = x->x_sumbuf; + count < x->x_npoints; count += x->x_realperiod, sump++) + { + float *hp = x->x_buf + count; + float *fp = in; + float sum = *sump; + float *tmp = x->x_tmpbuf; + int i; + t_int sqrargs[4]; + t_int timesargs[5]; + + sqrargs[1] = (t_int)in; + sqrargs[2] = (t_int)tmp; + sqrargs[3] = (t_int) n; + timesargs[1] = (t_int)tmp; + timesargs[2] = (t_int)hp; + timesargs[3] = (t_int)tmp; + timesargs[4] = (t_int)n; + + sqr_perf_simd(sqrargs); + times_perf_simd(timesargs); + + *sump += sumvec_simd(tmp,n); + } + sump[0] = 0; + x->x_phase -= n; + if (x->x_phase < 0) + { + x->x_result = x->x_sumbuf[0]; + for (count = x->x_realperiod, sump = x->x_sumbuf; + count < x->x_npoints; count += x->x_realperiod, sump++) + sump[0] = sump[1]; + sump[0] = 0; + x->x_phase = x->x_realperiod - n; + clock_delay(x->x_clock, 0L); + } + return (w+4); + } + + static void env_tilde_dsp(t_sigenv *x, t_signal **sp) { *************** *** 733,738 **** x->x_period + sp[0]->s_n - (x->x_period % sp[0]->s_n); else x->x_realperiod = x->x_period; ! dsp_add(env_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! if (sp[0]->s_n > MAXVSTAKEN) bug("env_tilde_dsp"); } --- 853,868 ---- x->x_period + sp[0]->s_n - (x->x_period % sp[0]->s_n); else x->x_realperiod = x->x_period; ! ! if (sp[0]->s_n & 7) ! dsp_add(env_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! if (SIMD_CHECK1(sp[0]->s_n, sp[0]->s_vec)) ! dsp_add(env_tilde_perf_simd, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(env_tilde_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n); ! ! if (sp[0]->s_n > MAXVSTAKEN) bug("env_tilde_dsp"); ! ! x->x_blocksize = sp[0]->s_n; } *************** *** 745,749 **** { clock_free(x->x_clock); ! freebytes(x->x_buf, (x->x_npoints + MAXVSTAKEN) * sizeof(float)); } --- 875,879 ---- { clock_free(x->x_clock); ! freealignedbytes(x->x_buf, (x->x_npoints + MAXVSTAKEN) * sizeof(float)); }

1 0

pd/src d_ctl.c,1.3.4.2,1.3.4.3
by Tim Blechmann 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8434 Modified Files: Tag: devel_0_38 d_ctl.c Log Message: minor speedup for line~ Index: d_ctl.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ctl.c,v retrieving revision 1.3.4.2 retrieving revision 1.3.4.3 diff -C2 -d -r1.3.4.2 -r1.3.4.3 *** d_ctl.c 22 Nov 2004 20:25:11 -0000 1.3.4.2 --- d_ctl.c 8 Jan 2005 09:41:02 -0000 1.3.4.3 *************** *** 143,147 **** } ! /* TB: vectorized version */ static t_int *line_tilde_perf8(t_int *w) { --- 143,147 ---- } ! /* tb: vectorized / simd version { */ static t_int *line_tilde_perf8(t_int *w) { *************** *** 157,160 **** --- 157,161 ---- int nticks = x->x_inletwas * x->x_dspticktomsec; if (!nticks) nticks = 1; + post("nticks %d", nticks); x->x_ticksleft = nticks; x->x_biginc = (x->x_target - x->x_value)/(float)nticks; *************** *** 165,169 **** { float f = x->x_value; ! while (n--) *out++ = f, f += x->x_inc; x->x_value += x->x_biginc; x->x_ticksleft--; --- 166,190 ---- { float f = x->x_value; ! n >>= 3; ! while (n--) ! { ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! } ! x->x_value += x->x_biginc; x->x_ticksleft--; *************** *** 172,184 **** { float f = x->x_value = x->x_target; ! for (; n; n -= 8, out += 8) ! { ! out[0] = f; out[1] = f; out[2] = f; out[3] = f; ! out[4] = f; out[5] = f; out[6] = f; out[7] = f; ! } } return (w+4); } static void line_tilde_float(t_line *x, t_float f) { --- 193,256 ---- { float f = x->x_value = x->x_target; ! setvec_8(out,f,n); ! } ! return (w+4); ! } ! ! ! static t_int *line_tilde_perfsimd(t_int *w) ! { ! t_line *x = (t_line *)(w[1]); ! t_float *out = (t_float *)(w[2]); ! int n = (int)(w[3]); ! float f = x->x_value; ! ! if (PD_BIGORSMALL(f)) ! x->x_value = f = 0; ! if (x->x_retarget) ! { ! int nticks = x->x_inletwas * x->x_dspticktomsec; ! if (!nticks) nticks = 1; ! x->x_ticksleft = nticks; ! x->x_biginc = (x->x_target - x->x_value)/(float)nticks; ! x->x_inc = x->x_1overn * x->x_biginc; ! x->x_retarget = 0; ! } ! if (x->x_ticksleft) ! { ! float f = x->x_value; ! n >>= 3; ! while (n--) ! { ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! *out++ = f; ! f += x->x_inc; ! } ! x->x_value += x->x_biginc; ! x->x_ticksleft--; ! } ! else ! { ! float f = x->x_value = x->x_target; ! setvec_8(out,f,n); } return (w+4); } + /* tb } */ + static void line_tilde_float(t_line *x, t_float f) { *************** *** 207,212 **** if(sp[0]->s_n&7) dsp_add(line_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(line_tilde_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n); x->x_1overn = 1./sp[0]->s_n; x->x_dspticktomsec = sp[0]->s_sr / (1000 * sp[0]->s_n); --- 279,288 ---- if(sp[0]->s_n&7) dsp_add(line_tilde_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! if (SIMD_CHECK1(sp[0]->s_n,sp[0]->s_vec)) ! dsp_add(line_tilde_perfsimd, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(line_tilde_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n); ! x->x_1overn = 1./sp[0]->s_n; x->x_dspticktomsec = sp[0]->s_sr / (1000 * sp[0]->s_n);

1 0

externals/grill/py package.txt,1.3,1.4 py.vcproj,1.13,1.14
by Thomas Grill 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17436 Modified Files: package.txt py.vcproj Log Message: update for flext build system Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** py.vcproj 17 Dec 2004 05:04:29 -0000 1.13 --- py.vcproj 8 Jan 2005 05:00:55 -0000 1.14 *************** *** 86,90 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\max\flext\source;"C:\data\prog\packs\Python-2.4\include";"C:\data\prog\packs\Python-2.4\PC"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" --- 86,90 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\pdmax\flext\source;"C:\data\prog\packs\Python-2.4\include";"C:\data\prog\packs\Python-2.4\PC"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" *************** *** 106,110 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb" --- 106,110 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/data/prog/pd/pd-cvs/bin;"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb" *************** *** 152,156 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\max\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" StringPooling="TRUE" --- 152,156 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\pdmax\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" StringPooling="TRUE" Index: package.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/package.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.txt 4 Jan 2005 05:01:05 -0000 1.3 --- package.txt 8 Jan 2005 05:00:55 -0000 1.4 *************** *** 2,7 **** --- 2,9 ---- BUILDTYPE=multi + BUILDDIR=build + SRCDIR=source

1 0

externals/grill/xsample/xsample.xcode project.pbxproj,1.1,1.2
by Thomas Grill 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/grill/xsample/xsample.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17093/xsample.xcode Modified Files: project.pbxproj Log Message: merge in branch "20041229-unify" - some small cleanups os x fixes minor updates improved buffer handling simplify updates Mac adaptations - made xcode project preparing xsample 0.3.0 release updated for build system some optimizations - fixed loop record bug Completion of attribute functionality, revisited and updated help files Index: project.pbxproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.xcode/project.pbxproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** project.pbxproj 16 Dec 2004 05:02:25 -0000 1.1 --- project.pbxproj 8 Jan 2005 04:59:44 -0000 1.2 *************** *** 57,62 **** 0867D69AFE84028FC02AAC07 = { children = ( ! E9974E060770761500206F68, ! E9974E04077075E800206F68, E9974DFA0770750400206F68, E9974DFB0770750400206F68, --- 57,63 ---- 0867D69AFE84028FC02AAC07 = { children = ( ! E98C3076078D948800EC0264, ! E94AC9630789EEA300AE1770, ! E94AC9610789EE8700AE1770, E9974DFA0770750400206F68, E9974DFB0770750400206F68, *************** *** 106,109 **** --- 107,111 ---- GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = source/prefix.h; + GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS) _DEBUG FLEXT_USESIMD"; OPTIMIZATION_CFLAGS = "-O0"; ZERO_LINK = YES; *************** *** 119,122 **** --- 121,125 ---- GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = source/prefix.h; + GCC_PREPROCESSOR_DEFINITIONS = "$(GCC_PREPROCESSOR_DEFINITIONS) NDEBUG FLEXT_USESIMD"; ZERO_LINK = NO; }; *************** *** 159,163 **** buildActionMask = 2147483647; files = ( ! E9974E05077075E800206F68, ); isa = PBXFrameworksBuildPhase; --- 162,167 ---- buildActionMask = 2147483647; files = ( ! E94AC9640789EEA300AE1770, ! E98C3077078D948800EC0264, ); isa = PBXFrameworksBuildPhase; *************** *** 211,214 **** --- 215,266 ---- //E93 //E94 + E94AC9610789EE8700AE1770 = { + isa = PBXFileReference; + lastKnownFileType = archive.ar; + name = "libflext-max_sd.a"; + path = "/usr/local/lib/libflext-max_sd.a"; + refType = 0; + sourceTree = "<absolute>"; + }; + E94AC9620789EE8700AE1770 = { + fileRef = E94AC9610789EE8700AE1770; + isa = PBXBuildFile; + settings = { + }; + }; + E94AC9630789EEA300AE1770 = { + isa = PBXFileReference; + lastKnownFileType = archive.ar; + name = "libflext-pd_sd.a"; + path = "/usr/local/lib/libflext-pd_sd.a"; + refType = 0; + sourceTree = "<absolute>"; + }; + E94AC9640789EEA300AE1770 = { + fileRef = E94AC9630789EEA300AE1770; + isa = PBXBuildFile; + settings = { + }; + }; + E98C3076078D948800EC0264 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = vecLib.framework; + path = /System/Library/Frameworks/vecLib.framework; + refType = 0; + sourceTree = "<absolute>"; + }; + E98C3077078D948800EC0264 = { + fileRef = E98C3076078D948800EC0264; + isa = PBXBuildFile; + settings = { + }; + }; + E98C3078078D948800EC0264 = { + fileRef = E98C3076078D948800EC0264; + isa = PBXBuildFile; + settings = { + }; + }; E9974DE50770749400206F68 = { fileEncoding = 30; *************** *** 332,357 **** sourceTree = "<absolute>"; }; - E9974E04077075E800206F68 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = libflext_s.a; - path = /Volumes/Daten/Prog/pdmax/flext/build/libflext_s.a; - refType = 0; - sourceTree = "<absolute>"; - }; - E9974E05077075E800206F68 = { - fileRef = E9974E04077075E800206F68; - isa = PBXBuildFile; - settings = { - }; - }; - E9974E060770761500206F68 = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = "libflext-max_s.a"; - path = "/Volumes/Daten/Prog/pdmax/flext/build/libflext-max_s.a"; - refType = 0; - sourceTree = "<absolute>"; - }; E9974E2B07707D1400206F68 = { fileEncoding = 4; --- 384,387 ---- *************** *** 398,402 **** E9974E5C0770851700206F68, E9974E5B0770851500206F68, ! E9974E5A0770851200206F68, ); isa = PBXFrameworksBuildPhase; --- 428,433 ---- E9974E5C0770851700206F68, E9974E5B0770851500206F68, ! E94AC9620789EE8700AE1770, ! E98C3078078D948800EC0264, ); isa = PBXFrameworksBuildPhase; *************** *** 416,423 **** HEADER_SEARCH_PATHS = "$(Max SDK)/max-includes $(Max SDK)/msp-includes $(Flext)/source"; INFOPLIST_FILE = "source/xsample-Info.plist"; ! INSTALL_PATH = "\"/Library/Application Support/Cycling '74/externals\""; LIBRARY_SEARCH_PATHS = "$(Flext)/build"; LIBRARY_STYLE = DYNAMIC; - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; --- 447,453 ---- HEADER_SEARCH_PATHS = "$(Max SDK)/max-includes $(Max SDK)/msp-includes $(Flext)/source"; INFOPLIST_FILE = "source/xsample-Info.plist"; ! INSTALL_PATH = "/Library/Application Support/Cycling 74/externals"; LIBRARY_SEARCH_PATHS = "$(Flext)/build"; LIBRARY_STYLE = DYNAMIC; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; *************** *** 481,490 **** }; }; - E9974E5A0770851200206F68 = { - fileRef = E9974E060770761500206F68; - isa = PBXBuildFile; - settings = { - }; - }; E9974E5B0770851500206F68 = { fileRef = E9974DFA0770750400206F68; --- 511,514 ----

1 0

externals/grill/xsample/pd xgroove~.pd,1.7,1.8 xplay~.pd,1.2,1.3 xrecord~.pd,1.5,1.6
by Thomas Grill 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/grill/xsample/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17093/pd Modified Files: xgroove~.pd xplay~.pd xrecord~.pd Log Message: merge in branch "20041229-unify" - some small cleanups os x fixes minor updates improved buffer handling simplify updates Mac adaptations - made xcode project preparing xsample 0.3.0 release updated for build system some optimizations - fixed loop record bug Completion of attribute functionality, revisited and updated help files Index: xrecord~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/pd/xrecord~.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xrecord~.pd 21 Jun 2004 14:02:12 -0000 1.5 --- xrecord~.pd 8 Jan 2005 04:59:44 -0000 1.6 *************** *** 1,3 **** ! #N canvas 58 17 869 651 12; #X obj 18 83 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 -1; --- 1,3 ---- ! #N canvas 58 17 877 659 12; #X obj 18 83 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 -1; *************** *** 35,39 **** #X msg 425 417 print; #X obj 579 425 hsl 128 15 -0.001 1 0 1 empty empty empty 20 8 0 8 -225271 ! -1 -1 3200 1; #X msg 601 347 mixmode \$1; #X floatatom 645 443 8 0 0 0 - - -; --- 35,39 ---- #X msg 425 417 print; #X obj 579 425 hsl 128 15 -0.001 1 0 1 empty empty empty 20 8 0 8 -225271 ! -1 -1 2800 1; #X msg 601 347 mixmode \$1; #X floatatom 645 443 8 0 0 0 - - -; *************** *** 84,95 **** #X obj 18 12 cnv 15 800 40 empty empty xrecord~ 10 22 0 24 -260818 -1 0; - #X text 224 31 http://www.parasitaere-kapazitaeten.net; - #X text 224 12 buffer-based signal recorder \, (C)2001-2004 Thomas - Grill; #X text 202 253 min/max points; #X obj 201 241 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 78 256; #X obj 258 241 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 276 256; #X obj 190 365 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -262131 -1 -1 0 256; --- 84,92 ---- #X obj 18 12 cnv 15 800 40 empty empty xrecord~ 10 22 0 24 -260818 -1 0; #X text 202 253 min/max points; #X obj 201 241 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 0 256; #X obj 258 241 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 10002 256; #X obj 190 365 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -262131 -1 -1 0 256; *************** *** 105,111 **** -1 -1 10000 256; #X obj 618 500 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 78 256; #X obj 675 500 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 276 256; #X connect 0 0 67 0; #X connect 1 0 67 0; --- 102,111 ---- -1 -1 10000 256; #X obj 618 500 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 0 256; #X obj 675 500 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 10000 256; ! #X text 224 31 http://grrrr.org/ext; ! #X text 224 12 buffer-based signal recorder \, (C)2001-2005 Thomas ! Grill; #X connect 0 0 67 0; #X connect 1 0 67 0; *************** *** 156,168 **** #X connect 63 0 27 0; #X connect 67 0 4 0; ! #X connect 67 1 75 0; ! #X connect 67 2 76 0; ! #X connect 67 3 78 0; #X connect 67 4 58 0; #X connect 68 0 16 0; ! #X connect 68 1 80 0; ! #X connect 68 2 81 0; ! #X connect 73 0 67 2; ! #X connect 74 0 67 3; ! #X connect 82 0 68 2; ! #X connect 83 0 68 3; --- 156,168 ---- #X connect 63 0 27 0; #X connect 67 0 4 0; ! #X connect 67 1 73 0; ! #X connect 67 2 74 0; ! #X connect 67 3 76 0; #X connect 67 4 58 0; #X connect 68 0 16 0; ! #X connect 68 1 78 0; ! #X connect 68 2 79 0; ! #X connect 71 0 67 2; ! #X connect 72 0 67 3; ! #X connect 80 0 68 2; ! #X connect 81 0 68 3; Index: xgroove~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/pd/xgroove~.pd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xgroove~.pd 21 Jun 2004 14:02:12 -0000 1.7 --- xgroove~.pd 8 Jan 2005 04:59:43 -0000 1.8 *************** *** 1,6 **** ! #N canvas 69 62 929 594 12; #X obj 215 253 hsl 128 15 0.001 3 1 1 empty empty speed 0 -8 0 10 -225271 ! -1 -1 10800 1; ! #X floatatom 212 271 8 0 0 0 - - -; #X msg 603 169 loop \$1; #X obj 28 72 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 --- 1,5 ---- ! #N canvas 69 62 941 606 12; #X obj 215 253 hsl 128 15 0.001 3 1 1 empty empty speed 0 -8 0 10 -225271 ! -1 -1 10400 1; #X msg 603 169 loop \$1; #X obj 28 72 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 *************** *** 11,15 **** #X coords 0 1 9999 -1 300 150 1; #X restore 573 269 graph; ! #X obj 44 529 dac~; #X msg 120 73 reset; #X text 299 321 min/max points; --- 10,14 ---- #X coords 0 1 9999 -1 300 150 1; #X restore 573 269 graph; ! #X obj 17 556 dac~; #X msg 120 73 reset; #X text 299 321 min/max points; *************** *** 31,35 **** #X text 377 127 buffer; #X text 377 142 loop; ! #X obj 491 223 bng 15 250 50 0 empty empty empty 0 -6 0 8 -228992 -1 -1; #X obj 335 349 print A; --- 30,34 ---- #X text 377 127 buffer; #X text 377 142 loop; ! #X obj 487 208 bng 15 250 50 0 empty empty empty 0 -6 0 8 -228992 -1 -1; #X obj 335 349 print A; *************** *** 38,55 **** #X coords 0 1 299 -1 300 100 1; #X restore 573 447 graph; ! #X obj 53 498 *~; ! #X obj 89 486 hsl 128 15 0.0001 1 1 0 empty empty volume -2 -6 0 8 ! -261689 -1 -1 10900 1; ! #X obj 86 504 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -261689 -1 -1 0.271063 256; #X msg 25 249 pos \$1; #X msg 63 220 200; #X msg 25 221 100; ! #X obj 511 224 nbx 5 14 0 1e+037 0 1 empty empty frq 0 -6 0 10 -228992 ! -1 -1 144 256; ! #N canvas 19 334 415 321 loopzone 0; #X msg 28 84 xzone \$1; #X obj 31 43 hsl 128 15 0 300 0 0 empty empty empty -2 -6 0 8 -262131 ! -1 -1 12700 1; #X floatatom 28 64 5 0 0 0 - - -; #X msg 203 207 xfade \$1; --- 37,54 ---- #X coords 0 1 299 -1 300 100 1; #X restore 573 447 graph; ! #X obj 26 525 *~; ! #X obj 82 491 hsl 128 15 0.0001 1 1 0 empty empty volume -2 -6 0 8 ! -261689 -1 -1 0 1; ! #X obj 79 509 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -261689 -1 -1 0 256; #X msg 25 249 pos \$1; #X msg 63 220 200; #X msg 25 221 100; ! #X obj 507 209 nbx 5 14 0 1e+037 0 1 empty empty frq 0 -6 0 10 -228992 ! -1 -1 220 256; ! #N canvas 19 334 427 333 loopzone 0; #X msg 28 84 xzone \$1; #X obj 31 43 hsl 128 15 0 300 0 0 empty empty empty -2 -6 0 8 -262131 ! -1 -1 0 1; #X floatatom 28 64 5 0 0 0 - - -; #X msg 203 207 xfade \$1; *************** *** 80,88 **** #X connect 10 0 9 0; #X restore 23 414 pd loopzone; ! #X text 118 137 set buffer; #X text 23 383 settings for; #X text 22 395 cross-fading loop zone; #X text 399 349 print attributes; ! #X obj 300 393 bng 15 250 50 0 empty empty loop_bang 0 -6 0 8 -262131 -1 -1; #X text 357 60 scale mode; --- 79,87 ---- #X connect 10 0 9 0; #X restore 23 414 pd loopzone; ! #X text 64 147 set buffer; #X text 23 383 settings for; #X text 22 395 cross-fading loop zone; #X text 399 349 print attributes; ! #X obj 357 394 bng 15 250 50 0 empty empty loop_bang 0 -6 0 8 -262131 -1 -1; #X text 357 60 scale mode; *************** *** 91,98 **** #X text 244 111 buffer size; #X obj 574 419 hsl 300 15 0 10000 0 0 empty bufpos empty -2 -6 0 8 ! -262144 -1 -1 20832 1; #X obj 236 527 nbx 5 14 -1e+037 1e+037 0 0 empty empty position 0 -6 ! 0 10 -228992 -1 -1 6967.26 256; ! #N canvas 0 0 470 320 watch 0; #X obj 163 18 loadbang; #X obj 88 80 snapshot~; --- 90,97 ---- #X text 244 111 buffer size; #X obj 574 419 hsl 300 15 0 10000 0 0 empty bufpos empty -2 -6 0 8 ! -262144 -1 -1 0 1; #X obj 236 527 nbx 5 14 -1e+037 1e+037 0 0 empty empty position 0 -6 ! 0 10 -228992 -1 -1 0 256; ! #N canvas 0 0 474 324 watch 0; #X obj 163 18 loadbang; #X obj 88 80 snapshot~; *************** *** 124,138 **** #X connect 2 1 1 0; #X connect 4 0 3 0; ! #X restore 491 244 pd genosc; #X text 600 97 loop mode; #X text 23 201 set position; #X obj 299 426 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -262131 ! -1 -1 0 256; #X obj 356 426 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -262131 ! -1 -1 10000 256; #X obj 298 309 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 0 256; #X obj 355 309 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 30000 256; #X text 244 95 frames (def.); #X text 377 96 units in buffer (def.); --- 123,137 ---- #X connect 2 1 1 0; #X connect 4 0 3 0; ! #X restore 487 229 pd genosc; #X text 600 97 loop mode; #X text 23 201 set position; #X obj 299 426 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -262131 ! -1 -1 1004 256; #X obj 356 426 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -262131 ! -1 -1 8996 256; #X obj 298 309 nbx 5 14 0 1e+037 0 1 empty empty min 0 -6 0 10 -225271 ! -1 -1 1004 256; #X obj 355 309 nbx 5 14 0 1e+037 0 1 empty empty max 0 -6 0 10 -225271 ! -1 -1 8996 256; #X text 244 95 frames (def.); #X text 377 96 units in buffer (def.); *************** *** 179,186 **** #X restore 24 343 pd attributes; #X text 23 324 attribute stuff; ! #X text 490 264 generate; #X obj 26 10 cnv 15 850 40 empty empty xgroove~ 10 22 0 24 -260818 -1 0; - #X text 227 29 http://www.parasitaere-kapazitaeten.net; #X msg 105 221 1000; #X msg 96 249 posmod \$1; --- 178,184 ---- #X restore 24 343 pd attributes; #X text 23 324 attribute stuff; ! #X text 484 177 generate; #X obj 26 10 cnv 15 850 40 empty empty xgroove~ 10 22 0 24 -260818 -1 0; #X msg 105 221 1000; #X msg 96 249 posmod \$1; *************** *** 196,200 **** #X obj 358 99 vradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 -1 0; ! #X obj 136 168 s to-g; #X obj 298 197 s to-g; #X obj 61 278 s to-g; --- 194,198 ---- #X obj 358 99 vradio 15 1 0 4 empty empty empty 0 -6 0 8 -225271 -1 -1 0; ! #X obj 65 164 s to-g; #X obj 298 197 s to-g; #X obj 61 278 s to-g; *************** *** 202,246 **** #X obj 704 201 s to-g; #X obj 191 349 xgroove~ \$0-buf; ! #X msg 26 136 set \$0-buf; ! #X msg 25 161 set \$0-buf2; ! #X text 227 10 varispeed sample player \, (C)2001-2004 Thomas Grill ; ! #X connect 0 0 1 0; ! #X connect 1 0 80 0; ! #X connect 2 0 79 0; ! #X connect 3 0 75 0; ! #X connect 4 0 75 0; ! #X connect 7 0 75 0; ! #X connect 11 0 75 0; ! #X connect 13 0 79 0; ! #X connect 14 0 80 0; ! #X connect 20 0 76 0; ! #X connect 21 0 76 0; ! #X connect 26 0 50 0; ! #X connect 29 0 6 0; ! #X connect 29 0 6 1; ! #X connect 30 0 29 1; ! #X connect 30 0 31 0; ! #X connect 32 0 77 0; ! #X connect 33 0 32 0; ! #X connect 34 0 32 0; ! #X connect 35 0 50 0; ! #X connect 48 0 47 0; ! #X connect 55 0 80 1; ! #X connect 56 0 80 2; ! #X connect 66 0 67 0; ! #X connect 67 0 77 0; ! #X connect 71 0 2 0; ! #X connect 72 0 13 0; ! #X connect 73 0 20 0; ! #X connect 74 0 21 0; ! #X connect 78 0 80 0; ! #X connect 80 0 29 0; ! #X connect 80 0 48 0; ! #X connect 80 1 48 1; ! #X connect 80 2 53 0; ! #X connect 80 3 54 0; ! #X connect 80 4 41 0; ! #X connect 80 5 27 0; ! #X connect 81 0 75 0; ! #X connect 82 0 75 0; --- 200,247 ---- #X obj 704 201 s to-g; #X obj 191 349 xgroove~ \$0-buf; ! #X text 227 29 http://grrrr.org/ext; ! #X obj 79 550 line~; ! #X msg 79 527 \$1 50; ! #X obj 212 271 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -225271 -1 -1 0.703731 256; ! #X text 227 10 varispeed sample player \, (C)2001-2005 Thomas Grill ; ! #X connect 0 0 82 0; ! #X connect 1 0 77 0; ! #X connect 2 0 73 0; ! #X connect 3 0 73 0; ! #X connect 6 0 73 0; ! #X connect 10 0 73 0; ! #X connect 12 0 77 0; ! #X connect 13 0 78 0; ! #X connect 19 0 74 0; ! #X connect 20 0 74 0; ! #X connect 25 0 49 0; ! #X connect 28 0 5 0; ! #X connect 28 0 5 1; ! #X connect 29 0 30 0; ! #X connect 30 0 81 0; ! #X connect 31 0 75 0; ! #X connect 32 0 31 0; ! #X connect 33 0 31 0; ! #X connect 34 0 49 0; ! #X connect 47 0 46 0; ! #X connect 54 0 78 1; ! #X connect 55 0 78 2; ! #X connect 64 0 65 0; ! #X connect 65 0 75 0; ! #X connect 69 0 1 0; ! #X connect 70 0 12 0; ! #X connect 71 0 19 0; ! #X connect 72 0 20 0; ! #X connect 76 0 78 0; ! #X connect 78 0 28 0; ! #X connect 78 0 47 0; ! #X connect 78 1 47 1; ! #X connect 78 2 52 0; ! #X connect 78 3 53 0; ! #X connect 78 4 40 0; ! #X connect 78 5 26 0; ! #X connect 80 0 28 1; ! #X connect 81 0 80 0; ! #X connect 82 0 78 0; Index: xplay~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/pd/xplay~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xplay~.pd 20 Apr 2004 02:37:40 -0000 1.2 --- xplay~.pd 8 Jan 2005 04:59:44 -0000 1.3 *************** *** 1,3 **** ! #N canvas 165 149 700 428 12; #X obj 21 75 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 -1; --- 1,3 ---- ! #N canvas 165 149 716 444 12; #X obj 21 75 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 -1; *************** *** 6,11 **** #X text 43 72 start; #X text 60 93 stop; ! #X obj 158 219 *~ 300; ! #X text 164 240 position signal; #X msg 107 75 help; #N canvas 0 0 450 300 graph7 0; --- 6,11 ---- #X text 43 72 start; #X text 60 93 stop; ! #X obj 159 217 *~ 300; ! #X text 161 239 position signal; #X msg 107 75 help; #N canvas 0 0 450 300 graph7 0; *************** *** 55,71 **** #X restore 370 80 graph; #X obj 162 174 hsl 128 15 1 100 1 1 empty empty speed 0 -8 0 10 -225271 ! -1 -1 4200 1; #X msg 107 123 print; #X obj 159 194 phasor~ 100; ! #X obj 198 280 print A; ! #X obj 28 373 dac~; ! #X obj 37 342 *~; ! #X obj 73 330 hsl 128 15 0.0001 1 1 0 empty empty volume -2 -6 0 8 -261689 -1 -1 0 1; ! #X obj 70 348 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 10 -261689 -1 -1 0 256; #X obj 21 10 cnv 15 650 40 empty empty xplay~ 10 22 0 24 -260818 -1 0; - #X text 180 29 http://www.parasitaere-kapazitaeten.net; #N canvas 0 0 450 300 graph2 0; #X array \$0-scp 300 float 0; --- 55,70 ---- #X restore 370 80 graph; #X obj 162 174 hsl 128 15 1 100 1 1 empty empty speed 0 -8 0 10 -225271 ! -1 -1 9300 1; #X msg 107 123 print; #X obj 159 194 phasor~ 100; ! #X obj 180 311 print A; ! #X obj 37 389 dac~; ! #X obj 46 358 *~; ! #X obj 87 360 hsl 128 15 0.0001 1 1 0 empty empty volume -2 -6 0 8 -261689 -1 -1 0 1; ! #X obj 84 378 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 10 -261689 -1 -1 0 256; #X obj 21 10 cnv 15 650 40 empty empty xplay~ 10 22 0 24 -260818 -1 0; #N canvas 0 0 450 300 graph2 0; #X array \$0-scp 300 float 0; *************** *** 80,84 **** #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X restore 205 376 pd watch; #N canvas 33 327 454 231 attributes 0; #X msg 85 60 getattributes; --- 79,83 ---- #X connect 1 0 3 0; #X connect 2 0 3 0; ! #X restore 90 310 pd watch; #N canvas 33 327 454 231 attributes 0; #X msg 85 60 getattributes; *************** *** 102,123 **** #X text 21 192 attributes; #X obj 21 154 s to-p; ! #X obj 81 257 r to-p; #X obj 81 280 xplay~ \$0-buf; ! #X text 180 10 buffer-based sample player \, (C)2001-2004 Thomas Grill ; ! #X connect 0 0 23 0; ! #X connect 1 0 23 0; ! #X connect 2 0 23 0; ! #X connect 5 0 25 0; ! #X connect 7 0 23 0; #X connect 9 0 11 0; ! #X connect 10 0 23 0; #X connect 11 0 5 0; #X connect 14 0 13 0; #X connect 14 0 13 1; - #X connect 15 0 14 1; #X connect 15 0 16 0; ! #X connect 24 0 25 0; ! #X connect 25 0 14 0; ! #X connect 25 0 20 0; ! #X connect 25 1 12 0; --- 101,123 ---- #X text 21 192 attributes; #X obj 21 154 s to-p; ! #X obj 21 250 r to-p; #X obj 81 280 xplay~ \$0-buf; ! #X text 180 29 http://grrrr.org/ext; ! #X text 179 11 buffer-based sample player \, (C)2001-2005 Thomas Grill ; ! #X connect 0 0 22 0; ! #X connect 1 0 22 0; ! #X connect 2 0 22 0; ! #X connect 5 0 24 0; ! #X connect 7 0 22 0; #X connect 9 0 11 0; ! #X connect 10 0 22 0; #X connect 11 0 5 0; #X connect 14 0 13 0; #X connect 14 0 13 1; #X connect 15 0 16 0; ! #X connect 16 0 14 1; ! #X connect 23 0 24 0; ! #X connect 24 0 14 0; ! #X connect 24 0 19 0; ! #X connect 24 1 12 0;

1 0

externals/grill/xsample/source groove.cpp,1.28,1.29 inter.cpp,1.8,1.9 inter.h,1.8,1.9 main.cpp,1.18,1.19 main.h,1.32,1.33 play.cpp,1.9,1.10 prefix.h,1.1,1.2 record.cpp,1.16,1.17
by Thomas Grill 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/grill/xsample/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17093/source Modified Files: groove.cpp inter.cpp inter.h main.cpp main.h play.cpp prefix.h record.cpp Log Message: merge in branch "20041229-unify" - some small cleanups os x fixes minor updates improved buffer handling simplify updates Mac adaptations - made xcode project preparing xsample 0.3.0 release updated for build system some optimizations - fixed loop record bug Completion of attribute functionality, revisited and updated help files Index: groove.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** groove.cpp 16 Dec 2004 05:02:24 -0000 1.28 --- groove.cpp 8 Jan 2005 04:59:44 -0000 1.29 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ [...1312 lines suppressed...] post(""); } - --- 755,770 ---- } ! void xgroove::m_print() { ! static const char *sclmode_txt[] = {"units","units in loop","buffer","loop"}; ! static const char *interp_txt[] = {"off","4-point","linear"}; ! static const char *loop_txt[] = {"once","looping","bidir"}; // print all current settings post("%s - current settings:",thisName()); ! post("bufname = '%s', length = %.3f, channels = %i",buf.Name(),(float)(buf.Frames()*s2u),buf.Channels()); ! post("out channels = %i, frames/unit = %.3f, scale mode = %s",outchns,(float)(1./s2u),sclmode_txt[sclmode]); ! post("loop = %s, interpolation = %s",loop_txt[(int)loopmode],interp_txt[interp >= xsi_none && interp <= xsi_lin?interp:xsi_none]); ! post("loop crossfade zone = %.3f",(float)(xzone*s2u)); post(""); } Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** main.cpp 21 Jun 2004 14:02:12 -0000 1.18 --- main.cpp 8 Jan 2005 04:59:44 -0000 1.19 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 13,17 **** // Initialization function for xsample library ! static V xsample_main() { flext::post("-------------------------------"); --- 11,15 ---- // Initialization function for xsample library ! static void xsample_main() { flext::post("-------------------------------"); *************** *** 19,25 **** flext::post(""); flext::post(" xrecord~, xplay~, xgroove~ "); ! flext::post(" (C)2001-2004 Thomas Grill "); #ifdef FLEXT_DEBUG ! flext::post(" DEBUG BUILD "); #endif flext::post("-------------------------------"); --- 17,24 ---- flext::post(""); flext::post(" xrecord~, xplay~, xgroove~ "); ! flext::post(" (C)2001-2005 Thomas Grill "); #ifdef FLEXT_DEBUG ! flext::post(""); ! flext::post("DEBUG BUILD - " __DATE__ " " __TIME__); #endif flext::post("-------------------------------"); *************** *** 38,45 **** void xsample::setup(t_classid c) { - FLEXT_CADDBANG(c,0,m_start); - FLEXT_CADDMETHOD_(c,0,"start",m_start); - FLEXT_CADDMETHOD_(c,0,"stop",m_stop); - FLEXT_CADDMETHOD_(c,0,"set",m_set); FLEXT_CADDMETHOD_(c,0,"print",m_print); --- 37,40 ---- *************** *** 54,58 **** xsample::xsample(): ! buf(NULL), #if FLEXT_SYS == FLEXT_SYS_MAX unitmode(xsu_ms), // Max/MSP defaults to milliseconds --- 49,53 ---- xsample::xsample(): ! update(xsc_all), #if FLEXT_SYS == FLEXT_SYS_MAX unitmode(xsu_ms), // Max/MSP defaults to milliseconds *************** *** 61,215 **** #endif sclmode(xss_unitsinbuf), ! curmin(0),curmax(1<<31) {} ! xsample::~xsample() { ! // m_enable(false); // switch off DSP ! if(buf) delete buf; } ! ! BL xsample::bufchk() ! { ! if(buf->Valid()) { ! if(buf->Update()) { ! // post("%s - buffer updated",thisName()); ! m_refresh(); ! } ! return true; ! } ! else ! return false; } ! I xsample::m_set(I argc,const t_atom *argv) { ! const t_symbol *sym = argc >= 1?GetASymbol(argv[0]):NULL; ! int r = buf->Set(sym); ! if(sym && r < 0) post("%s - can't find buffer %s",thisName(),GetString(sym)); ! return r; } ! BL xsample::m_refresh() { ! BL ret; ! if(buf->Set()) { s_dsp(); ret = true; } // channel count may have changed ! else ret = false; ! ! m_units(); ! m_sclmode(); ! // realize positions... 2 times bufchk()!! ! m_min((F)curmin*s2u); // also checks pos ! m_max((F)curmax*s2u); // also checks pos ! ! return ret; } ! BL xsample::m_reset() { ! BL ret; ! if(buf->Set()) { s_dsp(); ret = true; } // channel count may have changed ! else ret = false; ! ! // now... 4 times bufchk()!! \todo get rid of that ! m_units(); ! m_sclmode(); ! m_min(0); ! m_max(buf->Frames()*s2u); ! ! return ret; ! } ! V xsample::m_loadbang() ! { ! m_reset(); ! } ! V xsample::m_units(xs_unit mode) ! { ! if(mode != xsu__) unitmode = mode; ! switch(unitmode) { ! case xsu_sample: // samples ! s2u = 1; ! break; ! case xsu_buffer: // buffer size ! s2u = bufchk()?1.f/buf->Frames():0; ! break; ! case xsu_ms: // ms ! s2u = 1000.f/Samplerate(); ! break; ! case xsu_s: // s ! s2u = 1.f/Samplerate(); ! break; ! default: ! post("%s: Unknown unit mode",thisName()); } } ! V xsample::m_sclmode(xs_sclmd mode) { ! if(mode != xss__) sclmode = mode; ! ! switch(sclmode) { ! case 0: // samples/units ! sclmin = 0; sclmul = s2u; ! break; ! case 1: // samples/units from recmin to recmax ! sclmin = curmin; sclmul = s2u; ! break; ! case 2: // unity between 0 and buffer size ! sclmin = 0; sclmul = (bufchk() && buf->Frames())?1.f/buf->Frames():0; ! break; ! case 3: // unity between recmin and recmax ! sclmin = curmin; sclmul = curmin != curmax?1.f/(curmax-curmin):0; ! break; ! default: ! post("%s: Unknown scale mode",thisName()); ! } ! } ! V xsample::m_min(F mn) ! { ! // if(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) ! if(s2u) { ! mn /= s2u; // conversion to samples ! if(mn < 0) mn = 0; ! else if(mn > curmax) mn = (F)curmax; ! curmin = (I)(mn+.5); ! m_sclmode(); } } ! V xsample::m_max(F mx) { ! // if(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) ! if(s2u) { ! mx /= s2u; // conversion to samples ! if(mx > buf->Frames()) mx = (F)buf->Frames(); ! else if(mx < curmin) mx = (F)curmin; ! curmax = (I)(mx+.5); ! m_sclmode(); ! } } ! V xsample::m_all() { ! if(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) ! ! curmin = 0; curmax = buf->Frames(); ! m_sclmode(); } ! V xsample::m_dsp(I /*n*/,S *const * /*insigs*/,S *const * /*outsigs*/) { ! // this is hopefully called at change of sample rate ?! ! if(!m_refresh()) s_dsp(); } --- 56,207 ---- #endif sclmode(xss_unitsinbuf), ! curmin(0),curmax(1<<(sizeof(curmax)*8-2)) {} ! xsample::~xsample() {} ! ! bool xsample::Finalize() { ! if(!flext_dsp::Finalize()) return false; ! // flags have been set in constructor ! Refresh(); ! return true; } ! int xsample::ChkBuffer(bool refresh) ! { ! if(!buf.Ok()) return 0; ! ! if(buf.Update()) { ! #ifdef FLEXT_DEBUG ! post("%s - buffer update!",thisName()); ! #endif ! Update(xsc_buffer); ! if(refresh) { ! Refresh(); ! return buf.Ok() && buf.Valid()?1:0; ! } ! else ! return buf.Valid()?1:0; ! } ! else ! return buf.Valid()?-1:0; } ! /* called after all buffer objects have been created in the patch */ ! void xsample::m_loadbang() { ! ChkBuffer(true); } ! void xsample::m_set(int argc,const t_atom *argv) { ! const t_symbol *sym = argc >= 1?GetASymbol(argv[0]):NULL; ! int r = buf.Set(sym); ! if(sym && r < 0) ! post("%s - can't find buffer %s",thisName(),GetString(sym)); ! Update(xsc_buffer,true); } ! void xsample::m_min(float mn) { ! int ret = ChkBuffer(true); ! if(ret && s2u) { ! long cmn = CASTINT<long>(mn/s2u+0.5f); // conversion to samples ! if(cmn < 0) ! curmin = 0; ! else if(cmn > curmax) ! curmin = curmax; ! else ! curmin = cmn; ! Update(xsc_range,true); } } ! void xsample::m_max(float mx) { ! int ret = ChkBuffer(true); ! if(ret && s2u) { ! long cmx = CASTINT<long>(mx/s2u+0.5f); // conversion to samples ! if(cmx > buf.Frames()) ! curmax = buf.Frames(); ! else if(cmx < curmin) ! curmax = curmin; ! else ! curmax = cmx; ! Update(xsc_range,true); } } ! void xsample::m_dsp(int /*n*/,t_sample *const * /*insigs*/,t_sample *const * /*outsigs*/) { ! // this is hopefully called at change of sample rate ?! ! #ifdef FLEXT_DEBUG ! post("%s - DSP reset!",thisName()); ! #endif ! // for PD at least this is also called if a table has been deleted... ! // then we must reset the buffer ! ! Update(xsc_srate|xsc_buffer,true); } ! void xsample::DoReset() { ! ResetRange(); } ! void xsample::DoUpdate(unsigned int flags) { ! if(flags&xsc_buffer) ! buf.Set(); ! if(flags&xsc_range && buf.Ok()) { ! if(curmin < 0) curmin = 0; ! if(curmax > buf.Frames()) curmax = buf.Frames(); ! } ! ! if(flags&xsc_units) { ! switch(unitmode) { ! case xsu_sample: // samples ! s2u = 1; ! break; ! case xsu_buffer: // buffer size ! s2u = buf.Ok() && buf.Frames()?1.f/buf.Frames():0; ! break; ! case xsu_ms: // ms ! s2u = 1000.f/Samplerate(); ! break; ! case xsu_s: // s ! s2u = 1.f/Samplerate(); ! break; ! default: ! post("%s - Unknown unit mode",thisName()); ! } ! ! switch(sclmode) { ! case xss_unitsinbuf: // samples/units ! sclmin = 0; sclmul = s2u; ! break; ! case xss_unitsinloop: // samples/units from recmin to recmax ! sclmin = curmin; sclmul = s2u; ! break; ! case xss_buffer: // unity between 0 and buffer size ! sclmin = 0; sclmul = buf.Ok() && buf.Frames()?1.f/buf.Frames():0; ! break; ! case xss_loop: // unity between recmin and recmax ! sclmin = curmin; sclmul = curmin < curmax?1.f/(curmax-curmin):0; ! break; ! default: ! post("%s - Unknown scale mode",thisName()); ! } ! } } Index: inter.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/inter.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** inter.h 8 Feb 2004 03:40:47 -0000 1.8 --- inter.h 8 Jan 2005 04:59:44 -0000 1.9 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 12,64 **** #define __INTER_H ! TMPLDEF V xinter::st_play0(const S *,const I ,const I ,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) { // stopped/invalid buffer -> output zero ! for(I ci = 0; ci < outchns; ++ci) ZeroSamples(outvecs[ci],n); } ! TMPLDEF V xinter::st_play1(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) { SIGCHNS(BCHNS,inchns,OCHNS,outchns); // position info are frame units ! const S *pos = invecs[0]; ! S *const *sig = outvecs; ! register I si = 0; // no interpolation // ---------------- - - for(I i = 0; i < n; ++i,++si) { - register const I oint = (I)(*(pos++)); - register const S *fp; - - if(oint >= smin) - if(oint < smax) { - // normal - fp = bdt+oint*BCHNS; - } - else { - // position > last sample ... take only last sample - fp = bdt+(smin == smax?smin:smax-1)*BCHNS; - } - else { - // position < 0 ... take only 0th sample - fp = bdt+smin*BCHNS; - } - - for(I ci = 0; ci < OCHNS; ++ci) - sig[ci][si] = fp[ci]; - } ! // clear rest of output channels (if buffer has less channels) ! for(I ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); } ! TMPLDEF V xinter::st_play2(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) { ! const I plen = smax-smin; //curlen; if(plen < 2) { ! st_play1 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs); return; } --- 10,93 ---- #define __INTER_H ! TMPLDEF void xinter::st_play0(const t_sample *,const int ,const int ,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) { // stopped/invalid buffer -> output zero ! for(int ci = 0; ci < outchns; ++ci) ZeroSamples(outvecs[ci],n); } ! TMPLDEF void xinter::st_play1(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) { SIGCHNS(BCHNS,inchns,OCHNS,outchns); // position info are frame units ! const t_sample *pos = invecs[0]; ! t_sample *const *sig = outvecs; // no interpolation // ---------------- ! if(smin == smax) { ! // zero loop length -> assume that smin is a valid sample position... ! ! int ci; ! for(ci = 0; ci < OCHNS; ++ci) SetSamples(sig[ci],n,bdt[smin*BCHNS]); ! // clear rest of output channels (if buffer has less channels) ! for(; ci < outchns; ++ci) ZeroSamples(sig[ci],n); ! } ! else if(OCHNS == 1) { ! t_sample *sig0 = sig[0]; ! for(int i = 0; i < n; ++i) { ! register long oint = CASTINT<long>(*(pos++)); ! ! // for xplay oint can be out of bounds -> check ! if(oint >= smin) ! if(oint < smax) { ! // normal ! *(sig0++) = bdt[oint*BCHNS]; ! } ! else { ! // position > last sample ... take only last sample ! *(sig0++) = bdt[(smax-1)*BCHNS]; ! } ! else { ! // position < 0 ... take only 0th sample ! *(sig0++) = bdt[smin*BCHNS]; ! } ! } ! } ! else { ! for(int i = 0,si = 0; i < n; ++i,++si) { ! register long oint = CASTINT<long>(*(pos++)); ! register const t_sample *fp; ! ! // for xplay oint can be out of bounds -> check ! if(oint >= smin) ! if(oint < smax) { ! // normal ! fp = bdt+oint*BCHNS; ! } ! else { ! // position > last sample ... take only last sample ! fp = bdt+(smax-1)*BCHNS; ! } ! else { ! // position < 0 ... take only 0th sample ! fp = bdt+smin*BCHNS; ! } ! ! for(int ci = 0; ci < OCHNS; ++ci) ! sig[ci][si] = fp[ci]; ! } ! ! // clear rest of output channels (if buffer has less channels) ! for(int ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); ! } } ! TMPLDEF void xinter::st_play2(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) { ! const int plen = smax-smin; if(plen < 2) { ! st_play1 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs,looped); return; } *************** *** 67,116 **** // position info are frame units ! const S *pos = invecs[0]; ! S *const *sig = outvecs; ! register I si = 0; // linear interpolation // -------------------- ! const I maxo = smax-1; // last sample in buffer ! for(I i = 0; i < n; ++i,++si) { ! const F o = *(pos++); ! register const I oint = (I)o; ! if(oint >= smin) ! if(oint < maxo) { ! // normal interpolation ! register const F frac = o-oint; ! register const S *const fp0 = bdt+oint*BCHNS; ! register const S *const fp1 = fp0+BCHNS; ! for(I ci = 0; ci < OCHNS; ++ci) ! sig[ci][si] = fp0[ci]+frac*(fp1[ci]-fp0[ci]); ! } ! else { ! // position is past last sample -> take the last sample ! register const S *const fp = bdt+maxo*BCHNS; ! for(I ci = 0; ci < OCHNS; ++ci) ! sig[ci][si] = fp[ci]; ! } ! else { ! // position is before first sample -> take the first sample ! register const S *const fp = bdt+smin*BCHNS; ! for(I ci = 0; ci < OCHNS; ++ci) ! sig[ci][si] = fp[ci]; ! } ! } ! // clear rest of output channels (if buffer has less channels) ! for(I ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); } ! TMPLDEF V xinter::st_play4(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) { ! const I plen = smax-smin; //curlen; if(plen < 4) { ! if(plen < 2) st_play1 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs); ! else st_play2 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs); return; } --- 96,194 ---- // position info are frame units ! const t_sample *pos = invecs[0]; ! t_sample *const *sig = outvecs; // linear interpolation // -------------------- ! const int maxo = smax-1; // last sample in buffer ! if(OCHNS == 1) { ! t_sample *sig0 = sig[0]; ! for(int i = 0; i < n; ++i) { ! const float o = *(pos++); ! register long oint = CASTINT<long>(o); ! const float frac = o-oint; ! t_sample fp0,fp1; ! if(oint >= smin) ! if(oint < maxo) { ! // normal interpolation ! fp0 = bdt[oint*BCHNS]; ! fp1 = bdt[(oint+1)*BCHNS]; ! } ! else { ! // position is past last sample ! if(looped) { ! oint = smin+(oint-smin)%plen; ! fp0 = bdt[oint*BCHNS]; ! fp1 = oint >= maxo?bdt[smin]:fp0; ! } ! else ! fp0 = fp1 = bdt[maxo*BCHNS]; ! } ! else { ! // position is before first sample ! if(looped) { ! oint = smax-(smin-oint)%plen; ! fp0 = bdt[oint*BCHNS]; ! fp1 = oint >= maxo?bdt[smin]:fp0; ! } ! else ! fp0 = fp1 = bdt[smin*BCHNS]; ! } ! *(sig0++) = fp0+frac*(fp1-fp0); ! } ! } ! else { ! for(int i = 0,si = 0; i < n; ++i,++si) { ! const float o = *(pos++); ! register long oint = CASTINT<long>(o); ! const t_sample *fp0,*fp1; ! const float frac = o-oint; ! ! if(oint >= smin) ! if(oint < maxo) { ! // normal interpolation ! fp0 = bdt+oint*BCHNS; ! fp1 = fp0+BCHNS; ! } ! else { ! // position is past last sample ! if(looped) { ! oint = smin+(oint-smin)%plen; ! fp0 = bdt+oint*BCHNS; ! fp1 = oint >= maxo?bdt+smin:fp0; ! } ! else ! fp0 = fp1 = bdt+maxo*BCHNS; ! } ! else { ! // position is before first sample ! if(looped) { ! oint = smax-(smin-oint)%plen; ! fp0 = bdt+oint*BCHNS; ! fp1 = oint >= maxo?bdt+smin:fp0; ! } ! else ! fp0 = fp1 = bdt+smin*BCHNS; ! } ! ! for(int ci = 0; ci < OCHNS; ++ci) ! sig[ci][si] = fp0[ci]+frac*(fp1[ci]-fp0[ci]); ! } ! ! // clear rest of output channels (if buffer has less channels) ! for(int ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); ! } } ! TMPLDEF void xinter::st_play4(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) { ! const int plen = smax-smin; //curlen; if(plen < 4) { ! if(plen < 2) st_play1 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs,looped); ! else st_play2 TMPLCALL (bdt,smin,smax,n,inchns,outchns,invecs,outvecs,looped); return; } *************** *** 119,224 **** // position info are frame units ! const S *pos = invecs[0]; ! ! #ifdef __VEC__ ! // prefetch cache ! vec_dst(pos,GetPrefetchConstant(1,n>>2,0),0); ! const int pf = GetPrefetchConstant(BCHNS,1,16*BCHNS); ! #endif ! ! S *const *sig = outvecs; ! register I si = 0; // 4-point interpolation // --------------------- ! const I maxo = smax-1; // last sample in play region ! const S *maxp = bdt+maxo*BCHNS; // pointer to last sample ! for(I i = 0; i < n; ++i,++si) { ! F o = *(pos++); ! register I oint = (I)o; ! register F frac; ! register const S *fa,*fb,*fc,*fd; ! if(oint > smin) ! if(oint < maxo-2) { ! // normal case ! ! fa = bdt+oint*BCHNS-BCHNS; ! frac = o-oint; ! fb = fa+BCHNS; ! #ifdef __VEC__ ! vec_dst(fa,pf,0); ! #endif ! fc = fb+BCHNS; ! fd = fc+BCHNS; ! } ! else { ! // after the end ! ! if(oint > maxo) oint = maxo,o = (float)smax; ! frac = o-oint; ! fb = bdt+oint*BCHNS; ! fa = fb-BCHNS; ! ! // \TODO what about wraparound (in loop/palindrome mode) ? ! fc = fb >= maxp?maxp:fb+BCHNS; ! fd = fc >= maxp?maxp:fc+BCHNS; ! } ! else { ! // before the beginning ! ! // if oint < first sample set it to first sample ! // \TODO what about wraparound (in loop/palindrome mode) ? ! if(oint < smin) oint = smin,o = (float)smin; ! ! // position is first sample ! fa = bdt+smin*BCHNS; ! fb = bdt+oint*BCHNS; ! frac = o-oint; ! fc = fb+BCHNS; ! fd = fc+BCHNS; ! } ! ! register F f1 = 0.5f*(frac-1.0f); ! register F f3 = frac*3.0f-1.0f; ! ! for(I ci = 0; ci < OCHNS; ++ci) { ! const F amdf = (fa[ci]-fd[ci])*frac; ! const F cmb = fc[ci]-fb[ci]; ! const F bma = fb[ci]-fa[ci]; ! sig[ci][si] = fb[ci] + frac*( cmb - f1 * ( amdf+bma+cmb*f3 ) ); ! } ! } ! ! #ifdef __VEC__ ! vec_dss(0); ! #endif ! // clear rest of output channels (if buffer has less channels) ! for(I ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); } ! TMPLDEF inline V xinter::s_play0(I n,S *const *invecs,S *const *outvecs) { ! st_play0 TMPLCALL (buf->Data(),curmin,curmax,n,buf->Channels(),outchns,invecs,outvecs); } ! TMPLDEF inline V xinter::s_play1(I n,S *const *invecs,S *const *outvecs) { ! st_play1 TMPLCALL (buf->Data(),curmin,curmax,n,buf->Channels(),outchns,invecs,outvecs); } ! TMPLDEF inline V xinter::s_play2(I n,S *const *invecs,S *const *outvecs) { ! st_play2 TMPLCALL (buf->Data(),curmin,curmax,n,buf->Channels(),outchns,invecs,outvecs); } ! TMPLDEF inline V xinter::s_play4(I n,S *const *invecs,S *const *outvecs) { ! st_play4 TMPLCALL (buf->Data(),curmin,curmax,n,buf->Channels(),outchns,invecs,outvecs); } --- 197,419 ---- // position info are frame units ! const t_sample *pos = invecs[0]; ! t_sample *const *sig = outvecs; // 4-point interpolation // --------------------- ! const int maxo = smax-1; // last sample in play region ! if(OCHNS == 1) { ! t_sample *sig0 = sig[0]; ! for(int i = 0; i < n; ++i) { ! float o = *(pos++); ! register long oint = CASTINT<long>(o); ! register t_sample fa,fb,fc,fd; ! const float frac = o-oint; ! register const t_sample *ptr = bdt+oint*BCHNS; ! if(oint > smin) { ! if(oint < maxo-2) { ! // normal case ! fa = ptr[-BCHNS]; ! fb = ptr[0]; ! fc = ptr[BCHNS]; ! fd = ptr[BCHNS*2]; ! } ! else { ! // not enough space at the end ! if(looped) { ! // normalize position ! oint = smin+(oint-smin)%plen; ! goto looped1; ! } ! else { ! // last sample is outside in any case ! fd = bdt[maxo*BCHNS]; ! if(oint-1 >= maxo) ! // if first is outside, all are outside ! fa = fb = fc = fd; ! else { ! fa = ptr[-BCHNS]; ! if(oint >= maxo) ! fb = fc = fd; ! else { ! fb = ptr[0]; ! fc = oint+1 < maxo?ptr[BCHNS]:fd; ! } ! } ! } ! } ! } ! else { ! // not enough space at the beginning ! if(looped) { ! // normalize position ! oint = smax-(smin-oint)%plen; ! looped1: ! ptr = bdt+oint*BCHNS; ! ! // inside in any case ! fb = ptr[0]; ! ! if(oint < maxo-1) { ! fa = oint > smin?ptr[-BCHNS]:bdt[maxo*BCHNS]; ! fc = ptr[BCHNS]; ! fd = ptr[BCHNS*2]; ! } ! else { ! fa = ptr[-BCHNS]; ! fc = oint < maxo?ptr[BCHNS]:ptr[(1-plen)*BCHNS]; ! fd = ptr[(2-plen)*BCHNS]; ! } ! } ! else { ! // first sample is outside in any case ! fa = bdt[smin*BCHNS]; ! ! if(oint+2 < smin) ! // if last is outside, all are outside ! fb = fc = fd = fa; ! else { ! fd = ptr[BCHNS*2]; ! if(oint+1 < smin) ! fb = fc = fa; ! else { ! fc = ptr[BCHNS]; ! fb = oint < smin?fa:ptr[0]; ! } ! } ! } ! } ! ! const float f1 = 0.5f*(frac-1.0f); ! const float f3 = frac*3.0f-1.0f; ! ! const float amdf = (fa-fd)*frac; ! const float cmb = fc-fb; ! const float bma = fb-fa; ! *(sig0++) = fb + frac*( cmb - f1 * ( amdf+bma+cmb*f3 ) ); ! } ! } ! else { ! for(int i = 0,si = 0; i < n; ++i,++si) { ! float o = *(pos++); ! register long oint = CASTINT<long>(o); ! const float frac = o-oint; ! register const t_sample *ptr = bdt+oint*BCHNS; ! register const t_sample *fa,*fb,*fc,*fd; ! ! if(oint > smin) ! if(oint < maxo-2) { ! // normal case ! fb = ptr; ! fa = fb-BCHNS; ! fc = fb+BCHNS; ! fd = fc+BCHNS; ! } ! else { ! // not enough space at the end ! ! if(looped) { ! // normalize position ! oint = smin+(oint-smin)%plen; ! goto looped2; ! } ! else { ! // last sample is outside in any case ! fd = bdt+maxo*BCHNS; ! ! if(oint-1 >= maxo) ! // if first is outside, all are outside ! fa = fb = fc = fd; ! else { ! fa = ptr-BCHNS; ! if(oint >= maxo) ! fb = fc = fd; ! else { ! fb = ptr; ! fc = oint+1 < maxo?ptr+BCHNS:fd; ! } ! } ! } ! } ! else { ! // not enough space at the beginning ! ! if(looped) { ! // normalize position ! oint = smax-(smin-oint)%plen; ! looped2: ! // inside in any case ! fb = bdt+oint*BCHNS; ! ! if(oint < maxo-1) { ! fa = oint > smin?fb-BCHNS:bdt+maxo*BCHNS; ! fc = fb+BCHNS; ! fd = fc+BCHNS; ! } ! else { ! fa = fb-BCHNS; ! fc = oint < maxo?fb+BCHNS:bdt+(oint-plen+1)*BCHNS; ! fd = bdt+(oint-plen+2)*BCHNS; ! } ! } ! else { ! // first sample is outside in any case ! fa = bdt+smin*BCHNS; ! ! if(oint+2 < smin) ! // if last is outside, all are outside ! fb = fc = fd = fa; ! else { ! fd = ptr+BCHNS*2; ! if(oint+1 < smin) ! fb = fc = fa; ! else { ! fc = ptr+BCHNS; ! fb = oint < smin?fa:ptr; ! } ! } ! } ! } ! ! const float f1 = 0.5f*(frac-1.0f); ! const float f3 = frac*3.0f-1.0f; ! ! for(int ci = 0; ci < OCHNS; ++ci) { ! const float amdf = (fa[ci]-fd[ci])*frac; ! const float cmb = fc[ci]-fb[ci]; ! const float bma = fb[ci]-fa[ci]; ! sig[ci][si] = fb[ci] + frac*( cmb - f1 * ( amdf+bma+cmb*f3 ) ); ! } ! } ! ! // clear rest of output channels (if buffer has less channels) ! for(int ci = OCHNS; ci < outchns; ++ci) ZeroSamples(sig[ci],n); ! } } ! TMPLDEF inline void xinter::s_play0(int n,t_sample *const *invecs,t_sample *const *outvecs) { ! st_play0 TMPLCALL (buf.Data(),curmin,curmax,n,buf.Channels(),outchns,invecs,outvecs,loopmode == xsl_loop); } ! TMPLDEF inline void xinter::s_play1(int n,t_sample *const *invecs,t_sample *const *outvecs) { ! st_play1 TMPLCALL (buf.Data(),curmin,curmax,n,buf.Channels(),outchns,invecs,outvecs,loopmode == xsl_loop); } ! TMPLDEF inline void xinter::s_play2(int n,t_sample *const *invecs,t_sample *const *outvecs) { ! st_play2 TMPLCALL (buf.Data(),curmin,curmax,n,buf.Channels(),outchns,invecs,outvecs,loopmode == xsl_loop); } ! TMPLDEF inline void xinter::s_play4(int n,t_sample *const *invecs,t_sample *const *outvecs) { ! st_play4 TMPLCALL (buf.Data(),curmin,curmax,n,buf.Channels(),outchns,invecs,outvecs,loopmode == xsl_loop); } Index: prefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/prefix.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** prefix.h 16 Dec 2004 05:02:24 -0000 1.1 --- prefix.h 8 Jan 2005 04:59:44 -0000 1.2 *************** *** 13,14 **** --- 13,15 ---- #include <flext.h> + #include <math.h> Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** main.h 16 Dec 2004 05:02:24 -0000 1.32 --- main.h 8 Jan 2005 04:59:44 -0000 1.33 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 14,22 **** #include "prefix.h" ! #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) ! #error You need at least flext version 0.4.6 #endif ! #define XSAMPLE_VERSION "0.3.1pre3" --- 12,20 ---- #include "prefix.h" ! #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 500) ! #error You need at least flext version 0.5.0 #endif ! #define XSAMPLE_VERSION "0.3.1pre4" *************** *** 25,29 **** #if defined(_MSC_VER) // MS VC 6.0 can't handle <int,int> templates?! -> no optimization ! #if _MSC_VER >= 1300 #define TMPLOPT #endif --- 23,28 ---- #if defined(_MSC_VER) // MS VC 6.0 can't handle <int,int> templates?! -> no optimization ! // MS VC .NET 2002 just dies with template optimization switched on ! #if _MSC_VER >= 1310 #define TMPLOPT #endif *************** *** 52,66 **** - // lazy me - #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 - - #if defined(__MWERKS__) && !defined(__MACH__) #define STD std --- 51,54 ---- *************** *** 93,96 **** --- 81,110 ---- #endif + #if FLEXT_CPU == FLEXT_CPU_INTEL && defined(__GNUC__) + template<typename I,typename F> inline I CASTINT(F o) { return lrintf(o); } + #elif FLEXT_CPU == FLEXT_CPU_INTEL && defined(_MSC_VER) + template<typename I,typename F> + inline I CASTINT(F x) { + // by Laurent de Soras (http://ldesoras.free.fr) + // assert (x > static_cast <double> (INT_MIN / 2) + 1.0); + // assert (x < static_cast <double> (INT_MAX / 2) + 1.0); + const float round_towards_m_i = -0.5f; + I i; + __asm + { + fld x + fadd st,st + fabs + fadd round_towards_m_i + fistp i + sar i, 1 + } + if(x < 0) i = -i; + return i; + } + #else + template<typename I,typename F> inline I CASTINT(F o) { return static_cast<I>(o); } + #endif + class xsample: *************** *** 102,172 **** xsample(); ~xsample(); ! enum xs_unit { ! xsu__ = -1, // don't change ! xsu_sample = 0,xsu_buffer,xsu_ms,xsu_s ! }; enum xs_intp { - xsi__ = -1, // don't change xsi_none = 0,xsi_4p,xsi_lin }; enum xs_sclmd { - xss__ = -1, // don't change xss_unitsinbuf = 0,xss_unitsinloop,xss_buffer,xss_loop }; protected: ! buffer *buf; ! virtual V m_start() = 0; ! virtual V m_stop() = 0; ! virtual BL m_reset(); ! virtual I m_set(I argc,const t_atom *argv); ! virtual V m_print() = 0; ! virtual BL m_refresh(); ! virtual V m_loadbang(); ! virtual V m_units(xs_unit u = xsu__); ! virtual V m_sclmode(xs_sclmd u = xss__); ! virtual V m_all(); ! virtual V m_min(F mn); ! virtual V m_max(F mx); ! virtual V m_dsp(I n,S *const *insigs,S *const *outsigs); ! virtual V s_dsp() = 0; ! xs_unit unitmode; //iunitmode,ounitmode; ! xs_sclmd sclmode; //isclmode,osclmode; ! L curmin,curmax; //,curlen; // in samples ! I sclmin; // in samples ! F sclmul; ! F s2u; // sample to unit conversion factor ! inline F scale(F smp) const { return (smp-sclmin)*sclmul; } ! static V arrscale(I n,const S *in,S *out,S add,S mul) { flext::ScaleSamples(out,in,mul,add,n); } ! inline V arrscale(I n,const S *in,S *out) const { arrscale(n,in,out,-sclmin*sclmul,sclmul); } ! static V arrmul(I n,const S *in,S *out,S mul) { flext::MulSamples(out,in,mul,n); } ! inline V arrmul(I n,const S *in,S *out) const { arrmul(n,in,out,(S)(1./s2u)); } ! BL bufchk(); ! V mg_buffer(AtomList &l) { if(buf && buf->Symbol()) { l(1); SetSymbol(l[0],buf->Symbol()); } else l(); } ! inline V ms_buffer(const AtomList &l) { m_set(l.Count(),l.Atoms()); } ! inline V mg_min(F &v) const { v = curmin*s2u; } ! inline V mg_max(F &v) const { v = curmax*s2u; } private: - static V setup(t_classid c); ! FLEXT_CALLBACK(m_start) ! FLEXT_CALLBACK(m_stop) FLEXT_CALLBACK_V(m_set) --- 116,246 ---- xsample(); ~xsample(); + + enum xs_change { + xsc__ = 0, + xsc_units = 0x0001, + xsc_play = 0x0002, + xsc_pos = 0x0008, + xsc_range = 0x0010, + xsc_transport = 0x0020, + xsc_fade = 0x0040, + + xsc_intp = xsc_play, + xsc_srate = xsc_play|xsc_units, + xsc_chns = xsc_play, + xsc_loop = xsc_play, + xsc_startstop = xsc_play|xsc_transport, + xsc_buffer = xsc_units|xsc_pos|xsc_range|xsc_play, + xsc_reset = xsc_buffer, + xsc_all = 0xffff + }; ! enum xs_unit { ! xsu_sample = 0,xsu_buffer,xsu_ms,xsu_s ! }; enum xs_intp { xsi_none = 0,xsi_4p,xsi_lin }; enum xs_sclmd { xss_unitsinbuf = 0,xss_unitsinloop,xss_buffer,xss_loop }; protected: ! virtual bool Finalize(); ! buffer buf; ! void m_reset() ! { ! ChkBuffer(true); ! DoReset(); ! Refresh(); ! } ! void m_set(int argc,const t_atom *argv); ! void m_refresh() ! { ! Update(xsc_buffer,true); ! } ! void m_units(xs_unit mode) ! { ! unitmode = mode; ! Update(xsc_units,true); ! } ! void m_sclmode(xs_sclmd mode) ! { ! sclmode = mode; ! Update(xsc_units,true); ! } ! void m_all() ! { ! ChkBuffer(true); ! ResetRange(); ! Refresh(); ! } ! void m_min(float mn); ! void m_max(float mx); ! ! xs_unit unitmode; ! xs_sclmd sclmode; ! ! long curmin,curmax; //,curlen; // in samples ! long sclmin; // in samples ! float sclmul; ! float s2u; // sample to unit conversion factor ! ! inline float scale(float smp) const { return (smp-sclmin)*sclmul; } ! static void arrscale(int n,const t_sample *in,t_sample *out,t_sample add,t_sample mul) { flext::ScaleSamples(out,in,mul,add,n); } ! inline void arrscale(int n,const t_sample *in,t_sample *out) const { arrscale(n,in,out,-sclmin*sclmul,sclmul); } ! static void arrmul(int n,const t_sample *in,t_sample *out,t_sample mul) { flext::MulSamples(out,in,mul,n); } ! inline void arrmul(int n,const t_sample *in,t_sample *out) const { arrmul(n,in,out,(t_sample)(1.f/s2u)); } ! void mg_buffer(AtomList &l) { if(buf.Symbol()) { l(1); SetSymbol(l[0],buf.Symbol()); } } ! inline void ms_buffer(const AtomList &l) { m_set(l.Count(),l.Atoms()); } ! inline void mg_min(float &v) const { v = curmin*s2u; } ! inline void mg_max(float &v) const { v = curmax*s2u; } ! ! void Refresh() { if(update && !Initing()) { DoUpdate(update); update = xsc__; } } ! void Update(unsigned int f,bool refr = false) { update |= f; if(refr) Refresh(); } ! //! return 0...invalid, 1...changed, -1...unchanged ! int ChkBuffer(bool refr = false); ! ! typedef flext::buffer::lock_t lock_t; ! ! //! Lock buffer (buffer must be checked ok) ! lock_t Lock() { return buf.Lock(); } ! //! Unlock buffer (buffer must be checked ok) ! void Unlock(lock_t l) { buf.Unlock(l); } ! ! void ResetRange() ! { ! curmin = 0; ! curmax = buf.Frames(); ! Update(xsc_range); ! } ! ! virtual void DoReset(); ! virtual void DoUpdate(unsigned int flags); ! ! virtual void m_loadbang(); ! virtual void m_print() = 0; ! virtual void m_dsp(int n,t_sample *const *insigs,t_sample *const *outsigs); private: ! unsigned int update; ! ! static void setup(t_classid c); FLEXT_CALLBACK_V(m_set) *************** *** 207,218 **** #define DEFSIGFUN(NAME) \ ! static V st_##NAME(thisType *obj,I n,S *const *in,S *const *out) { obj->NAME (n,in,out); } \ ! V NAME(I n,S *const *in,S *const *out) #define TMPLSIGFUN(NAME) \ ! TMPLDEF static V st_##NAME(thisType *obj,I n,S *const *in,S *const *out) { obj->NAME TMPLCALL (n,in,out); } \ ! TMPLDEF V NAME(I n,S *const *in,S *const *out) ! #define TMPLSTFUN(NAME) TMPLDEF static V NAME(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) #define SETSIGFUN(VAR,FUN) v_##VAR = FUN --- 281,292 ---- #define DEFSIGFUN(NAME) \ ! static void st_##NAME(thisType *obj,int n,t_sample *const *in,t_sample *const *out) { obj->NAME (n,in,out); } \ ! void NAME(int n,t_sample *const *in,t_sample *const *out) #define TMPLSIGFUN(NAME) \ ! TMPLDEF static void st_##NAME(thisType *obj,int n,t_sample *const *in,t_sample *const *out) { obj->NAME TMPLCALL (n,in,out); } \ ! TMPLDEF void NAME(int n,t_sample *const *in,t_sample *const *out) ! #define TMPLSTFUN(NAME) TMPLDEF static void NAME(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs) #define SETSIGFUN(VAR,FUN) v_##VAR = FUN *************** *** 221,229 **** #define DEFSIGCALL(NAME) \ ! inline V NAME(I n,S *const *in,S *const *out) { (*v_##NAME)(this,n,in,out); } \ ! V (*v_##NAME)(thisType *obj,I n,S *const *in,S *const *out) #define DEFSTCALL(NAME) \ ! V (*NAME)(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) #else --- 295,303 ---- #define DEFSIGCALL(NAME) \ ! inline void NAME(int n,t_sample *const *in,t_sample *const *out) { (*v_##NAME)(this,n,in,out); } \ ! void (*v_##NAME)(thisType *obj,int n,t_sample *const *in,t_sample *const *out) #define DEFSTCALL(NAME) \ ! void (*NAME)(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs) #else *************** *** 242,259 **** #define TMPLSTF(FUN,BCHNS,IOCHNS) TMPLFUN(FUN,BCHNS,IOCHNS) ! #define DEFSIGFUN(NAME) V NAME(I n,S *const *in,S *const *out) ! #define TMPLSIGFUN(NAME) TMPLDEF V NAME(I n,S *const *in,S *const *out) ! #define TMPLSTFUN(NAME) TMPLDEF static V NAME(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) #define SETSIGFUN(VAR,FUN) v_##VAR = FUN #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 SETSTFUN(VAR,FUN) VAR = FUN #define DEFSTCALL(NAME) \ ! V (*NAME)(const S *bdt,const I smin,const I smax,const I n,const I inchns,const I outchns,S *const *invecs,S *const *outvecs) #endif --- 316,333 ---- #define TMPLSTF(FUN,BCHNS,IOCHNS) TMPLFUN(FUN,BCHNS,IOCHNS) ! #define DEFSIGFUN(NAME) void NAME(int n,t_sample *const *in,t_sample *const *out) ! #define TMPLSIGFUN(NAME) TMPLDEF void NAME(int n,t_sample *const *in,t_sample *const *out) ! #define TMPLSTFUN(NAME) TMPLDEF static void NAME(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) #define SETSIGFUN(VAR,FUN) v_##VAR = FUN #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 SETSTFUN(VAR,FUN) VAR = FUN #define DEFSTCALL(NAME) \ ! void (*NAME)(const t_sample *bdt,const int smin,const int smax,const int n,const int inchns,const int outchns,t_sample *const *invecs,t_sample *const *outvecs,bool looped) #endif *************** *** 270,285 **** // optimization by using constants for channel numbers #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const I BCHNS = _BCHNS_ < 0?(bchns):_BCHNS_; \ ! const I IOCHNS = _IOCHNS_ < 0?MIN(iochns,BCHNS):MIN(_IOCHNS_,BCHNS) #else // no template optimization #if FLEXT_SYS == FLEXT_SYS_PD // only mono buffers #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const I BCHNS = 1; \ ! const I IOCHNS = MIN(iochns,BCHNS) #else // MAXMSP #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const I BCHNS = bchns; \ ! const I IOCHNS = MIN(iochns,BCHNS) #endif #endif --- 344,359 ---- // optimization by using constants for channel numbers #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const int BCHNS = _BCHNS_ < 0?(bchns):_BCHNS_; \ ! const int IOCHNS = _IOCHNS_ < 0?MIN(iochns,BCHNS):MIN(_IOCHNS_,BCHNS) #else // no template optimization #if FLEXT_SYS == FLEXT_SYS_PD // only mono buffers #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const int BCHNS = 1; \ ! const int IOCHNS = MIN(iochns,BCHNS) #else // MAXMSP #define SIGCHNS(BCHNS,bchns,IOCHNS,iochns) \ ! const int BCHNS = bchns; \ ! const int IOCHNS = MIN(iochns,BCHNS) #endif #endif *************** *** 292,308 **** public: ! xinter(): outchns(1),doplay(false),interp(xsi_4p) {} ! protected: ! virtual I m_set(I argc,const t_atom *argv); ! virtual V m_start(); ! virtual V m_stop(); ! inline V m_interp(xs_intp mode = xsi__) { interp = mode; s_dsp(); } ! I outchns; ! BL doplay; xs_intp interp; TMPLSIGFUN(s_play0); --- 366,405 ---- public: ! ! enum xs_loop { ! xsl_once = 0,xsl_loop,xsl_bidir ! }; ! ! xinter() ! : outchns(1),doplay(false) ! , interp(xsi_4p),loopmode(xsl_loop) ! {} ! void m_start() ! { ! ChkBuffer(); ! doplay = true; ! Update(xsc_startstop,true); ! } ! void m_stop() ! { ! ChkBuffer(); ! doplay = false; ! Update(xsc_startstop,true); ! } ! void m_interp(xs_intp mode) ! { ! interp = mode; ! Update(xsc_intp,true); ! } ! protected: ! ! int outchns; ! bool doplay; xs_intp interp; + xs_loop loopmode; TMPLSIGFUN(s_play0); *************** *** 319,329 **** DEFSIGCALL(zerofun); ! virtual V s_dsp(); ! private: ! static V setup(t_classid c); FLEXT_CALLSET_E(m_interp,xs_intp) FLEXT_ATTRGET_E(interp,xs_intp) }; --- 416,431 ---- DEFSIGCALL(zerofun); ! virtual void DoUpdate(unsigned int flags); ! FLEXT_CALLBACK(m_start) ! FLEXT_CALLBACK(m_stop) FLEXT_CALLSET_E(m_interp,xs_intp) FLEXT_ATTRGET_E(interp,xs_intp) + + FLEXT_ATTRGET_E(loopmode,xs_loop) + + private: + static void setup(t_classid c); }; *************** *** 333,336 **** #endif - - --- 435,436 ---- Index: record.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/record.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** record.cpp 16 Dec 2004 05:02:24 -0000 1.16 --- record.cpp 8 Jan 2005 04:59:44 -0000 1.17 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 23,73 **** public: ! xrecord(I argc,const t_atom *argv); ! ! virtual BL Init(); ! ! virtual V m_help(); ! virtual V m_print(); ! virtual I m_set(I argc,const t_atom *argv); ! ! virtual V m_pos(F pos); ! virtual V m_all(); ! virtual V m_start(); ! virtual V m_stop(); ! virtual BL m_reset(); ! virtual V m_units(xs_unit md = xsu__); ! virtual V m_min(F mn); ! virtual V m_max(F mx); ! inline V m_append(BL app) { if(!(appmode = app)) m_pos(0); } ! virtual V m_draw(I argc,const t_atom *argv); protected: ! I inchns; ! BL sigmode,appmode; ! F drintv; ! ! BL dorec,doloop; ! I mixmode; ! L curpos; // in samples ! inline V outputmin() { ToOutFloat(1,curmin*s2u); } ! inline V outputmax() { ToOutFloat(2,curmax*s2u); } ! inline V mg_pos(F &v) const { v = curpos*s2u; } private: ! static V setup(t_classid c); ! ! virtual V s_dsp(); TMPLSIGFUN(s_rec); DEFSIGCALL(recfun); ! virtual V m_signal(I n,S *const *in,S *const *out); FLEXT_CALLVAR_F(mg_pos,m_pos) --- 21,72 ---- public: ! xrecord(int argc,const t_atom *argv); ! void m_pos(float pos) ! { ! curpos = pos?CASTINT<long>(pos/s2u+.5):0; ! Update(xsc_pos); ! Refresh(); ! } ! inline void mg_pos(float &v) const { v = curpos*s2u; } ! void m_start(); ! void m_stop(); ! inline void m_append(bool app) ! { ! appmode = app; ! Update(xsc_play); ! if(!appmode) m_pos(0); ! } ! void m_draw(int argc,const t_atom *argv); protected: ! int inchns; ! bool sigmode,appmode; ! float drintv; ! bool dorec,doloop; ! int mixmode; ! long curpos; // in samples ! virtual void DoReset(); ! virtual void DoUpdate(unsigned int flags); ! ! virtual void m_help(); ! virtual void m_print(); ! virtual void m_signal(int n,t_sample *const *in,t_sample *const *out); private: ! static void setup(t_classid c); TMPLSIGFUN(s_rec); DEFSIGCALL(recfun); ! ! FLEXT_CALLBACK(m_start) ! FLEXT_CALLBACK(m_stop) FLEXT_CALLVAR_F(mg_pos,m_pos) *************** *** 91,98 **** ! V xrecord::setup(t_classid c) { DefineHelp(c,"xrecord~"); FLEXT_CADDATTR_VAR(c,"pos",mg_pos,m_pos); FLEXT_CADDATTR_VAR(c,"min",mg_min,m_min); --- 90,101 ---- ! void xrecord::setup(t_classid c) { DefineHelp(c,"xrecord~"); + FLEXT_CADDBANG(c,0,m_start); + FLEXT_CADDMETHOD_(c,0,"start",m_start); + FLEXT_CADDMETHOD_(c,0,"stop",m_stop); + FLEXT_CADDATTR_VAR(c,"pos",mg_pos,m_pos); FLEXT_CADDATTR_VAR(c,"min",mg_min,m_min); *************** *** 108,112 **** } ! xrecord::xrecord(I argc,const t_atom *argv): inchns(1), sigmode(false),appmode(true), --- 111,115 ---- } ! xrecord::xrecord(int argc,const t_atom *argv): inchns(1), sigmode(false),appmode(true), *************** *** 115,119 **** mixmode(0) { ! I argi = 0; #if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { --- 118,122 ---- mixmode(0) { ! int argi = 0; #if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { *************** *** 124,128 **** if(argc > argi && IsSymbol(argv[argi])) { ! buf = new buffer(GetSymbol(argv[argi]),true); argi++; --- 127,131 ---- if(argc > argi && IsSymbol(argv[argi])) { ! buf.Set(GetSymbol(argv[argi]),true); argi++; *************** *** 136,144 **** #endif } - else - buf = new buffer(NULL,true); ! for(I ci = 0; ci < inchns; ++ci) { ! C tmp[40]; STD::sprintf(tmp,ci == 0?"Messages/audio channel %i":"Audio channel %i",ci+1); AddInSignal(tmp); // audio signals --- 139,145 ---- #endif } ! for(int ci = 0; ci < inchns; ++ci) { ! char tmp[40]; STD::sprintf(tmp,ci == 0?"Messages/audio channel %i":"Audio channel %i",ci+1); AddInSignal(tmp); // audio signals *************** *** 156,280 **** } ! BL xrecord::Init() ! { ! if(xsample::Init()) { ! m_reset(); ! return true; ! } ! else ! return false; ! } ! ! V xrecord::m_units(xs_unit mode) ! { ! xsample::m_units(mode); ! ! m_sclmode(); ! outputmin(); ! outputmax(); ! } ! ! V xrecord::m_min(F mn) ! { ! xsample::m_min(mn); ! m_pos(curpos*s2u); ! outputmin(); ! } ! ! V xrecord::m_max(F mx) ! { ! xsample::m_max(mx); ! m_pos(curpos*s2u); ! outputmax(); ! } ! ! V xrecord::m_all() ! { ! xsample::m_all(); ! outputmin(); ! outputmax(); ! } ! ! V xrecord::m_pos(F pos) ! { ! curpos = pos?(L)(pos/s2u+.5):0; ! ! if(curpos < curmin) curpos = curmin; ! else if(curpos > curmax) curpos = curmax; ! } ! ! ! I xrecord::m_set(I argc,const t_atom *argv) ! { ! I r = xsample::m_set(argc,argv); ! if(r) ! // buffer parameters have changed, reset pos/min/max ! m_reset(); ! return r; ! } ! V xrecord::m_start() ! { ! if(!sigmode && !appmode) m_pos(0); ! m_refresh(); ! dorec = true; ! buf->SetRefrIntv(drintv); ! s_dsp(); } ! V xrecord::m_stop() { ! dorec = false; ! buf->Dirty(true); ! buf->SetRefrIntv(0); ! s_dsp(); } ! BL xrecord::m_reset() { curpos = 0; - return xsample::m_reset(); } ! V xrecord::m_draw(I argc,const t_atom *argv) { if(argc >= 1) { ! drintv = GetInt(argv[0]); ! if(dorec) buf->SetRefrIntv(drintv); } else ! buf->Dirty(true); } ! ! TMPLDEF V xrecord::s_rec(I n,S *const *invecs,S *const *outvecs) { ! SIGCHNS(BCHNS,buf->Channels(),ICHNS,inchns); ! const S *const *sig = invecs; ! register I si = 0; ! const S *on = invecs[inchns]; ! S *pos = outvecs[0]; ! BL lpbang = false; ! register const F pf = sclmul; ! register L o = curpos; if(o < curmin) o = curmin; ! // if(buf && dorec && curlen > 0) { ! if(buf && dorec && curmax > curmin) { while(n) { ! L ncur = curmax-o; // at max to buffer or recording end if(ncur <= 0) { // end of buffer if(doloop) { ! o = curmin; ! // ncur = curlen; ! ncur = curmax-o; } ! else ! m_stop(); // loop expired; lpbang = true; --- 157,223 ---- } + void xrecord::m_start() + { + ChkBuffer(); ! if(!sigmode && !appmode) { curpos = 0; Update(xsc_pos); } ! dorec = true; ! Update(xsc_startstop); ! Refresh(); } ! void xrecord::m_stop() { ! ChkBuffer(); ! dorec = false; ! Update(xsc_startstop); ! Refresh(); } ! void xrecord::DoReset() { + xsample::DoReset(); curpos = 0; } ! void xrecord::m_draw(int argc,const t_atom *argv) { if(argc >= 1) { ! drintv = GetAInt(argv[0]); ! if(dorec) buf.SetRefrIntv(drintv); } else ! buf.Dirty(true); } ! TMPLDEF void xrecord::s_rec(int n,t_sample *const *invecs,t_sample *const *outvecs) { ! SIGCHNS(BCHNS,buf.Channels(),ICHNS,inchns); ! const t_sample *const *sig = invecs; ! register int si = 0; ! const t_sample *on = invecs[inchns]; ! t_sample *pos = outvecs[0]; ! bool lpbang = false; ! register const float pf = sclmul; ! register long o = curpos; if(o < curmin) o = curmin; ! if(dorec && curmax > curmin) { while(n) { ! long ncur = curmax-o; // at max to buffer or recording end if(ncur <= 0) { // end of buffer if(doloop) { ! ncur = curmax-(o = curmin); } ! else { ! // loop expired; ! dorec = false; ! Update(xsc_startstop); ! } lpbang = true; *************** *** 285,291 **** if(ncur > n) ncur = n; ! register I i; ! register S *bf = buf->Data()+o*BCHNS; ! register F p = scale(o); if(sigmode) { --- 228,234 ---- if(ncur > n) ncur = n; ! register int i; ! register t_sample *bf = buf.Data()+o*BCHNS; ! register float p = scale(o); if(sigmode) { *************** *** 296,300 **** case 0: for(i = 0; i < ncur; ++i,++si) { ! if(*(on++) >= 0) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = sig[ci][si]; --- 239,243 ---- case 0: for(i = 0; i < ncur; ++i,++si) { ! if(!(*(on++) < 0)) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = sig[ci][si]; *************** *** 308,313 **** case 1: for(i = 0; i < ncur; ++i,++si) { ! register const S g = *(on++); ! if(g >= 0) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-g)+sig[ci][si]*g; --- 251,256 ---- case 1: for(i = 0; i < ncur; ++i,++si) { ! register const t_sample g = *(on++); ! if(!(g < 0)) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-g)+sig[ci][si]*g; *************** *** 321,325 **** case 2: for(i = 0; i < ncur; ++i,++si) { ! if(*(on++) >= 0) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] += sig[ci][si]; --- 264,268 ---- case 2: for(i = 0; i < ncur; ++i,++si) { ! if(!(*(on++) < 0)) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] += sig[ci][si]; *************** *** 338,342 **** case 0: { for(i = 0; i < ncur; ++i,++si) { ! if(*(on++) >= 0) { for(int ci = 0; ci < ICHNS; ++ci) --- 281,285 ---- case 0: { for(i = 0; i < ncur; ++i,++si) { ! if(!(*(on++) < 0)) { for(int ci = 0; ci < ICHNS; ++ci) *************** *** 347,351 **** else { *(pos++) = p = scale(o = 0); ! bf = buf->Data(); } } --- 290,294 ---- else { *(pos++) = p = scale(o = 0); ! bf = buf.Data(); } } *************** *** 354,359 **** case 1: { for(i = 0; i < ncur; ++i,++si) { ! register const S g = *(on++); ! if(g >= 0) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-g)+sig[ci][si]*g; --- 297,302 ---- case 1: { for(i = 0; i < ncur; ++i,++si) { ! register const t_sample g = *(on++); ! if(!(g < 0)) { for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-g)+sig[ci][si]*g; *************** *** 363,367 **** else { *(pos++) = p = scale(o = 0); ! bf = buf->Data(); } } --- 306,310 ---- else { *(pos++) = p = scale(o = 0); ! bf = buf.Data(); } } *************** *** 370,374 **** case 2: { for(i = 0; i < ncur; ++i,++si) { ! if(*(on++) >= 0) { for(int ci = 0; ci < ICHNS; ++ci) --- 313,317 ---- case 2: { for(i = 0; i < ncur; ++i,++si) { ! if(!(*(on++) < 0)) { for(int ci = 0; ci < ICHNS; ++ci) *************** *** 379,383 **** else { *(pos++) = p = scale(o = 0); ! bf = buf->Data(); } } --- 322,326 ---- else { *(pos++) = p = scale(o = 0); ! bf = buf.Data(); } } *************** *** 394,399 **** case 0: { for(int ci = 0; ci < ICHNS; ++ci) { ! register S *b = bf+ci; ! register const F *s = sig[ci]+si; for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b = *s; --- 337,342 ---- case 0: { for(int ci = 0; ci < ICHNS; ++ci) { ! register t_sample *b = bf+ci; ! register const float *s = sig[ci]+si; for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b = *s; *************** *** 404,408 **** case 1: { for(i = 0; i < ncur; ++i,++si) { ! register const S w = *(on++); for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-w)+sig[ci][si]*w; --- 347,351 ---- case 1: { for(i = 0; i < ncur; ++i,++si) { ! register const t_sample w = *(on++); for(int ci = 0; ci < ICHNS; ++ci) bf[ci] = bf[ci]*(1.-w)+sig[ci][si]*w; *************** *** 413,419 **** case 2: { for(int ci = 0; ci < ICHNS; ++ci) { ! register S *b = bf+ci; ! register const F *s = sig[ci]+si; ! for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b += *s; } si += ncur; --- 356,363 ---- case 2: { for(int ci = 0; ci < ICHNS; ++ci) { ! register t_sample *b = bf+ci; ! register const float *s = sig[ci]+si; ! for(i = 0; i < ncur; ++i,b += BCHNS,++s) ! *b += *s; } si += ncur; *************** *** 431,439 **** curpos = o; ! buf->Dirty(); } if(n) { ! register F p = scale(o); while(n--) *(pos++) = p; } --- 375,383 ---- curpos = o; ! buf.Dirty(); } if(n) { ! register float p = scale(o); while(n--) *(pos++) = p; } *************** *** 442,450 **** } ! V xrecord::m_signal(I n,S *const *in,S *const *out) { ! if(bufchk()) // call the appropriate dsp function ! recfun(n,in,out); else // set position signal to zero --- 386,402 ---- } ! void xrecord::m_signal(int n,t_sample *const *in,t_sample *const *out) { ! int ret = ChkBuffer(true); ! ! if(ret) { // call the appropriate dsp function ! ! const lock_t l = Lock(); ! recfun(n,in,out); ! Unlock(l); ! ! Refresh(); ! } else // set position signal to zero *************** *** 452,474 **** } ! V xrecord::s_dsp() { ! switch(buf->Channels()*1000+inchns) { ! case 1001: SETSIGFUN(recfun,TMPLFUN(s_rec,1,1)); break; ! case 1002: SETSIGFUN(recfun,TMPLFUN(s_rec,1,2)); break; ! case 2001: SETSIGFUN(recfun,TMPLFUN(s_rec,2,1)); break; ! case 2002: SETSIGFUN(recfun,TMPLFUN(s_rec,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(recfun,TMPLFUN(s_rec,4,-1)); break; ! case 4004: SETSIGFUN(recfun,TMPLFUN(s_rec,4,4)); break; ! default: SETSIGFUN(recfun,TMPLFUN(s_rec,-1,-1)); break; ! } ! } ! V xrecord::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); --- 404,447 ---- } ! void xrecord::DoUpdate(unsigned int flags) { ! xsample::DoUpdate(flags); + if(flags&(xsc_pos|xsc_range)) { + if(curpos < curmin) curpos = curmin; + else if(curpos > curmax) curpos = curmax; + } + if(flags&xsc_range) { + ToOutFloat(1,curmin*s2u); + ToOutFloat(2,curmax*s2u); + } + if(flags&xsc_transport && buf.Ok()) { + if(dorec) + buf.SetRefrIntv(drintv); + else { + buf.Dirty(true); + buf.SetRefrIntv(0); + } + } ! if(flags&xsc_play) { ! switch(buf.Channels()*1000+inchns) { ! case 1001: SETSIGFUN(recfun,TMPLFUN(s_rec,1,1)); break; ! case 1002: SETSIGFUN(recfun,TMPLFUN(s_rec,1,2)); break; ! case 2001: SETSIGFUN(recfun,TMPLFUN(s_rec,2,1)); break; ! case 2002: SETSIGFUN(recfun,TMPLFUN(s_rec,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(recfun,TMPLFUN(s_rec,4,-1)); break; ! case 4004: SETSIGFUN(recfun,TMPLFUN(s_rec,4,4)); break; ! default: SETSIGFUN(recfun,TMPLFUN(s_rec,-1,-1)); break; ! } ! } ! } ! ! ! void xrecord::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); *************** *** 476,480 **** post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2004"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); --- 449,453 ---- post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2005"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); *************** *** 507,520 **** } ! V xrecord::m_print() { ! static const C sclmode_txt[][20] = {"units","units in loop","buffer","loop"}; // print all current settings post("%s - current settings:",thisName()); ! post("bufname = '%s', length = %.3f, channels = %i",buf->Name(),(F)(buf->Frames()*s2u),buf->Channels()); ! post("in channels = %i, frames/unit = %.3f, scale mode = %s",inchns,(F)(1./s2u),sclmode_txt[sclmode]); post("sigmode = %s, append = %s, loop = %s, mixmode = %i",sigmode?"yes":"no",appmode?"yes":"no",doloop?"yes":"no",mixmode); post(""); } - --- 480,492 ---- } ! void xrecord::m_print() { ! static const char sclmode_txt[][20] = {"units","units in loop","buffer","loop"}; // print all current settings post("%s - current settings:",thisName()); ! post("bufname = '%s', length = %.3f, channels = %i",buf.Name(),(float)(buf.Frames()*s2u),buf.Channels()); ! post("in channels = %i, frames/unit = %.3f, scale mode = %s",inchns,(float)(1./s2u),sclmode_txt[sclmode]); post("sigmode = %s, append = %s, loop = %s, mixmode = %i",sigmode?"yes":"no",appmode?"yes":"no",doloop?"yes":"no",mixmode); post(""); } Index: play.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/play.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** play.cpp 8 Feb 2004 03:40:47 -0000 1.9 --- play.cpp 8 Jan 2005 04:59:44 -0000 1.10 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 23,49 **** public: ! xplay(I argc,const t_atom *argv); ! virtual BL Init(); ! ! virtual V m_help(); ! virtual V m_print(); private: ! static V setup(t_classid c); ! virtual V m_signal(I n,S *const *in,S *const *out); }; FLEXT_LIB_DSP_V("xplay~",xplay) ! V xplay::setup(t_classid c) { DefineHelp(c,"xplay~"); } ! xplay::xplay(I argc,const t_atom *argv) { ! I argi = 0; #if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { --- 21,58 ---- public: ! xplay(int argc,const t_atom *argv); ! ! void m_loop(xs_loop lp) ! { ! loopmode = lp; ! Update(xsc_loop,true); ! } ! protected: ! virtual void m_help(); ! virtual void m_print(); ! virtual void m_signal(int n,t_sample *const *in,t_sample *const *out); private: ! static void setup(t_classid c); ! FLEXT_CALLSET_E(m_loop,xs_loop) }; FLEXT_LIB_DSP_V("xplay~",xplay) ! void xplay::setup(t_classid c) { DefineHelp(c,"xplay~"); + + FLEXT_CADDATTR_VAR_E(c,"loop",loopmode,m_loop); } ! xplay::xplay(int argc,const t_atom *argv) { ! // set the loopmode to non-wrapping (for sample interpolation) ! loopmode = xsl_once; ! ! int argi = 0; #if FLEXT_SYS == FLEXT_SYS_MAX if(argc > argi && CanbeInt(argv[argi])) { *************** *** 54,58 **** if(argc > argi && IsSymbol(argv[argi])) { ! buf = new buffer(GetSymbol(argv[argi]),true); argi++; --- 63,67 ---- if(argc > argi && IsSymbol(argv[argi])) { ! buf.Set(GetSymbol(argv[argi]),true); argi++; *************** *** 66,100 **** #endif } - else - buf = new buffer(NULL,true); ! AddInSignal("Messages and Signal of playing position"); // pos signal ! for(I ci = 0; ci < outchns; ++ci) { ! C tmp[30]; STD::sprintf(tmp,"Audio signal channel %i",ci+1); AddOutSignal(tmp); } - - m_reset(); } ! BL xplay::Init() ! { ! if(xinter::Init()) { ! m_reset(); ! return true; ! } ! else ! return false; ! } ! ! V xplay::m_signal(I n,S *const *in,S *const *out) { // check whether buffer is invalid or changed ! if(bufchk()) { // convert position units to frames arrmul(n,in[0],out[0]); // call resample routine playfun(n,out,out); } else --- 75,103 ---- #endif } ! AddInSignal("Messages and Signal of playing position"); // pos signal ! for(int ci = 0; ci < outchns; ++ci) { ! char tmp[30]; STD::sprintf(tmp,"Audio signal channel %i",ci+1); AddOutSignal(tmp); } } ! void xplay::m_signal(int n,t_sample *const *in,t_sample *const *out) { + int ret = ChkBuffer(true); + // check whether buffer is invalid or changed ! if(ret) { ! const lock_t l = Lock(); ! // convert position units to frames arrmul(n,in[0],out[0]); // call resample routine playfun(n,out,out); + + Unlock(l); + + Refresh(); } else *************** *** 104,108 **** ! V xplay::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); --- 107,111 ---- ! void xplay::m_help() { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); *************** *** 110,114 **** post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2004"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); --- 113,117 ---- post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2005"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); *************** *** 121,125 **** post("\thelp: shows this help"); post("\tset name: set buffer"); ! post("\tenable 0/1: turn dsp calculation off/on"); post("\tprint: print current settings"); post("\tbang/start: begin playing"); --- 124,128 ---- post("\thelp: shows this help"); post("\tset name: set buffer"); ! post("\tenable 0/1: turn dsp calculation off/on"); post("\tprint: print current settings"); post("\tbang/start: begin playing"); *************** *** 129,144 **** post("\t@units 0/1/2/3: set units to samples/buffer size/ms/s"); post("\t@interp 0/1/2: set interpolation to off/4-point/linear"); post(""); } ! V xplay::m_print() { ! const C *interp_txt[] = {"off","4-point","linear"}; // print all current settings post("%s - current settings:",thisName()); ! post("bufname = '%s', length = %.3f, channels = %i",buf->Name(),(F)(buf->Frames()*s2u),buf->Channels()); ! post("out channels = %i, samples/unit = %.3f, interpolation = %s",outchns,(F)(1./s2u),interp_txt[interp >= xsi_none && interp <= xsi_lin?interp:xsi_none]); post(""); } - - --- 132,146 ---- post("\t@units 0/1/2/3: set units to samples/buffer size/ms/s"); post("\t@interp 0/1/2: set interpolation to off/4-point/linear"); + post("\t@loop 0/1/2: sets looping (interpolation) to off/forward/bidirectional"); post(""); } ! void xplay::m_print() { ! const char *interp_txt[] = {"off","4-point","linear"}; // print all current settings post("%s - current settings:",thisName()); ! post("bufname = '%s', length = %.3f, channels = %i",buf.Name(),(float)(buf.Frames()*s2u),buf.Channels()); ! post("out channels = %i, samples/unit = %.3f, interpolation = %s",outchns,(float)(1./s2u),interp_txt[interp >= xsi_none && interp <= xsi_lin?interp:xsi_none]); post(""); } Index: inter.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/inter.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** inter.cpp 16 Dec 2004 05:02:24 -0000 1.8 --- inter.cpp 8 Jan 2005 04:59:44 -0000 1.9 *************** *** 1,10 **** /* - xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. - */ --- 1,8 ---- /* xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (c) 2001-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ *************** *** 22,100 **** void xinter::setup(t_classid c) { FLEXT_CADDATTR_VAR_E(c,"interp",interp,m_interp); } ! I xinter::m_set(I argc,const t_atom *argv) { ! I r = xsample::m_set(argc,argv); ! if(r) ! // buffer parameters have changed, reset pos/min/max ! m_reset(); ! return r; ! } ! ! V xinter::m_start() ! { ! m_refresh(); ! doplay = true; ! s_dsp(); ! } ! ! V xinter::m_stop() ! { ! doplay = false; ! s_dsp(); ! } ! V xinter::s_dsp() ! { ! switch(outchns) { ! case 1: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,1)); break; ! case 2: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,2)); break; ! case 4: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,4)); break; ! default: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,-1)); ! } ! if(doplay) { ! if(interp == xsi_4p) ! switch(buf->Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play4,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play4,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play4,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play4,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play4,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play4,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play4,-1,-1)); ! } ! else if(interp == xsi_lin) ! switch(buf->Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play2,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play2,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play2,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play2,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play2,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play2,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play2,-1,-1)); ! } ! else ! switch(buf->Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play1,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play1,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play1,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play1,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play1,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play1,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play1,-1,-1)); ! } ! } ! else ! SETSIGFUN(playfun,TMPLFUN(s_play0,-1,-1)); } - - --- 20,82 ---- void xinter::setup(t_classid c) { + FLEXT_CADDBANG(c,0,m_start); + FLEXT_CADDMETHOD_(c,0,"start",m_start); + FLEXT_CADDMETHOD_(c,0,"stop",m_stop); + FLEXT_CADDATTR_VAR_E(c,"interp",interp,m_interp); } ! void xinter::DoUpdate(unsigned int flags) { ! xsample::DoUpdate(flags); ! if(flags&xsc_play) { ! switch(outchns) { ! case 1: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,1)); break; ! case 2: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,2)); break; ! case 4: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,4)); break; ! default: SETSIGFUN(zerofun,TMPLFUN(s_play0,-1,-1)); ! } ! if(doplay && buf.Ok()) { ! if(interp == xsi_4p) ! switch(buf.Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play4,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play4,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play4,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play4,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play4,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play4,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play4,-1,-1)); ! } ! else if(interp == xsi_lin) ! switch(buf.Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play2,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play2,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play2,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play2,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play2,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play2,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play2,-1,-1)); ! } ! else ! switch(buf.Channels()*1000+outchns) { ! case 1001: SETSIGFUN(playfun,TMPLFUN(s_play1,1,1)); break; ! case 1002: SETSIGFUN(playfun,TMPLFUN(s_play1,1,2)); break; ! case 2001: SETSIGFUN(playfun,TMPLFUN(s_play1,2,1)); break; ! case 2002: SETSIGFUN(playfun,TMPLFUN(s_play1,2,2)); break; ! case 4001: ! case 4002: ! case 4003: SETSIGFUN(playfun,TMPLFUN(s_play1,4,-1)); break; ! case 4004: SETSIGFUN(playfun,TMPLFUN(s_play1,4,4)); break; ! default: SETSIGFUN(playfun,TMPLFUN(s_play1,-1,-1)); ! } ! } ! else ! SETSIGFUN(playfun,TMPLFUN(s_play0,-1,-1)); ! } }

1 0

externals/grill/xsample/maxmsp xsample.help,1.8,1.9
by Thomas Grill 08 Jan '05

08 Jan '05

Update of /cvsroot/pure-data/externals/grill/xsample/maxmsp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17093/maxmsp Modified Files: xsample.help Log Message: merge in branch "20041229-unify" - some small cleanups os x fixes minor updates improved buffer handling simplify updates Mac adaptations - made xcode project preparing xsample 0.3.0 release updated for build system some optimizations - fixed loop record bug Completion of attribute functionality, revisited and updated help files Index: xsample.help =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/maxmsp/xsample.help,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvscplS6O and /tmp/cvsdEG9eF differ

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2005