Pd-cvs February 2005

pd-cvs@lists.iem.at

8 participants
107 discussions

externals/grill/py/source main.cpp,1.23,1.24 main.h,1.30,1.31 pyext.cpp,1.26,1.27
by Thomas Grill 26 Feb '05

26 Feb '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15178/source Modified Files: main.cpp main.h pyext.cpp Log Message: - garbage collection at module scope - better handling of bang messages better error reporting Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** pyext.cpp 23 Feb 2005 04:57:19 -0000 1.26 --- pyext.cpp 26 Feb 2005 04:57:48 -0000 1.27 *************** *** 245,249 **** } ! if(gcrun) collect(); } --- 245,251 ---- } ! if(gcrun && !collect()) { ! post("%s - Unloading: Object is still referenced",thisName()); ! } } Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** main.cpp 23 Feb 2005 04:57:18 -0000 1.23 --- main.cpp 26 Feb 2005 04:57:48 -0000 1.24 *************** *** 557,561 **** #endif ! void py::collect() { if(gcollect) { --- 557,561 ---- #endif ! bool py::collect() { if(gcollect) { *************** *** 569,574 **** --- 569,576 ---- #endif Py_DECREF(ret); + return false; } } + return true; } Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** main.h 23 Feb 2005 04:57:19 -0000 1.30 --- main.h 26 Feb 2005 04:57:48 -0000 1.31 *************** *** 133,137 **** #endif ! static void collect(); private: --- 133,137 ---- #endif ! static bool collect(); private:

1 0

externals/grill/flext/source flcontainers.h,NONE,1.1 flqueue.cpp,1.27,1.28 flsupport.h,1.78,1.79
by Thomas Grill 26 Feb '05

