Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

packages/win32_inno/noncvs - New directory
by Hans-Christoph Steiner 24 Mar '04

24 Mar '04

Update of /cvsroot/pure-data/packages/win32_inno/noncvs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27994/noncvs Log Message: Directory /cvsroot/pure-data/packages/win32_inno/noncvs added to the repository

1 0

pd/darwin_pkg - New directory
by Hans-Christoph Steiner 24 Mar '04

24 Mar '04

Update of /cvsroot/pure-data/pd/darwin_pkg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12089/darwin_pkg Log Message: Directory /cvsroot/pure-data/pd/darwin_pkg added to the repository --> Using per-directory sticky tag `devel_0_37'

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.20,1.1.1.4.2.7.4.21
by Mathieu Bouchard 24 Mar '04

24 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21345 Modified Files: Tag: impd_0_37 u_main.tk Log Message: changing menu font and changing the look of in/out parts of mainwindow Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.20 retrieving revision 1.1.1.4.2.7.4.21 diff -C2 -d -r1.1.1.4.2.7.4.20 -r1.1.1.4.2.7.4.21 *** u_main.tk 23 Mar 2004 02:17:42 -0000 1.1.1.4.2.7.4.20 --- u_main.tk 24 Mar 2004 04:03:01 -0000 1.1.1.4.2.7.4.21 *************** *** 11,14 **** --- 11,19 ---- #option add *backgroundPixmap /usr/share/themes/BrushedMetalBlue/gtk/brushed-dark.xpm widgetDefault #option add *backgroundPixmap /home/matju/brushed-dark.gif widgetDefault + option add *Menu*font {helvetica 9} + #option add *background #000000 + #option add *foreground #ffffff + option add *Menu*borderWidth 1 + option add *Menu*pady 42 option add *Button*borderWidth 1 option add *Checkbutton*borderWidth 1 *************** *** 98,102 **** -variable ctrls_audio_on -anchor w \ -command {pd "pd dsp $ctrls_audio_on ;"} - checkbutton .controls.switches.meterbutton -text "Peak Meters" \ -variable ctrls_meter_on -anchor w \ --- 103,106 ---- *************** *** 107,116 **** frame .controls.inout foreach z {in out} { ! frame .controls.inout.$z ! label .controls.inout.$z.label -text [string toupper $z] ! entry .controls.inout.$z.level -textvariable ctrls_${z}level -width 3 ! button .controls.inout.$z.clip -text "CLIP" -state disabled ! pack .controls.inout.$z.label .controls.inout.$z.level \ ! .controls.inout.$z.clip -side top -pady 2 } --- 111,125 ---- frame .controls.inout foreach z {in out} { ! set f .controls.inout.$z ! frame $f ! frame $f.1 -borderwidth 2 -relief ridge ! frame $f.1.pad -height 5 ! entry $f.1.level -textvariable ctrls_${z}level -width 3 ! button $f.1.clip -text "Clip" -state disabled ! pack $f.1.pad $f.1.level $f.1.clip -side top -pady 4 -padx 4 ! pack $f.1 -padx 4 -pady 4 ! label $f.2 -text [string toupper $z] ! place $f.2 -x 14 -y -4 ! pack $f -side left -pady 4 -padx 4 } *************** *** 118,122 **** #pack .controls.switches -side bottom -pady 12 - pack .controls.inout.in .controls.inout.out -side left -padx 6 pack .controls.inout -side left -padx 14 pack .controls.switches -side left -pady 12 --- 127,130 ----

1 0

externals/miXed/test/toxy kb.wid,1.3,1.4 setup.wid,1.2,1.3 tot-query.pd,1.1,1.2
by Krzysztof Czaja 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/miXed/test/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662/test/toxy Modified Files: kb.wid setup.wid tot-query.pd Log Message: toxy alpha9 Index: setup.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/setup.wid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setup.wid 16 Mar 2004 12:13:54 -0000 1.2 --- setup.wid 23 Mar 2004 12:07:22 -0000 1.3 *************** *** 99,104 **** set needtraces 0 } else { ! # set needtraces 1 ! set needtraces 0 } --- 99,103 ---- set needtraces 0 } else { ! set needtraces 1 } Index: tot-query.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/tot-query.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tot-query.pd 24 Sep 2003 10:46:19 -0000 1.1 --- tot-query.pd 23 Mar 2004 12:07:22 -0000 1.2 *************** *** 1,3 **** ! #N canvas 421 109 778 551 12; #X msg 21 8 symbol pinecone; #X obj 455 142 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 --- 1,3 ---- ! #N canvas 210 60 778 551 12; #X msg 21 8 symbol pinecone; #X obj 455 142 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 *************** *** 16,22 **** #X msg 21 44 tot global ans .: regsub cone \$1 apple ans \, query global ans .: concat set $ans; - #X msg 60 369 tot global ch .: set ch [open ~/.pdrc] \, query global - ch .: concat set [read $ch] \, tot global ch .: close $ch .: unset - ch; #X msg 199 266 tot global txt ch .: set txt [gets $ch] \, query global txt .: concat set $txt; --- 16,19 ---- *************** *** 42,62 **** #X obj 67 238 tot .; #X msg 67 202 tot eval .< [global ch .: info exists ch] .>; #X msg 21 502; #X connect 0 0 11 0; #X connect 1 0 3 0; #X connect 2 0 11 0; ! #X connect 3 0 17 0; #X connect 3 1 6 0; #X connect 4 0 7 0; #X connect 4 1 6 0; ! #X connect 6 0 13 0; #X connect 7 0 5 0; ! #X connect 8 0 15 0; ! #X connect 9 0 15 0; ! #X connect 10 0 15 0; ! #X connect 11 0 15 0; ! #X connect 12 0 15 0; ! #X connect 13 0 15 0; ! #X connect 15 0 18 0; ! #X connect 16 1 4 0; ! #X connect 17 0 16 0; --- 39,61 ---- #X obj 67 238 tot .; #X msg 67 202 tot eval .< [global ch .: info exists ch] .>; + #X msg 54 376 tot set ::ch [open ~/.pdrc] \, query concat set [read + $::ch] \, after 0 .(tot close $::ch .: unset ::ch.); #X msg 21 502; #X connect 0 0 11 0; #X connect 1 0 3 0; #X connect 2 0 11 0; ! #X connect 3 0 16 0; #X connect 3 1 6 0; #X connect 4 0 7 0; #X connect 4 1 6 0; ! #X connect 6 0 12 0; #X connect 7 0 5 0; ! #X connect 8 0 14 0; ! #X connect 9 0 14 0; ! #X connect 10 0 14 0; ! #X connect 11 0 14 0; ! #X connect 12 0 14 0; ! #X connect 14 0 18 0; ! #X connect 15 1 4 0; ! #X connect 16 0 15 0; ! #X connect 17 0 14 0; Index: kb.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/kb.wid,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb.wid 16 Mar 2004 12:13:54 -0000 1.3 --- kb.wid 23 Mar 2004 12:07:22 -0000 1.4 *************** *** 1,3 **** --- 1,5 ---- proc ::toxy::kb {path target remote noctaves size} { + # guard against BadAlloc crashes + if {$size > 10} {set size 10} set lft [expr {round(5 * $size)}] set top [expr {round(5 * $size)}]

1 0

externals/miXed/toxy Makefile,1.5,1.6 Makefile.sources,1.3,1.4 build_counter,1.7,1.8
by Krzysztof Czaja 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662/toxy Modified Files: Makefile Makefile.sources build_counter Log Message: toxy alpha9 Index: Makefile.sources =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/Makefile.sources,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.sources 9 Mar 2004 12:41:22 -0000 1.3 --- Makefile.sources 23 Mar 2004 12:07:22 -0000 1.4 *************** *** 1,3 **** - # this conditional will make sense LATER, when TCL_LIB is ./configured ifdef TCL_LIB TYPES = TOT TOW WIDGET PLUSTOT --- 1,2 ---- Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 16 Mar 2004 12:13:54 -0000 1.5 --- Makefile 23 Mar 2004 12:07:22 -0000 1.6 *************** *** 16,20 **** -e 's/^.*$$/\"&\\n\"/' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ ! echo ERROR: quoteinitializer failed... $(WIQFILE) removed ; \ rm -f $(WIQFILE) ; fi include $(ROOT_DIR)/Makefile.common --- 16,20 ---- -e 's/^.*$$/\"&\\n\"/' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ ! echo ERROR: transfer failed... $(WIQFILE) removed ; \ rm -f $(WIQFILE) ; fi include $(ROOT_DIR)/Makefile.common Index: build_counter =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/build_counter,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build_counter 16 Mar 2004 12:13:54 -0000 1.7 --- build_counter 23 Mar 2004 12:07:22 -0000 1.8 *************** *** 1,3 **** #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 8 --- 1,3 ---- #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 9

1 0

externals/miXed/shared/unstable forky.h,1.5,1.6
by Krzysztof Czaja 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/miXed/shared/unstable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662/shared/unstable Modified Files: forky.h Log Message: toxy alpha9 Index: forky.h =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/unstable/forky.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** forky.h 19 Sep 2003 12:19:32 -0000 1.5 --- forky.h 23 Mar 2004 12:07:22 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- #define FORKY_WIDGETPADDING #else + #warning You are entering a back-compatibility mode. Delete this warning from forky.h to proceed. #define FORKY_WIDGETPADDING 0,0 #endif

1 0

externals/miXed Makefile.common,1.18,1.19
by Krzysztof Czaja 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/miXed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662 Modified Files: Makefile.common Log Message: toxy alpha9 Index: Makefile.common =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.common 16 Mar 2004 12:13:53 -0000 1.18 --- Makefile.common 23 Mar 2004 12:07:21 -0000 1.19 *************** *** 2,7 **** PD_DIR = $(ROOT_DIR)/../../pd/src ! # FIXME ./configure should set this (or not) before "include Makefile.sources" ! TCL_LIB = -l`grep -osm1 'tcl8\.[345]' $(PD_DIR)/makefile` OS_NAME = $(shell uname -s) --- 2,10 ---- PD_DIR = $(ROOT_DIR)/../../pd/src ! # remove this restriction LATER, when TCL_LIB is ./configured ! ifeq ($(shell whoami),krzYszcz) ! # TCL_LIB should be set (or not) before "include Makefile.sources" ! TCL_LIB = -l$(shell grep -osm1 'tcl8\.[345]' $(PD_DIR)/makefile) ! endif OS_NAME = $(shell uname -s)

1 0

externals/miXed/shared/toxy scriptlet.c,1.8,1.9
by Krzysztof Czaja 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/miXed/shared/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4662/shared/toxy Modified Files: scriptlet.c Log Message: toxy alpha9 Index: scriptlet.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/toxy/scriptlet.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** scriptlet.c 16 Mar 2004 12:13:53 -0000 1.8 --- scriptlet.c 23 Mar 2004 12:07:21 -0000 1.9 *************** *** 423,436 **** char buf[MAXPDSTRING]; char *tail = sp->s_tail; strcpy(tail, "]}}\n"); sys_gui(sp->s_buffer); *tail = 0; ! /* Could not find anything more flexible, than blocking while waiting ! for ::toxy::query to complete. The model case is a Tk dialog ! hanging over the arrival of new queries. LATER probably use ! a thread-safe replacement of the 'pd' command in order to prevent ! competing tcl threads from corrupting the gui-to-pd stream. */ ! sprintf(buf, "after 0 {::toxy::query}\nvwait ::toxy::reply\n\ ! pd [concat %s _rp $::toxy::reply \\;]\n", sp->s_rptarget->s_name); sys_gui(buf); } --- 423,446 ---- char buf[MAXPDSTRING]; char *tail = sp->s_tail; + /* Could not find any other way, than to postpone processing of the + query, after everything which might have been glued to our tail, + is evaluated. Otherwise, any command arriving later, during + blocking of the query (e.g. in a Tk dialog), would be evaluated + prior to our tail, via Tcl_DoOneEvent(). We postpone also the + setup step (defining the query proc), in order to be able to + handle several queries at once. All this is far from ideal -- + the sequence "query this, tot that", is swapped, unless written + as "query this, tot after 0 .(that.)", which is going to cause + much confusion... LATER revisit. Do not forget, that since + pd_readsocket() is not reentrant, sys_gui()d commands should never + enter event loop directly by blocking on a dialog, vwait, etc., + because the pd_readsocket handler is event-driven on unix. */ + sys_gui("after 0 {\n"); strcpy(tail, "]}}\n"); sys_gui(sp->s_buffer); *tail = 0; ! sprintf(buf, "\ ! trace add variable ::toxy::reply write \"::toxy::doreply %s\"\n\ ! ::toxy::query}\n", sp->s_rptarget->s_name); sys_gui(buf); } *************** *** 762,765 **** --- 772,779 ---- { sys_gui("image create bitmap ::toxy::img::empty -data {}\n"); + sys_gui("proc ::toxy::doreply {target vname vndx op} {\n"); + sys_gui(" pd [concat $target _rp $::toxy::reply \\;]\n"); + sys_gui(" unset ::toxy::reply\n"); + sys_gui("}\n"); } sp->s_owner = owner;

1 0

externals/grill/xsample/source groove.cpp,1.23,1.24 main.cpp,1.15,1.16 main.h,1.26,1.27
by Thomas Grill 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/grill/xsample/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8085/source Modified Files: groove.cpp main.cpp main.h Log Message: "" Index: groove.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** groove.cpp 8 Feb 2004 03:40:47 -0000 1.23 --- groove.cpp 23 Mar 2004 03:27:37 -0000 1.24 *************** *** 40,44 **** virtual V m_pos(F pos); ! V m_posmod(F pos); virtual V m_all(); virtual V m_min(F mn); --- 40,44 ---- virtual V m_pos(F pos); ! inline V m_posmod(F pos) { setposmod(pos?pos/s2u:0); } // motivated by Tim Blechmann virtual V m_all(); virtual V m_min(F mn); *************** *** 67,74 **** F _xzone,xzone,xsymm; ! I znsmin,znsmax; I xshape; F xshparam; ! F znmin,znmax; BL xkeep; S **znbuf; --- 67,74 ---- F _xzone,xzone,xsymm; ! L znsmin,znsmax; I xshape; F xshparam; ! D znmin,znmax; BL xkeep; S **znbuf; *************** *** 79,83 **** inline V outputmax() { ToOutFloat(outchns+2,curmax*s2u); } ! inline V setpos(F pos) { if(pos < znsmin) curpos = znsmin; --- 79,83 ---- inline V outputmax() { ToOutFloat(outchns+2,curmax*s2u); } ! inline V setpos(D pos) { if(pos < znsmin) curpos = znsmin; *************** *** 86,92 **** } ! inline V setposmod(F pos) { ! F p = pos-znsmin; if(p >= 0) curpos = znsmin+fmod(p,znsmax-znsmin); else curpos = znsmax+fmod(p,znsmax-znsmin); --- 86,92 ---- } ! inline V setposmod(D pos) { ! D p = pos-znsmin; if(p >= 0) curpos = znsmin+fmod(p,znsmax-znsmin); else curpos = znsmax+fmod(p,znsmax-znsmin); *************** *** 219,223 **** znbuf = new S *[outchns]; for(I i = 0; i < outchns; ++i) znbuf[i] = new S[0]; ! znpos = new S[0]; // don't know vector size yet -> m_dsp znidx = new S[0]; znmul = new S[XZONE_TABLE+1]; --- 219,223 ---- znbuf = new S *[outchns]; for(I i = 0; i < outchns; ++i) znbuf[i] = new S[0]; ! znpos = new S[0]; // don't know vector size yet -> wait for m_dsp znidx = new S[0]; znmul = new S[XZONE_TABLE+1]; *************** *** 249,255 **** V xgroove::m_units(xs_unit mode) { ! xsample::m_units(mode); ! m_sclmode(); outputmin(); outputmax(); --- 249,255 ---- V xgroove::m_units(xs_unit mode) { ! xsample::m_units(mode); // calls bufchk() ! m_sclmode(); // calls bufchk() again.... \todo optimize that!! outputmin(); outputmax(); *************** *** 277,286 **** } - // motivated by Tim Blechmann - V xgroove::m_posmod(F pos) - { - setposmod(pos?pos/s2u:0); - } - V xgroove::m_all() { --- 277,280 ---- *************** *** 390,394 **** znmin = znsmin+xzone*xsymm,znmax = znsmax+xzone*(xsymm-1); // extra space at beginning and end ! F o1 = znmin-xzone,o2 = buf->Frames()-(znmax+xzone); if(o1 < 0 || o2 < 0) { // or (o1*o2 < 0) --- 384,388 ---- znmin = znsmin+xzone*xsymm,znmax = znsmax+xzone*(xsymm-1); // extra space at beginning and end ! D o1 = znmin-xzone,o2 = buf->Frames()-(znmax+xzone); if(o1 < 0 || o2 < 0) { // or (o1*o2 < 0) *************** *** 622,627 **** BL lpbang = false; ! const F xz = xzone,lmin = znmin,lmax = znmax,lsh = lmax+xz-lmin; ! const F xf = (F)XZONE_TABLE/xz; // adapt the playing bounds to the current cross-fade zone --- 616,621 ---- BL lpbang = false; ! const F xz = xzone,xf = (F)XZONE_TABLE/xz; ! const D lmin = znmin,lmax = znmax,lsh = lmax+xz-lmin; // adapt the playing bounds to the current cross-fade zone *************** *** 658,662 **** if(o < lmin) { // in early cross-fade zone ! register F inp = xz-(lmin-o); // 0 <= inp < xz znidx[i] = inp*xf; znpos[i] = lmax+inp; --- 652,656 ---- if(o < lmin) { // in early cross-fade zone ! register F inp = xz-(F)(lmin-o); // 0 <= inp < xz znidx[i] = inp*xf; znpos[i] = lmax+inp; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main.cpp 8 Feb 2004 03:40:47 -0000 1.15 --- main.cpp 23 Mar 2004 03:27:37 -0000 1.16 *************** *** 102,111 **** BL xsample::m_refresh() { - // bufchk(); - BL ret; if(buf->Set()) { s_dsp(); ret = true; } // channel count may have changed else ret = false; m_min((F)curmin*s2u); // also checks pos m_max((F)curmax*s2u); // also checks pos --- 102,110 ---- BL xsample::m_refresh() { BL ret; if(buf->Set()) { s_dsp(); ret = true; } // channel count may have changed else ret = false; + // realize positions... 2 times bufchk()!! m_min((F)curmin*s2u); // also checks pos m_max((F)curmax*s2u); // also checks pos *************** *** 116,125 **** BL xsample::m_reset() { - // bufchk(); - BL ret; if(buf->Set()) { s_dsp(); ret = true; } // channel count may have changed else ret = false; m_units(); m_sclmode(); --- 115,123 ---- 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(); *************** *** 137,183 **** V xsample::m_units(xs_unit mode) { - if(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) - if(mode != xsu__) unitmode = mode; ! switch(unitmode) { ! case xsu_sample: // samples ! s2u = 1; ! break; ! case xsu_buffer: // buffer size ! s2u = 1.f/buf->Frames(); ! 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(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) - 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 = buf->Frames()?1.f/buf->Frames():0; ! break; ! case 3: // unity between recmin and recmax ! // sclmin = curmin; sclmul = curlen?1.f/curlen:0; ! sclmin = curmin; sclmul = curmin != curmax?1.f/(curmax-curmin):0; ! break; ! default: ! post("%s: Unknown scale mode",thisName()); ! } } --- 135,180 ---- V xsample::m_units(xs_unit mode) { if(mode != xsu__) unitmode = mode; ! ! if(bufchk()) ! switch(unitmode) { ! case xsu_sample: // samples ! s2u = 1; ! break; ! case xsu_buffer: // buffer size ! s2u = 1.f/buf->Frames(); ! 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; ! ! if(bufchk()) ! 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 = 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()); ! } } *************** *** 190,194 **** else if(mn > curmax) mn = (F)curmax; curmin = (I)(mn+.5); - // curlen = curmax-curmin; m_sclmode(); --- 187,190 ---- *************** *** 203,207 **** else if(mx < curmin) mx = (F)curmin; curmax = (I)(mx+.5); - // curlen = curmax-curmin; m_sclmode(); --- 199,202 ---- *************** *** 212,216 **** if(!bufchk()) return; // if invalid do nothing (actually, it should be delayed) - // curlen = (curmax = buf->Frames())-(curmin = 0); curmin = 0; curmax = buf->Frames(); m_sclmode(); --- 207,210 ---- Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** main.h 8 Feb 2004 03:40:47 -0000 1.26 --- main.h 23 Mar 2004 03:27:37 -0000 1.27 *************** *** 13,17 **** ! #define XSAMPLE_VERSION "0.3.0pre17" --- 13,17 ---- ! #define XSAMPLE_VERSION "0.3.0pre18"

1 0

externals/grill/flext/source flsupport.cpp,1.32,1.33
by Thomas Grill 23 Mar '04

23 Mar '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7283/source Modified Files: flsupport.cpp Log Message: "" Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** flsupport.cpp 6 Mar 2004 03:25:48 -0000 1.32 --- flsupport.cpp 23 Mar 2004 03:22:38 -0000 1.33 *************** *** 158,161 **** --- 158,163 ---- } + FLEXT_ASSERT(blk); + *(size_t *)blk = bytes; return blk+sizeof(size_t); *************** *** 164,167 **** --- 166,171 ---- void flext_root::operator delete(void *blk) { + FLEXT_ASSERT(blk); + char *ori = (char *)blk-sizeof(size_t); size_t bytes = *(size_t *)ori; *************** *** 214,217 **** --- 218,222 ---- SYSUNLOCK(); } + FLEXT_ASSERT(blk); char *ablk = reinterpret_cast<char *>((reinterpret_cast<unsigned long>(blk)+ovh+alignovh) & ~alignovh); *************** *** 223,226 **** --- 228,233 ---- void flext_root::FreeAligned(void *blk) { + FLEXT_ASSERT(blk); + char *ori = *(char **)((char *)blk-sizeof(size_t)-sizeof(char *)); size_t bytes = *(size_t *)((char *)blk-sizeof(size_t));

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
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 March 2004