26 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14844/source Modified Files: flqueue.cpp flsupport.h Added Files: flcontainers.h Log Message: - fixed typos and 64-bit compatibility - conform to idle callback functionality in devel_0_38 new lock-free lifo and fifo Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** flqueue.cpp 8 Feb 2005 04:56:22 -0000 1.27 --- flqueue.cpp 26 Feb 2005 04:56:22 -0000 1.28 *************** *** 19,22 **** --- 19,23 ---- #include "flext.h" #include "flinternal.h" + #include "flcontainers.h" #include <string.h> // for memcpy *************** *** 26,40 **** #endif - #define QUEUE_LENGTH 2048 - #define QUEUE_ATOMS 8192 ! class qmsg { public: ! void Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! { ! th = t; out = o; ! sym = s,argc = ac,argv = av; ! } // \note PD sys lock must already be held by caller --- 27,40 ---- #endif ! class qmsg: ! public flext, ! public Cell { public: ! qmsg(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! : msg(s,ac,av) ! , th(t),out(o) ! {} // \note PD sys lock must already be held by caller *************** *** 43,60 **** if(out < 0) // message to self ! th->m_methodmain(-1-out,sym,argc,argv); else // message to outlet ! th->ToSysAnything(out,sym,argc,argv); } - int Args() const { return argc; } - private: flext_base *th; int out; ! const t_symbol *sym; ! int argc; ! const t_atom *argv; }; --- 43,56 ---- if(out < 0) // message to self ! th->m_methodmain(-1-out,msg.Header(),msg.Count(),msg.Atoms()); else // message to outlet ! th->ToSysAnything(out,msg.Header(),msg.Count(),msg.Atoms()); } private: flext_base *th; int out; ! AtomAnything msg; }; *************** *** 63,107 **** */ class Queue: ! public flext { public: ! Queue() ! { ! qhead = qtail = 0; ! ahead = atail = 0; ! } ! ! bool Empty() const { return qhead == qtail; } ! ! int Count() const ! { ! int c = qtail-qhead; ! return c >= 0?c:c+QUEUE_LENGTH; ! } ! const qmsg &Head() { return lst[qhead]; } ! void Pop() ! { ! PopAtoms(Head().Args()); ! qhead = (qhead+1)%QUEUE_LENGTH; ! } void Push(flext_base *th,int o) // bang { ! Set(th,o,sym_bang,0,NULL); } void Push(flext_base *th,int o,float dt) { ! t_atom *at = GetAtoms(1); ! SetFloat(*at,dt); ! Set(th,o,sym_float,1,at); } void Push(flext_base *th,int o,int dt) { ! t_atom *at = GetAtoms(1); ! SetInt(*at,dt); const t_symbol *sym; #if FLEXT_SYS == FLEXT_SYS_PD --- 59,88 ---- */ class Queue: ! public flext, ! public Fifo { public: ! inline bool Empty() const { return Size() == 0; } ! inline void Push(qmsg *q) { Fifo::Put(q); } ! inline qmsg *Pop() { return static_cast<qmsg *>(Fifo::Get()); } void Push(flext_base *th,int o) // bang { ! Put(new qmsg(th,o,sym_bang,0,NULL)); } void Push(flext_base *th,int o,float dt) { ! t_atom at; ! SetFloat(at,dt); ! Put(new qmsg(th,o,sym_float,1,&at)); } void Push(flext_base *th,int o,int dt) { ! t_atom at; ! SetInt(at,dt); const t_symbol *sym; #if FLEXT_SYS == FLEXT_SYS_PD *************** *** 112,129 **** #error Not implemented! #endif ! Set(th,o,sym,1,at); } void Push(flext_base *th,int o,const t_symbol *dt) { ! t_atom *at = GetAtoms(1); ! SetSymbol(*at,dt); ! Set(th,o,sym_symbol,1,at); } void Push(flext_base *th,int o,const t_atom &a) { - t_atom *at = GetAtoms(1); - *at = a; const t_symbol *sym; if(IsSymbol(a)) --- 93,108 ---- #error Not implemented! #endif ! Put(new qmsg(th,o,sym,1,&at)); } void Push(flext_base *th,int o,const t_symbol *dt) { ! t_atom at; ! SetSymbol(at,dt); ! Put(new qmsg(th,o,sym_symbol,1,&at)); } void Push(flext_base *th,int o,const t_atom &a) { const t_symbol *sym; if(IsSymbol(a)) *************** *** 143,204 **** return; } ! Set(th,o,sym,1,at); } void Push(flext_base *th,int o,int argc,const t_atom *argv) { ! t_atom *at = GetAtoms(argc); ! memcpy(at,argv,argc*sizeof(t_atom)); ! Set(th,o,sym_list,argc,at); } void Push(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) { ! t_atom *at = GetAtoms(argc); ! memcpy(at,argv,argc*sizeof(t_atom)); ! Set(th,o,sym,argc,at); ! } ! ! protected: ! void Set(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) ! { ! FLEXT_ASSERT(Count() < QUEUE_LENGTH-1); ! lst[qtail].Set(th,o,sym,argc,argv); ! qtail = (qtail+1)%QUEUE_LENGTH; ! } ! ! int CntAtoms() const ! { ! int c = atail-ahead; ! return c >= 0?c:c+QUEUE_ATOMS; ! } ! ! // must return contiguous region ! t_atom *GetAtoms(int argc) ! { ! t_atom *ret; ! if(atail+argc >= QUEUE_ATOMS) { ! FLEXT_ASSERT(ahead > argc); ! ret = atoms; ! atail = argc; ! } ! else { ! FLEXT_ASSERT(ahead <= atail || ahead > atail+argc); ! ret = atoms+atail; ! atail += argc; ! } ! return ret; ! } ! ! void PopAtoms(int argc) ! { ! const int p = ahead+argc; ! ahead = p >= QUEUE_ATOMS?argc:p; } - - volatile int qhead,qtail; - qmsg lst[QUEUE_LENGTH]; - volatile int ahead,atail; - t_atom atoms[QUEUE_ATOMS]; }; --- 122,137 ---- return; } ! Put(new qmsg(th,o,sym,1,&a)); } void Push(flext_base *th,int o,int argc,const t_atom *argv) { ! Put(new qmsg(th,o,sym_list,argc,argv)); } void Push(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) { ! Put(new qmsg(th,o,sym,argc,argv)); } }; *************** *** 223,227 **** // On the other hand, if new queue elements are added by the methods called // in the loop, these will be sent in the next tick to avoid recursion overflow. ! int qc = queue.Count(); if(!qc) break; --- 156,160 ---- // On the other hand, if new queue elements are added by the methods called // in the loop, these will be sent in the next tick to avoid recursion overflow. ! size_t qc = queue.Size(); if(!qc) break; *************** *** 230,238 **** #endif ! // once more, because flushing in destructors could have reduced the count ! for(qc = queue.Count(); qc--; ) { ! queue.Head().Send(); ! queue.Pop(); ! } // inner loop #if FLEXT_QMODE == 2 --- 163,171 ---- #endif ! qmsg *q; ! while((q = queue.Pop()) != NULL) { ! q->Send(); ! delete q; ! } #if FLEXT_QMODE == 2 --- NEW FILE: flcontainers.h --- /* flext - C++ layer for Max/MSP and pd (pure data) externals 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. */ /*! \file flcontainers.h \brief Lock-free container classes This code has been adapted from the MidiShare project (c)Grame */ #ifndef __FLCONTAINERS_H #define __FLCONTAINERS_H #include "flprefix.h" class Cell { friend class Lifo; friend class Fifo; private: Cell *link; }; #if 1 //def __Pentium__ #define VTYPE volatile #else #define VTYPE #endif #define __SMP__ class FLEXT_SHARE Lifo { public: inline Lifo() { Init(); } inline void Init() { ic = oc = 0; top = NULL; } inline Cell *Avail() { return (Cell *)top; } #if defined(_WIN32) && defined(_MSC_VER) #ifdef __SMP__ #define LOCK lock #else #define LOCK #endif inline void Push(Cell *cell) { __asm { push eax push ebx push ecx push edx push esi mov esi, this mov eax, dword ptr [esi] mov ecx, cell mov edx, dword ptr [esi+4] _loop: mov ebx, eax inc ebx mov [ecx], edx LOCK cmpxchg8b qword ptr [esi] jnz _loop pop esi pop edx pop ecx pop ebx pop eax } } inline Cell *Pop() { __asm { push ebx push ecx push edx push esi mov esi, this add esi, 4 /* point to top */ mov edx, dword ptr [esi+4] mov eax, dword ptr [esi] test eax, eax jz _end _loop: mov ebx, dword ptr [eax] mov ecx, edx inc ecx LOCK cmpxchg8b qword ptr [esi] jz _end test eax, eax jnz _loop _end: pop esi pop edx pop ecx pop ebx } } inline size_t Size() const { return ic-oc; } #elif defined(__GNUC__) && defined(__) #ifndef SMPLOCK # ifdef __SMP__ # define SMPLOCK "lock ; " # else # define SMPLOCK "" # endif #endif inline void Push(Cell *cl) { __asm__ __volatile__ ( "# LFPUSH \n\t" "pushl %%ebx \n\t" "pushl %%ecx \n\t" "movl 0(%%esi), %%eax \n\t" "movl 4(%%esi), %%edx \n" "1: \t" "movl %%eax, %%ebx \n\t" "incl %%ebx \n\t" "movl %%edx, (%%ecx) \n\t" SMPLOCK "cmpxchg8b (%%esi) \n\t" "jnz 1b \n\t" "popl %%ecx \n\t" "popl %%ebx \n\t" :/* no output */ :"S" (this), "c" (cl) :"memory", "eax", "edx"); } inline Cell *Pop() { cell* v=0; __asm__ __volatile__ ( "# LFPOP \n\t" "pushl %%ebx \n\t" "pushl %%ecx \n\t" "movl 4(%%esi), %%edx \n\t" "movl (%%esi), %%eax \n\t" "testl %%eax, %%eax \n\t" "jz 20f \n" "10: \t" "movl (%%eax), %%ebx \n\t" "movl %%edx, %%ecx \n\t" "incl %%ecx \n\t" SMPLOCK "cmpxchg8b (%%esi) \n\t" "jz 20f \n\t" "testl %%eax, %%eax \n\t" "jnz 10b \n" "20: \t" "popl %%ecx \n\t" "popl %%ebx \n\t" :"=a" (v) :"S" (&this->top) :"memory", "edx"); return v; } inline size_t Size() { size_t n; __asm__ __volatile__ ( "# LFSIZE \n\t" "movl 8(%%esi), %%edx \n\t" "movl (%%esi), %%eax \n\t" "subl %%edx, %%eax \n\t" :"=a" (n) :"S" (this) :"memory", "edx"); return n; } #elif defined(__GNUC__) && defined(__POWERPC__) inline void Push(register Cell *cl) { register volatile long t1; register long t2=0; asm volatile ( "# LFPUSH \n" "0: \n" " lwarx %0, %3, %1 \n" " stw %0, 0(%2) \n" " sync \n" " stwcx. %2, %3, %1 \n" " bne- 0b \n" "0: \n" " lwarx %0, %3, %4 \n" " addi %0, %0, 1 \n" " sync \n" " stwcx. %0, %3, %4 \n" " bne- 0b \n" : "=r" (t1) : "r" (&this->top), "r" (cl), "r" (t2), "r" (&this->oc), "0" (t1) : "r0" /* prevents using r0 because of the ambiguity of 'addi' coding: */ /* gcc version 2.95.3 20010315 (release - Linux-Mandrake 8.0 for PPC) */ /* compiles the instruction "addi 0, 0, n" as li 0, n */ ); } inline Cell *Pop() { register Cell *result; register volatile long a, b; register long c=0; asm volatile ( "# LFPOP \n" "0: \n" " lwarx %4, %1, %2 \n" /* creates a reservation on lf */ " cmpwi %4, 0 \n" /* test if the lifo is empty */ " beq- 1f \n" " lwz %5, 0(%4) \n" /* next cell in b */ " sync \n" /* synchronize instructions */ " stwcx. %5, %1, %2 \n" /* if the reservation is not altered */ /* modify lifo top */ " bne- 0b \n" /* otherwise: loop and try again */ "0: \n" " lwarx %5, %1, %3 \n" /* creates a reservation on lf->count */ " addi %5, %5, -1 \n" /* dec count */ " sync \n" /* synchronize instructions */ " stwcx. %5, %1, %3 \n" /* conditionnal store */ " bne- 0b \n" "1: \n" " mr %0, %4 \n" :"=r" (result), "=r" (c) : "r" (&this->top), "r" (&this->oc), "r" (a), "r" (b), "1" (c) : "r0" /* prevents using r0 because of the ambiguity of 'addi' coding: */ /* gcc version 2.95.3 20010315 (release - Linux-Mandrake 8.0 for PPC) */ /* compiles the instruction "addi 0, 0, n" as li 0, n */ ); return result; } inline size_t Size() const { return oc; } #endif private: // don't change order! VTYPE size_t ic; // input (push) count VTYPE Cell *top; // top of the stack VTYPE size_t oc; // output (pop) count #ifdef __POWERPC__ size_t unused[5]; // lifo size must be at least 32 bytes // to avoid livelock in multiprocessor #endif }; class FLEXT_SHARE Fifo { public: void Init() { in.Init(); out.Init(); } inline size_t Size() const { return in.Size()+out.Size(); } inline void Put(Cell *cl) { in.Push(cl); } Cell *Get() { Cell *v1 = out.Pop(); if(!v1) { v1 = in.Pop(); if(v1) for(Cell *v2; (v2 = in.Pop()) != NULL; v1 = v2) out.Push(v1); } return v1; } Cell *Avail() { Cell *v1 = out.Avail(); if(v1) return v1; else { for(Cell *v2; (v2 = in.Pop()) != NULL; ) out.Push(v2); return out.Avail(); } } Cell *Clear() { Cell *first = Get(); if(!first) return NULL; Cell *next,*cur = first; while((next = Get()) != NULL) { cur->link = next; cur = next; } cur->link = NULL; Init(); return first; } Lifo in,out; }; #endif Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** flsupport.h 12 Feb 2005 04:56:09 -0000 1.78 --- flsupport.h 26 Feb 2005 04:56:23 -0000 1.79 *************** *** 139,143 **** //! Flext version string ! static const char *VersionStr(); // --- buffer/array stuff ----------------------------------------- --- 139,143 ---- //! Flext version string ! static const char *VersionStr(); // --- buffer/array stuff -----------------------------------------

1 0

externals/grill/flext flext.vcproj,1.39,1.40
by Thomas Grill 26 Feb '05

26 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14844 Modified Files: flext.vcproj Log Message: - fixed typos and 64-bit compatibility - conform to idle callback functionality in devel_0_38 new lock-free lifo and fifo Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** flext.vcproj 19 Jan 2005 04:57:14 -0000 1.39 --- flext.vcproj 26 Feb 2005 04:56:19 -0000 1.40 *************** *** 3312,3315 **** --- 3312,3318 ---- </File> <File + RelativePath=".\source\flcontainers.h"> + </File> + <File RelativePath=".\source\flmap.h"> </File>

1 0

externals/ggee/control getdir.c,NONE,1.1
by Guenter Geiger 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/ggee/control In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17390/control Added Files: getdir.c Log Message: added getdir and threw out g_canvas from places where it is not needed --- NEW FILE: getdir.c --- /* (C) 2005 Guenter Geiger */ #include "m_pd.h" // HACK !!! struct _glist { t_object gl_obj; /* header in case we're a glist */ t_gobj *gl_list; /* the actual data */ struct _gstub *gl_stub; /* safe pointer handler */ int gl_valid; /* incremented when pointers might be stale */ struct _glist *gl_owner; /* parent glist, supercanvas, or 0 if none */ }; // END HACK !!! typedef struct getdir { t_object x_ob; t_canvas * x_canvas; t_outlet* x_outlet; int x_level; } t_getdir; static void getdir_bang(t_getdir *x) { int i = x->x_level; t_canvas* last = x->x_canvas; do { i--; last = last->gl_owner; } while (last && i); outlet_symbol(x->x_outlet,canvas_getdir(last)); } t_class *getdir_class; static void *getdir_new(t_floatarg level) { t_getdir *x = (t_getdir *)pd_new(getdir_class); x->x_canvas = canvas_getcurrent(); x->x_outlet = outlet_new(&x->x_ob, &s_); x->x_level = level; return (void *)x; } void getdir_setup(void) { getdir_class = class_new(gensym("getdir"), (t_newmethod)getdir_new, 0, sizeof(t_getdir), 0, A_DEFFLOAT,0); class_addbang(getdir_class, getdir_bang); }

1 0

externals/ggee/signal pipewrite~.c,1.2,1.3 sfwrite~.c,1.2,1.3
by Guenter Geiger 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/ggee/signal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17390/signal Modified Files: pipewrite~.c sfwrite~.c Log Message: added getdir and threw out g_canvas from places where it is not needed Index: sfwrite~.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/signal/sfwrite~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sfwrite~.c 10 Jun 2003 16:16:34 -0000 1.2 --- sfwrite~.c 24 Feb 2005 15:21:56 -0000 1.3 *************** *** 3,7 **** #include <m_pd.h> - #include "g_canvas.h" #ifdef NT #pragma warning( disable : 4244 ) --- 3,6 ---- Index: pipewrite~.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/signal/pipewrite~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pipewrite~.c 24 Feb 2005 14:55:29 -0000 1.2 --- pipewrite~.c 24 Feb 2005 15:21:56 -0000 1.3 *************** *** 3,7 **** #include <m_pd.h> - #include "g_canvas.h" #ifdef NT #pragma warning( disable : 4244 ) --- 3,6 ----

1 0

externals/ggee/signal pipewrite~.c,1.1.1.1,1.2
by Guenter Geiger 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/ggee/signal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9726/signal Modified Files: pipewrite~.c Log Message: remove leftover Index: pipewrite~.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/signal/pipewrite~.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pipewrite~.c 17 Jun 2002 10:13:56 -0000 1.1.1.1 --- pipewrite~.c 24 Feb 2005 14:55:29 -0000 1.2 *************** *** 2,7 **** ! #include "m_imp.h" ! //#include <m_pd.h> #include "g_canvas.h" #ifdef NT --- 2,6 ---- ! #include <m_pd.h> #include "g_canvas.h" #ifdef NT

1 0

externals/ggee KNOWNBUGS,1.1.1.1,NONE build.bat,1.1.1.1,NONE clean.bat,1.1.1.1,NONE install,1.1.1.1,NONE install-sh,1.1.1.1,NONE version,1.1.1.1,NONE
by Guenter Geiger 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/ggee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9726 Removed Files: KNOWNBUGS build.bat clean.bat install install-sh version Log Message: remove leftover --- KNOWNBUGS DELETED --- --- version DELETED --- --- install DELETED --- --- build.bat DELETED --- --- clean.bat DELETED --- --- install-sh DELETED ---

1 0

externals/ggee/gui slider.c,1.10,1.11 sliderh.c,1.4,1.5
by Guenter Geiger 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/ggee/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9726/gui Modified Files: slider.c sliderh.c Log Message: remove leftover Index: sliderh.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/gui/sliderh.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sliderh.c 6 Feb 2004 17:03:34 -0000 1.4 --- sliderh.c 24 Feb 2005 14:55:29 -0000 1.5 *************** *** 19,34 **** t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("sliderh"),x->x_max,x->x_min,x->x_width); binbuf_addv(b, ";"); } ! static void *sliderh_new(t_floatarg max, t_floatarg min,t_floatarg h) { t_fatom *x = (t_fatom *)pd_new(sliderh_class); x->x_type = gensym("hslider"); ! return fatom_new(x,max,min,h,&s_); } --- 19,34 ---- t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("sliderh"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } ! static void *sliderh_new(t_symbol* s, int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(sliderh_class); x->x_type = gensym("hslider"); ! return fatom_new(x,argc,argv); } *************** *** 39,43 **** ! void sliderh_setup() { sliderh_class = class_new(gensym("sliderh"), (t_newmethod)sliderh_new, 0, sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); --- 39,43 ---- ! void sliderh_setup(void) { sliderh_class = class_new(gensym("sliderh"), (t_newmethod)sliderh_new, 0, sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); Index: slider.c =================================================================== RCS file: /cvsroot/pure-data/externals/ggee/gui/slider.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** slider.c 25 Jul 2004 13:45:55 -0000 1.10 --- slider.c 24 Feb 2005 14:55:29 -0000 1.11 *************** *** 10,25 **** t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("slider"),x->x_max,x->x_min,x->x_width); binbuf_addv(b, ";"); } ! static void *slider_new(t_floatarg max, t_floatarg min, t_floatarg h) { t_fatom *x = (t_fatom *)pd_new(slider_class); x->x_type = gensym("vslider"); ! return fatom_new(x,max,min,h,&s_); } --- 10,25 ---- t_fatom *x = (t_fatom *)z; ! binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , ! gensym("slider"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } ! static void *slider_new(t_symbol* s,t_int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(slider_class); x->x_type = gensym("vslider"); ! return fatom_new(x,argc,argv); } *************** *** 28,52 **** ! void slider_setup() { slider_class = class_new(gensym("slider"), (t_newmethod)slider_new, 0, ! sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); ! slider_widgetbehavior.w_getrectfn = fatom_getrect, ! slider_widgetbehavior.w_displacefn = fatom_displace, ! slider_widgetbehavior.w_selectfn = fatom_select, ! slider_widgetbehavior.w_activatefn = fatom_activate, ! slider_widgetbehavior.w_deletefn = fatom_delete, ! slider_widgetbehavior.w_visfn= fatom_vis, ! #if PD_MINOR_VERSION < 37 ! slider_widgetbehavior.w_savefn = slider_save, ! slider_widgetbehavior.w_propertiesfn = NULL, ! #endif ! slider_widgetbehavior.w_clickfn = NULL, ! ! fatom_setup_common(slider_class); class_setwidget(slider_class,&slider_widgetbehavior); ! #if PD_MINOR_VERSION >= 37 class_setsavefn(slider_class,&slider_save); - #endif class_setpropertiesfn(slider_class,&fatom_properties); } --- 28,53 ---- ! void slider_setup(void) { slider_class = class_new(gensym("slider"), (t_newmethod)slider_new, 0, ! sizeof(t_fatom),0,A_GIMME,0); ! slider_widgetbehavior.w_getrectfn = fatom_getrect; ! slider_widgetbehavior.w_displacefn = fatom_displace; ! slider_widgetbehavior.w_selectfn = fatom_select; ! slider_widgetbehavior.w_activatefn = fatom_activate; ! slider_widgetbehavior.w_deletefn = fatom_delete; ! slider_widgetbehavior.w_visfn= fatom_vis; ! slider_widgetbehavior.w_clickfn = NULL; ! ! fatom_setup_common(slider_class); class_setwidget(slider_class,&slider_widgetbehavior); ! ! #if PD_MINOR_VERSION < 37 ! slider_widgetbehavior.w_savefn = slider_save; ! slider_widgetbehavior.w_propertiesfn = NULL; ! #else class_setsavefn(slider_class,&slider_save); class_setpropertiesfn(slider_class,&fatom_properties); + #endif + }

1 0

externals/grill/flext/buildsys/win/pd bmake-bcc-shlib.inc,NONE,1.1 gnumake-cygwin-shlib.inc,NONE,1.1 gnumake-mingw-shlib.inc,NONE,1.1 nmake-msvc-shlib.inc,NONE,1.1
by Thomas Grill 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/win/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26459/buildsys/win/pd Added Files: bmake-bcc-shlib.inc gnumake-cygwin-shlib.inc gnumake-mingw-shlib.inc nmake-msvc-shlib.inc Log Message: added shared library build facility for Windows --- NEW FILE: gnumake-mingw-shlib.inc --- EXT=dll --- NEW FILE: nmake-msvc-shlib.inc --- EXT=dll --- NEW FILE: bmake-bcc-shlib.inc --- EXT=dll --- NEW FILE: gnumake-cygwin-shlib.inc --- EXT=dll

1 0

externals/grill/flext/buildsys/win nmake-msvc-shlib.inc,NONE,1.1 nmake-msvc.inc,1.5,1.6
by Thomas Grill 24 Feb '05

24 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26459/buildsys/win Modified Files: nmake-msvc.inc Added Files: nmake-msvc-shlib.inc Log Message: added shared library build facility for Windows Index: nmake-msvc.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/win/nmake-msvc.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nmake-msvc.inc 26 Jan 2005 05:01:20 -0000 1.5 --- nmake-msvc.inc 24 Feb 2005 04:56:24 -0000 1.6 *************** *** 22,27 **** CFLAGS=$(CFLAGS) /LD ! # enable exception handling ! CFLAGS=$(CFLAGS) /EHsc # no banner --- 22,27 ---- CFLAGS=$(CFLAGS) /LD ! # enable exception handling and RTTI ! CFLAGS=$(CFLAGS) /EHsc /GR # no banner --- NEW FILE: nmake-msvc-shlib.inc --- # build class specific settings INCPATH=$(INCPATH) /I$(FLEXTINC) LIBPATH=$(LIBPATH) /LIBPATH:$(FLEXTLIB) LIBS=$(LIBS) $(FLEXTNAME).lib ############################################## # default target _build_: $(TARGET) $(OUTPATH): if not exist $@ mkdir $@ > nul $(TARGETPATH): $(OUTPATH) if not exist $@ mkdir $@ > nul {$(SRCDIR)}.cpp{}.obj: cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ {$(SRCDIR)}.c{}.obj: cl /c $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(TARGETPATH)\$@ $(TARGET):: $(TARGETPATH) $(TARGET):: $(OBJS) @cd $(TARGETPATH) link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /OUT:$(@F) @cd ..\.. ############################################## # remove build _clean_: -del /q $(TARGETPATH)\*.* > nul -rmdir /q $(TARGETPATH) > nul ############################################## _install_: @if not exist $(FLEXTSHLIB) mkdir $(FLEXTSHLIB) > nul copy $(TARGET) $(FLEXTSHLIB) > nul # copy import library copy $(TARGET:.dll=.lib) $(FLEXTSHLIB) > nul

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs February 2005