Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/portaudio/pablio ringbuffer.c,1.2,1.3
by Miller Puckette 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/portaudio/pablio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13336 Added Files: ringbuffer.c Log Message: Oops, added ringbuffer.c from portaudio.... --- NEW FILE: ringbuffer.c --- /* * $Id: ringbuffer.c,v 1.3 2006/08/07 23:08:10 millerpuckette Exp $ * ringbuffer.c * Ring Buffer utility.. * * Author: Phil Burk, http://www.softsynth.com * * This program uses the PortAudio Portable Audio Library. * For more information see: http://www.audiomulch.com/portaudio/ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files * (the "Software"), to deal in the Software without restriction, * including without limitation the rights to use, copy, modify, merge, * publish, distribute, sublicense, and/or sell copies of the Software, * and to permit persons to whom the Software is furnished to do so, * subject to the following conditions: * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * Any person wishing to distribute modifications to the Software is * requested to send the modifications to the original developer so that * they can be incorporated into the canonical version. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ #include <stdio.h> #include <stdlib.h> #include <math.h> #include "ringbuffer.h" #include <string.h> /*************************************************************************** * Initialize FIFO. * numBytes must be power of 2, returns -1 if not. */ long RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr ) { if( ((numBytes-1) & numBytes) != 0) return -1; /* Not Power of two. */ rbuf->bufferSize = numBytes; rbuf->buffer = (char *)dataPtr; RingBuffer_Flush( rbuf ); rbuf->bigMask = (numBytes*2)-1; rbuf->smallMask = (numBytes)-1; return 0; } /*************************************************************************** ** Return number of bytes available for reading. */ long RingBuffer_GetReadAvailable( RingBuffer *rbuf ) { return ( (rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask ); } /*************************************************************************** ** Return number of bytes available for writing. */ long RingBuffer_GetWriteAvailable( RingBuffer *rbuf ) { return ( rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf)); } /*************************************************************************** ** Clear buffer. Should only be called when buffer is NOT being read. */ void RingBuffer_Flush( RingBuffer *rbuf ) { rbuf->writeIndex = rbuf->readIndex = 0; } /*************************************************************************** ** Get address of region(s) to which we can write data. ** If the region is contiguous, size2 will be zero. ** If non-contiguous, size2 will be the size of second region. ** Returns room available to be written or numBytes, whichever is smaller. */ long RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2 ) { long index; long available = RingBuffer_GetWriteAvailable( rbuf ); if( numBytes > available ) numBytes = available; /* Check to see if write is not contiguous. */ index = rbuf->writeIndex & rbuf->smallMask; if( (index + numBytes) > rbuf->bufferSize ) { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = firstHalf; *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; } else { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; *dataPtr2 = NULL; *sizePtr2 = 0; } return numBytes; } /*************************************************************************** */ long RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes ) { return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask; } /*************************************************************************** ** Get address of region(s) from which we can read data. ** If the region is contiguous, size2 will be zero. ** If non-contiguous, size2 will be the size of second region. ** Returns room available to be written or numBytes, whichever is smaller. */ long RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes, void **dataPtr1, long *sizePtr1, void **dataPtr2, long *sizePtr2 ) { long index; long available = RingBuffer_GetReadAvailable( rbuf ); if( numBytes > available ) numBytes = available; /* Check to see if read is not contiguous. */ index = rbuf->readIndex & rbuf->smallMask; if( (index + numBytes) > rbuf->bufferSize ) { /* Write data in two blocks that wrap the buffer. */ long firstHalf = rbuf->bufferSize - index; *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = firstHalf; *dataPtr2 = &rbuf->buffer[0]; *sizePtr2 = numBytes - firstHalf; } else { *dataPtr1 = &rbuf->buffer[index]; *sizePtr1 = numBytes; *dataPtr2 = NULL; *sizePtr2 = 0; } return numBytes; } /*************************************************************************** */ long RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes ) { return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask; } /*************************************************************************** ** Return bytes written. */ long RingBuffer_Write( RingBuffer *rbuf, void *data, long numBytes ) { long size1, size2, numWritten; void *data1, *data2; numWritten = RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); if( size2 > 0 ) { memcpy( data1, data, size1 ); data = ((char *)data) + size1; memcpy( data2, data, size2 ); } else { memcpy( data1, data, size1 ); } RingBuffer_AdvanceWriteIndex( rbuf, numWritten ); return numWritten; } /*************************************************************************** ** Return bytes read. */ long RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes ) { long size1, size2, numRead; void *data1, *data2; numRead = RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 ); if( size2 > 0 ) { memcpy( data, data1, size1 ); data = ((char *)data) + size1; memcpy( data, data2, size2 ); } else { memcpy( data, data1, size1 ); } RingBuffer_AdvanceReadIndex( rbuf, numRead ); return numRead; }

1 0

pd/src desire.tk,1.1.2.295,1.1.2.296
by chunlee 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16035 Modified Files: Tag: devel_0_39 desire.tk Log Message: oops, left a type in the last commit...:/ Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.295 retrieving revision 1.1.2.296 diff -C2 -d -r1.1.2.295 -r1.1.2.296 *** desire.tk 7 Aug 2006 21:42:23 -0000 1.1.2.295 --- desire.tk 7 Aug 2006 21:49:26 -0000 1.1.2.296 *************** *** 2271,2275 **** $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] set @wire_from [list $obj1 $outlet] ! if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"}s set @action wire } --- 2271,2275 ---- $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] set @wire_from [list $obj1 $outlet] ! if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"} set @action wire }

1 0

pd/src desire.tk,1.1.2.294,1.1.2.295
by chunlee 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12861 Modified Files: Tag: devel_0_39 desire.tk Log Message: first commit for the new key bindings for reconneting a wire and multiple connecting from the same outlet to inlets. there is quite some repetition of the code here, just tried to get it going first, will test more and tidy it up later. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.294 retrieving revision 1.1.2.295 diff -C2 -d -r1.1.2.294 -r1.1.2.295 *** desire.tk 7 Aug 2006 18:37:11 -0000 1.1.2.294 --- desire.tk 7 Aug 2006 21:42:23 -0000 1.1.2.295 *************** *** 1164,1167 **** --- 1164,1168 ---- set @keynav_current 0 set @keynav_next 0 + set @shift_wires {} } *************** *** 1232,1236 **** $self bind <Shift-MouseWheel> scroll x \[expr -abs(%D)/%D\] }} ! $self bind <ButtonRelease> unclick %x %y %b # keyboard --- 1233,1238 ---- $self bind <Shift-MouseWheel> scroll x \[expr -abs(%D)/%D\] }} ! $self bind <ButtonRelease> unclick %x %y %b 0 ! $self bind <Shift-ButtonRelease> unclick %x %y %b 1 # keyboard *************** *** 1252,1255 **** --- 1254,1258 ---- $self bind <Shift-Key> key %x %y %K %A 1 $self bind <KeyRelease> keyup %x %y %K %A 0 + $self bind <Shift-KeyRelease> keyup %x %y %K %A 1 $self bind <Motion> motion %x %y 0 %s $self bind <Alt-Motion> motion %x %y 4 %s *************** *** 2191,2214 **** switch $type { object { # handles the dash wire drawing mset {x1 y1 x2 y2} [$id bbox] set outs 0; set outs [$id noutlets] if {$y>=$y2-6 && $outs} { ! set out [expr int(($x-$x1)*$outs/($x2-$x1))] ! mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! set @wire_from [list $id $out] ! set @action wire ! return } # clcik on object $id clickedit $x $y $b $f $in_selection $@selection } wire { ! #if {$@selection_wire != ""} {$@selection_wire select 0} ! #set @wire_hilite $id ! if {[lsearch $@selection_wire $id] < 0} {set @selection_wire $id} ! $id selected?= 1 ! #$id select 1 } default {error BORK} --- 2194,2281 ---- switch $type { object { + puts "clicked on a object........." # handles the dash wire drawing mset {x1 y1 x2 y2} [$id bbox] set outs 0; set outs [$id noutlets] + set ins 0; set ins [$id ninlets] if {$y>=$y2-6 && $outs} { ! switch $f { ! 0 { ! set out [expr int(($x-$x1)*$outs/($x2-$x1))] ! mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! set @wire_from [list $id $out] ! set @action wire ! return } + 1 { + puts "------------here------------" + set out [expr int(($x-$x1)*$outs/($x2-$x1))] + mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] + $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] + set @wire_from [list $id $out] + if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"} + #set @shift_wires $@wire_from; puts "store::::: $@shift_wires" + set @action wire + return + } + default { + puts "......do nothing........" + } + } + } + if {$y<$y1+2 && $ins} { + switch $f { + 1 { + puts "$@shift_wires" + mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] + if {$id != ""} { + mset {x1 y1 x2 y2} [$id bbox] + set ins 0; set ins [$id ninlets] + if {$y<$y1+6 && $ins} { + set in [expr int(($x-$x1)*$ins/($x2-$x1))] + set @wire_to [list $id $in] + mset {from outlet} $@shift_wires + mset {to inlet} $@wire_to + puts "shift_wires::: $@shift_wires" + puts "from::$from outlet::$outlet to::$to inlet::$inlet" + pd .$self connect [lsearch $@children $from] $outlet \ + [lsearch $@children $to] $inlet + } + return + } + } + default {puts "do nothing....."} + } + } + # clcik on object $id clickedit $x $y $b $f $in_selection $@selection } wire { ! switch $f { ! 0 { ! if {[lsearch $@selection_wire $id] < 0} {set @selection_wire $id} ! $id selected?= 1 ! } ! 1 { ! set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] ! $id delete ! pd .$self disconnect $wire ! set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $id] [lsearch $@wires_pair $id]] ! set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] ! set obj1 [lindex $@children [lindex $wire 0]] ! set outlet [lindex $wire 1] ! mset {x1 y1 x2 y2} [$obj1 bbox] ! mset {x1 y1 x2 y2} [$c bbox ${obj1}o${outlet}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! set @wire_from [list $obj1 $outlet] ! if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"}s ! set @action wire ! } ! default { ! puts "nothing......." ! } ! } } default {error BORK} *************** *** 2230,2233 **** --- 2297,2301 ---- set @click_at [list $x $y] if {$@editmode && !($f&2)} {$self clickedit $x $y $b $f; return} + #if {$@editmode} {$self clickedit $x $y $b $f; return} mset {type id} [$self identify_target $x $y $b $f "click"] if {![llength $id]} {return} *************** *** 2239,2243 **** } ! def* Canvas unclickedit {x y b} { set c .$self.c puts "_____ unclickedit action:$@action " --- 2307,2311 ---- } ! def* Canvas unclickedit {x y b f} { set c .$self.c puts "_____ unclickedit action:$@action " *************** *** 2290,2309 **** } wire { ! $c delete lnew ! mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] ! if {$id != ""} { ! mset {x1 y1 x2 y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! post "wire_from=%s wire_to=%s" $@wire_from $@wire_to ! mset {from outlet} $@wire_from ! mset {to inlet} $@wire_to ! pd .$self connect [lsearch $@children $from] $outlet \ [lsearch $@children $to] $inlet } puts "connect $@wire_from $@wire_to" } } edit { --- 2358,2399 ---- } wire { ! switch $f { ! 0 { ! $c delete lnew ! mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] ! if {$id != ""} { ! mset {x1 y1 x2 y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! post "wire_from=%s wire_to=%s" $@wire_from $@wire_to ! mset {from outlet} $@wire_from ! mset {to inlet} $@wire_to ! pd .$self connect [lsearch $@children $from] $outlet \ [lsearch $@children $to] $inlet } puts "connect $@wire_from $@wire_to" } + } + 1 { + mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] + if {$id != ""} { + mset {x1 y1 x2 y2} [$id bbox] + set ins 0; set ins [$id ninlets] + if {$y<$y1+6 && $ins} { + set in [expr int(($x-$x1)*$ins/($x2-$x1))] + set @wire_to [list $id $in] + post "wire_from=%s wire_to=%s" $@wire_from $@wire_to + mset {from outlet} $@wire_from + mset {to inlet} $@wire_to + pd .$self connect [lsearch $@children $from] $outlet \ + [lsearch $@children $to] $inlet + } + puts "connect $@wire_from $@wire_to" + } + } + default {puts "..nothing yet.."} + } } edit { *************** *** 2334,2342 **** } ! def* Canvas unclick {x y b} { set c .$self.c set x [$c canvasx $x] set y [$c canvasy $y] ! if {$@editmode} {$self unclickedit $x $y %b} {$self unclickrun $x $y %b} $self adjust_scrollbars $self checkgeometry --- 2424,2432 ---- } ! def* Canvas unclick {x y b f} { set c .$self.c set x [$c canvasx $x] set y [$c canvasy $y] ! if {$@editmode} {$self unclickedit $x $y $b $f} {$self unclickrun $x $y %b} $self adjust_scrollbars $self checkgeometry *************** *** 2610,2615 **** #-----------------------------------------------------------------------------------# ! def Canvas keyup {x y key iso shift} { set canvas .$self.c if {$iso != ""} {scan $iso %c key} # if {[string length $@focus] > 0} { --- 2700,2709 ---- #-----------------------------------------------------------------------------------# ! def* Canvas keyup {x y key iso shift} { set canvas .$self.c + if {$shift} { + if {[llength $@shift_wires]} {set @shift_wires {}; $canvas delete lnew} + #$canvas delete lnew + } if {$iso != ""} {scan $iso %c key} # if {[string length $@focus] > 0} {

1 0

packages Makefile,1.38,1.39
by Hans-Christoph Steiner 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1000 Modified Files: Makefile Log Message: more info in the readme about software patents Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Makefile 6 Aug 2006 03:03:29 -0000 1.38 --- Makefile 7 Aug 2006 21:10:00 -0000 1.39 *************** *** 605,609 **** echo "<h3>License</h3>" >> $(README_FILE) echo "<p>" >> $(README_FILE) ! echo "This package is released under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>. The Pd core and some other included code is originally available with a <a href="http://pure-data.cvs.sourceforge.net/pure-data/pd/LICENSE.txt">BSD license</a> from the Pd CVS on SourceForge." >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "<h3>Included Versions</h3>" >> $(README_FILE) --- 605,609 ---- echo "<h3>License</h3>" >> $(README_FILE) echo "<p>" >> $(README_FILE) ! echo 'This package is released under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>. The Pd core and some other included code is originally available with a <a href="http://pure-data.cvs.sourceforge.net/pure-data/pd/LICENSE.txt">BSD license</a> from the Pd CVS on SourceForge.' >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "<h3>Included Versions</h3>" >> $(README_FILE) *************** *** 627,633 **** echo "<li>zexy: $(ZEXY_VERSION)" >> $(README_FILE) echo "</ul>" >> $(README_FILE) echo "<p>" >> $(README_FILE) ! echo "This package may contain software that is covered by patents in certain countries. In order to use this software you must have the proper license." >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "(this package was built on `date`) <BR>" >> $(README_FILE) echo "</body></html>" >> $(README_FILE) --- 627,640 ---- echo "<li>zexy: $(ZEXY_VERSION)" >> $(README_FILE) echo "</ul>" >> $(README_FILE) + echo "<h3>Patented Algorithms</h3>" >> $(README_FILE) echo "<p>" >> $(README_FILE) ! echo "This package may contain software that is covered by patents in certain countries. In order to use this software you must have the proper license. Below is a list of the known software packages that are covered by patents in some countries:" >> $(README_FILE) echo "</p>" >> $(README_FILE) + echo "<ul>" >> $(README_FILE) + echo '<li><a href="http://en.wikipedia.org/wiki/MP3" target="license">MP3 aka MPEG-1 Part 3 Layer 3</a></li>' >> $(README_FILE) + echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-2" target="license">MPEG-2</a></li>' >> $(README_FILE) + echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-4#Licensing" target="license">MPEG-4</a></li>' >> $(README_FILE) + echo "</ul>" >> $(README_FILE) + echo '<p>Please consider trying to get rid of software patents in your country: <a href="http://www.nosoftwarepatents.com" target="nsp">http://www.nosoftwarepatents.com</a></p>' >> $(README_FILE) echo "(this package was built on `date`) <BR>" >> $(README_FILE) echo "</body></html>" >> $(README_FILE)

1 0

scripts/auto-build run-automated-builder,1.4,1.5
by Hans-Christoph Steiner 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/scripts/auto-build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11379 Modified Files: run-automated-builder Log Message: make sure the script is executable before trying to run it Index: run-automated-builder =================================================================== RCS file: /cvsroot/pure-data/scripts/auto-build/run-automated-builder,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** run-automated-builder 3 Aug 2006 14:17:54 -0000 1.4 --- run-automated-builder 7 Aug 2006 20:11:08 -0000 1.5 *************** *** 11,18 **** distro=$1 ! LOGFILE=/home/pd/logs/${DATE}_-_${TIME}_-_${SCRIPT}_-_${distro}_-_${SYSTEM}.txt ! touch ${LOGFILE} ! su - pd -c /home/pd/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh >> $LOGFILE 2>&1 # send status report --- 11,21 ---- distro=$1 ! LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SYSTEM}_-_${distro}_-_${SCRIPT}.txt ! touch ${LOGFILE} ! chmod a+x /home/pd/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh\ ! >> $LOGFILE 2>&1 ! su pd -c /home/pd/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh\ ! >> $LOGFILE 2>&1 # send status report

1 0

pd/src desire.tk,1.1.2.293,1.1.2.294
by Mathieu Bouchard 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7143 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed -lib: fixed tooltip content; more error prevention; won't add empty library names; <Return> in entrybox does add; ... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.293 retrieving revision 1.1.2.294 diff -C2 -d -r1.1.2.293 -r1.1.2.294 *** desire.tk 7 Aug 2006 17:54:14 -0000 1.1.2.293 --- desire.tk 7 Aug 2006 18:37:11 -0000 1.1.2.294 *************** *** 4823,4832 **** -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} ! # save the listbox path at _($self:$name) instead ! set _($self:$name) $f.a.list scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal ! pack $f.a.xscroll -side bottom -fill x pack $f.a.list -side left -fill both -expand 1 pack $f.a.yscroll -side left -fill y --- 4823,4831 ---- -activestyle none -xscrollcommand "$f.a.xscroll set" foreach line $_($self:$name) {$f.a.list insert end $line} ! set @$name $f.a.list ;# save the listbox path at @$name instead scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal ! pack $f.a.xscroll -side bottom -fill x pack $f.a.list -side left -fill both -expand 1 pack $f.a.yscroll -side left -fill y *************** *** 4852,4856 **** pack $f.b -side top } ! lists { set no_max_label 1 frame $f --- 4851,4855 ---- pack $f.b -side top } ! libraries { set no_max_label 1 frame $f *************** *** 4875,4900 **** entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge pack $f.b.entry.add -side left button $f.b.entry.3 -command "$self entry_set2listbox $f.a.list $f.b.entry.add" -text "add" -width 6 ! balloon $f.b.entry.3 "click to select directory" pack $f.b.entry.3 -side left pack $f.b.entry -side top button $f.b.butts.5 -command "$self dir_up $f.a.list" -text "up" -width 4 ! balloon $f.b.butts.5 "click to select directory" pack $f.b.butts.5 -side left -padx 3 button $f.b.butts.6 -command "$self dir_down $f.a.list" -text "down" -width 4 ! balloon $f.b.butts.6 "click to select directory" pack $f.b.butts.6 -side left -padx 2 button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6 ! balloon $f.b.butts.4 "click to select directory" pack $f.b.butts.4 -side left -padx 2 pack $f.b.butts -side top pack $f.b -side top ! } ! default { frame $f --- 4874,4899 ---- entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge + bind $f.b.entry.add <Return> "$self entry_set2listbox $f.a.list $f.b.entry.add" pack $f.b.entry.add -side left button $f.b.entry.3 -command "$self entry_set2listbox $f.a.list $f.b.entry.add" -text "add" -width 6 ! balloon $f.b.entry.3 "add the name you typed to the list" pack $f.b.entry.3 -side left pack $f.b.entry -side top button $f.b.butts.5 -command "$self dir_up $f.a.list" -text "up" -width 4 ! balloon $f.b.butts.5 "swap order with previous library" pack $f.b.butts.5 -side left -padx 3 button $f.b.butts.6 -command "$self dir_down $f.a.list" -text "down" -width 4 ! balloon $f.b.butts.6 "swap order with next library" pack $f.b.butts.6 -side left -padx 2 button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6 ! balloon $f.b.butts.4 "remove library selected in the list" pack $f.b.butts.4 -side left -padx 2 pack $f.b.butts -side top pack $f.b -side top ! } default { frame $f *************** *** 5108,5112 **** def PagedDialog entry_set2listbox {listbox entry} { set var [$entry get] ! $listbox insert end $var $listbox yview end focus .$self --- 5107,5111 ---- def PagedDialog entry_set2listbox {listbox entry} { set var [$entry get] ! if {$var != ""} {$listbox insert end $var} $listbox yview end focus .$self *************** *** 5115,5127 **** def PagedDialog dir_remove {listbox} { set sel [$listbox curselection] ! if {$sel != ""} { $listbox delete $sel $listbox selection set $sel - } } def PagedDialog dir_up {listbox} { set sel [$listbox curselection] ! if {$sel > 0} { set line [$listbox get $sel] $listbox delete $sel --- 5114,5125 ---- def PagedDialog dir_remove {listbox} { set sel [$listbox curselection] ! if {$sel == ""} {return} $listbox delete $sel $listbox selection set $sel } def PagedDialog dir_up {listbox} { set sel [$listbox curselection] ! if {$sel == 0} {return} set line [$listbox get $sel] $listbox delete $sel *************** *** 5129,5139 **** $listbox selection set [expr $sel - 1] $listbox see [expr $sel - 1] - } } def PagedDialog dir_down {listbox} { set sel [$listbox curselection] ! if {$sel != ""} { ! if {$sel < [expr [$listbox size] - 1]} { set line [$listbox get $sel] $listbox delete $sel --- 5127,5135 ---- $listbox selection set [expr $sel - 1] $listbox see [expr $sel - 1] } def PagedDialog dir_down {listbox} { set sel [$listbox curselection] ! if {$sel == "" || $sel == [expr [$listbox size] - 1]} {return} set line [$listbox get $sel] $listbox delete $sel *************** *** 5141,5146 **** $listbox selection set [expr $sel + 1] $listbox see [expr $sel + 1] - } - } } --- 5137,5140 ---- *************** *** 5200,5204 **** section section_externals ! lists -lib section section_paths --- 5194,5198 ---- section section_externals ! libraries -lib section section_paths *************** *** 5262,5266 **** switch $type { folders {lappend @$name [lindex $line 1]} ! lists {lappend @$name [lindex $line 1]} files {incr i; lappend @$name [lindex $contents $i]} radio {set @$name $line} --- 5256,5260 ---- switch $type { folders {lappend @$name [lindex $line 1]} ! libraries {lappend @$name [lindex $line 1]} files {incr i; lappend @$name [lindex $contents $i]} radio {set @$name $line} *************** *** 5301,5305 **** switch $type { folders {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! lists {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} #files {foreach x $v {puts $fd "$name $x"}} #void {if {[string length $v]} {if {$v} {puts $fd $name}}} --- 5295,5299 ---- switch $type { folders {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! libraries {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} #files {foreach x $v {puts $fd "$name $x"}} #void {if {[string length $v]} {if {$v} {puts $fd $name}}} *************** *** 5349,5353 **** [list $name [say $name] $type {}] } ! lists { properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ [list $name [say $name] $type {}] --- 5343,5347 ---- [list $name [say $name] $type {}] } ! libraries { properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ [list $name [say $name] $type {}]

1 0

pd/src desire.tk,1.1.2.292,1.1.2.293
by Mathieu Bouchard 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25033 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed subpatches Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.292 retrieving revision 1.1.2.293 diff -C2 -d -r1.1.2.292 -r1.1.2.293 *** desire.tk 7 Aug 2006 17:01:58 -0000 1.1.2.292 --- desire.tk 7 Aug 2006 17:54:14 -0000 1.1.2.293 *************** *** 850,878 **** set dd_config [read $file] close $file ! ! set lines [split $dd_config "\n"] ! foreach line $lines { ! # comments begins with "#", and is skipped ! if {[regexp {^#} $line comment]} {} else { ! ! #if {[regexp {^-[a-zA-Z]{2,10}} $line option]} { ! ! foreach {word1 word2 word3} $line { #set word1 [string replace $word1 0 0] switch $word1 { ! color { ! set look($word2) $word3 ! puts "look($word2) $word3" ! } ! font { ! #puts "settings for font" ! } ! default { ! #puts "settings for something" ! } ! } ! ! } ! #} } } --- 850,869 ---- set dd_config [read $file] close $file ! foreach line [split $dd_config "\n"] { ! if {[regexp {^#} $line comment]} {continue} ;# skip comments ! foreach {word1 word2 word3} $line { #set word1 [string replace $word1 0 0] switch $word1 { ! color { ! set look($word2) $word3 ! #puts "look($word2) $word3" ! } ! font { ! #puts "settings for font" ! } ! default { ! #puts "settings for something" ! } ! } } } *************** *** 1110,1114 **** #sets the edit_toggle so the edit mode checkbox will follow if key binding is used catch {.$self.bbar.edit configure -image icon_mode_$mode} ! $self draw } --- 1101,1105 ---- #sets the edit_toggle so the edit mode checkbox will follow if key binding is used catch {.$self.bbar.edit configure -image icon_mode_$mode} ! $self changed ;#$self draw } *************** *** 1381,1384 **** --- 1372,1376 ---- def* Canvas draw {} { + if {$@subpatch} {super} ;# is for the [pd] box if applicable if {$@editmode} {set bg [look canvasbgedit]} else {set bg [look canvasbgrun]} .$self.c configure -background $bg *************** *** 3001,3009 **** $self subscribe $c $self canvas= $c ! #calling the ninlets because when its called by the server, its too late... ! #so the $ninlets and $noutlets are added to the sys_vgui call in pd_upload... ! #$self ninlets= $ninlets ! #$self noutlets= $noutlets ! $self draw if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} { # when it reachs the last unborn child, its time to draw the wires --- 2993,2997 ---- $self subscribe $c $self canvas= $c ! $self draw ;# this shouldn't be here! if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} { # when it reachs the last unborn child, its time to draw the wires

1 0

pd/src s_audio_portaudio.c,1.1.2.17,1.1.2.18
by Thomas Grill 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12281/src Modified Files: Tag: devel_0_39 s_audio_portaudio.c Log Message: fixes for portaudio device indices Index: s_audio_portaudio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** s_audio_portaudio.c 5 Aug 2006 19:03:59 -0000 1.1.2.17 --- s_audio_portaudio.c 7 Aug 2006 17:18:07 -0000 1.1.2.18 *************** *** 68,73 **** static int pa_bufferpos; ! static int pdindev2paindev(int pdindev); ! static int pdoutdev2paoutdev(int pdoutdev); int process (const void *input, void *output, unsigned long frameCount, --- 68,73 ---- static int pa_bufferpos; ! static int pddev2padev(int pdindev,int isinput); ! static int padev2pddev(int padev,int isinput); int process (const void *input, void *output, unsigned long frameCount, *************** *** 89,92 **** --- 89,93 ---- PaError err; int j, devno; + const PaDeviceInfo *pdi,*pdo; schedmode = 1; /* we don't support blocking io */ *************** *** 108,148 **** } if (inchans > 0) { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) ! { ! const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxInputChannels; ! if (maxchans > 0) ! { ! if (devno == indeviceno) ! { ! if (maxchans < inchans) ! inchans = maxchans; ! pa_indev = j; ! break; ! } ! devno++; ! } } } if (outchans > 0) { ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) ! { ! const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxOutputChannels; ! if (maxchans > 0) ! { ! if (devno == outdeviceno) ! { ! if (maxchans < outchans) ! outchans = maxchans; ! pa_outdev = j; ! break; ! } ! devno++; ! } } } --- 109,131 ---- } + pdi = NULL; if (inchans > 0) { ! pa_indev = pddev2padev(indeviceno,1); ! if(pa_indev >= 0) { ! pdi = Pa_GetDeviceInfo(pa_indev); ! if(pdi->maxInputChannels < inchans) ! inchans = pdi->maxInputChannels; } } + pdo = NULL; if (outchans > 0) { ! pa_outdev = pddev2padev(outdeviceno,0); ! if(pa_outdev >= 0) { ! pdo = Pa_GetDeviceInfo(pa_outdev); ! if(pdo->maxOutputChannels < outchans) ! outchans = pdo->maxOutputChannels; } } *************** *** 160,166 **** PaStreamParameters inputParameters, outputParameters; - const PaDeviceInfo* pdi = Pa_GetDeviceInfo(pa_indev); - const PaDeviceInfo* pdo = Pa_GetDeviceInfo(pa_outdev); - /* initialize input */ inputParameters.device = pa_indev; --- 143,146 ---- *************** *** 218,222 **** sys_schedadvance = 1e-6 * streaminfo->outputLatency; ! SETFLOAT(atoms, (float)pa_indev); SETFLOAT(atoms+1, (float)inchans); SETFLOAT(atoms+2, (float)rate); --- 198,202 ---- sys_schedadvance = 1e-6 * streaminfo->outputLatency; ! SETFLOAT(atoms, (float)indeviceno); SETFLOAT(atoms+1, (float)inchans); SETFLOAT(atoms+2, (float)rate); *************** *** 224,228 **** typedmess(pd->s_thing, selector1, 4, atoms); ! SETFLOAT(atoms, (float)pa_outdev); SETFLOAT(atoms+1, (float)outchans); SETFLOAT(atoms+2, (float)rate); --- 204,208 ---- typedmess(pd->s_thing, selector1, 4, atoms); ! SETFLOAT(atoms, (float)outdeviceno); SETFLOAT(atoms+1, (float)outchans); SETFLOAT(atoms+2, (float)rate); *************** *** 479,483 **** void pa_getaudioininfo(t_float f) { ! int i = pdindev2paindev((int)f); const PaDeviceInfo * pdi; --- 459,463 ---- void pa_getaudioininfo(t_float f) { ! int i = pddev2padev((int)f,1); const PaDeviceInfo * pdi; *************** *** 500,504 **** void pa_getaudiooutinfo(t_float f) { ! int i = pdoutdev2paoutdev((int)f); const PaDeviceInfo * pdi; --- 480,484 ---- void pa_getaudiooutinfo(t_float f) { ! int i = pddev2padev((int)f,0); const PaDeviceInfo * pdi; *************** *** 524,529 **** t_symbol * selector = gensym("audiodevice"); t_atom argv[2]; ! SETFLOAT(argv, pa_indev); ! SETFLOAT(argv+1, pa_outdev); typedmess(pd->s_thing, selector, 2, argv); } --- 504,509 ---- t_symbol * selector = gensym("audiodevice"); t_atom argv[2]; ! SETFLOAT(argv, padev2pddev(pa_indev,1)); ! SETFLOAT(argv+1, padev2pddev(pa_outdev,0)); typedmess(pd->s_thing, selector, 2, argv); } *************** *** 543,548 **** pa_initialize(); ! indev = pdindev2paindev(indev); ! outdev = pdoutdev2paoutdev(outdev); if ((pa_indev == -1) && (pa_outdev == -1)) --- 523,528 ---- pa_initialize(); ! indev = pddev2padev(indev,1); ! outdev = pddev2padev(outdev,0); if ((pa_indev == -1) && (pa_outdev == -1)) *************** *** 570,574 **** } ! static int pdindev2paindev(int pdindev) { int j; --- 550,554 ---- } ! static int pddev2padev(int pddev,int input) { int j; *************** *** 579,586 **** { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxInputChannels; if (maxchans > 0) { ! if (devno == pdindev) { return j; --- 559,566 ---- { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = input?info->maxInputChannels:info->maxOutputChannels; if (maxchans > 0) { ! if (devno == pddev) { return j; *************** *** 593,617 **** } ! static int pdoutdev2paoutdev(int pdoutdev) { ! int j; ! int devno; ! pa_initialize(); ! ! for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++) { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxOutputChannels; ! if (maxchans > 0) { ! if (devno == pdoutdev) ! { ! return j; ! } devno++; } } ! ! return -1; } --- 573,591 ---- } ! static int padev2pddev(int padev,int input) { ! int j,devno; ! int count = Pa_GetDeviceCount(); ! for (j = 0, devno = 0; j < count; j++) { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int chans = input?info->maxInputChannels:info->maxOutputChannels; ! if (chans > 0) { ! if(j == padev) return devno; devno++; } } ! return -1; // no found }

1 0

pd/src desire.tk,1.1.2.291,1.1.2.292
by Mathieu Bouchard 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6114 Modified Files: Tag: devel_0_39 desire.tk Log Message: attempt to fix trac#2 ("which" command doesn't exist on win32) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.291 retrieving revision 1.1.2.292 diff -C2 -d -r1.1.2.291 -r1.1.2.292 *** desire.tk 7 Aug 2006 16:41:49 -0000 1.1.2.291 --- desire.tk 7 Aug 2006 17:01:58 -0000 1.1.2.292 *************** *** 38,41 **** --- 38,49 ---- package require objective + proc which {file} { + global env + foreach dir [split $env(PATH) ":"] { + if {[file exists $dir/$file]} {return $dir/$file} + } + return "" + } + #-----------------------------------------------------------------------------------# # some list processing functions and some math too *************** *** 1054,1058 **** #set pd_prefix [file dirname [file dirname [exec which pd]]] ! #set pd_guidir ${pd_prefix}/lib/pd set pd_guidir "" set doc_number 1 --- 1062,1067 ---- #set pd_prefix [file dirname [file dirname [exec which pd]]] ! set pd_prefix [file dirname [file dirname [which pd]]] ! set pd_guidir ${pd_prefix}/lib/pd set pd_guidir "" set doc_number 1

1 0

pd/src desire.c, 1.1.2.96, 1.1.2.97 desire.tk, 1.1.2.290, 1.1.2.291
by Mathieu Bouchard 07 Aug '06

07 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31551 Modified Files: Tag: devel_0_39 desire.c desire.tk Log Message: fixed restore for real: line #X restore appears during upload and is correctly handled by update_object. Also, client Canvas class is reparented from {Menuable View} to {Menuable TextBox}. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.290 retrieving revision 1.1.2.291 diff -C2 -d -r1.1.2.290 -r1.1.2.291 *** desire.tk 7 Aug 2006 07:42:40 -0000 1.1.2.290 --- desire.tk 7 Aug 2006 16:41:49 -0000 1.1.2.291 *************** *** 132,136 **** if {$i>=0} {set @subscribers [lreplace $@subscribers $i $i]} } ! def* Observable changed {args} { foreach x $@subscribers {eval [concat [list $x notice $self] $args]} } --- 132,136 ---- if {$i>=0} {set @subscribers [lreplace $@subscribers $i $i]} } ! def Observable changed {args} { foreach x $@subscribers {eval [concat [list $x notice $self] $args]} } *************** *** 961,965 **** #-----------------------------------------------------------------------------------# ! class_new Canvas {Menuable View} #def Canvas close {} {pd $self menuclose 0} --- 961,965 ---- #-----------------------------------------------------------------------------------# ! class_new Canvas {Menuable ObjectBox} #def Canvas close {} {pd $self menuclose 0} *************** *** 1524,1528 **** } ! def* TextBox update_size {} { global font set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] --- 1524,1528 ---- } ! def TextBox update_size {} { global font set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] *************** *** 2553,2557 **** } ! def* Canvas key {x y key iso shift} { set c .$self.c --- 2553,2557 ---- } ! def Canvas key {x y key iso shift} { set c .$self.c *************** *** 2894,2897 **** --- 2894,2898 ---- } set canvas(current) $self + set isnew 0 } "#X" { *************** *** 2905,2908 **** --- 2906,2911 ---- set class obj set _class ObjectBox + # this is not the same @isnew as $isnew ! + # in the future, both @isnew and @valid should go elsewhere or disappear set _($self:isnew) [expr [llength $mess] == 4] set _($self:valid) 0 *************** *** 2918,2922 **** symbolatom {$self text= [lindex $d 4]} text {$self text= [join [lrange $mess 4 end]]} ! default {$self text= [join [lrange $mess 4 end]]; set i 0; foreach f $fields($class) {set _($self:$f) [lindex $d $i]; incr i}} } --- 2921,2926 ---- symbolatom {$self text= [lindex $d 4]} text {$self text= [join [lrange $mess 4 end]]} ! restore {$self text= [join [lrange $mess 4 end]]} ! default {$self text= [join [lrange $mess 4 end]] set i 0; foreach f $fields($class) {set _($self:$f) [lindex $d $i]; incr i}} } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.96 retrieving revision 1.1.2.97 diff -C2 -d -r1.1.2.96 -r1.1.2.97 *** desire.c 7 Aug 2006 05:54:12 -0000 1.1.2.96 --- desire.c 7 Aug 2006 16:41:49 -0000 1.1.2.97 *************** *** 76,80 **** void appendix_save (t_gobj *master, t_binbuf *b) { t_hash *h = master->g_adix->visual; ! fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); if (hash_size(h)) { hashkey k; --- 76,80 ---- void appendix_save (t_gobj *master, t_binbuf *b) { t_hash *h = master->g_adix->visual; ! /* fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); */ if (hash_size(h)) { hashkey k; *************** *** 184,188 **** //post("queue_get: items in queue: %d",self->len); b = ((t_text *)stuff)->te_binbuf; ! if (b) {char *buf; int bufn; binbuf_gettext(b,&buf,&bufn); printf("queue_get [%.*s]\n",bufn,buf);} else {printf("queue_get (%s)\n",(*(t_pd*)stuff)->c_name->s_name);} return stuff; --- 184,191 ---- //post("queue_get: items in queue: %d",self->len); b = ((t_text *)stuff)->te_binbuf; ! if (b) { ! char *buf; int bufn; ! binbuf_gettext(b,&buf,&bufn); ! printf("queue_get [%.*s] %p\n",bufn,buf,stuff);} else {printf("queue_get (%s)\n",(*(t_pd*)stuff)->c_name->s_name);} return stuff; *************** *** 10765,10769 **** t_text *x = (t_text *)pd_new(text_class); t_atom at; ! sys_vgui("global _; set _(x%x:canvas) %lx\n",(long)x,(long)gl); x->te_width = 0; x->te_type = T_TEXT; --- 10768,10772 ---- t_text *x = (t_text *)pd_new(text_class); t_atom at; ! sys_vgui("global _; set _(x%x:canvas) x%lx\n",(long)x,(long)gl); x->te_width = 0; x->te_type = T_TEXT; *************** *** 10817,10821 **** } if (!x) x = (t_text *)pd_new(text_class); ! sys_vgui("global _; set _(x%x:canvas) %lx\n",(long)x,(long)gl); x->te_binbuf = b; x->te_xpix = xpix; --- 10820,10824 ---- } if (!x) x = (t_text *)pd_new(text_class); ! sys_vgui("global _; set _(x%x:canvas) x%lx\n",(long)x,(long)gl); x->te_binbuf = b; x->te_xpix = xpix; *************** *** 11641,11656 **** void pd_upload(t_gobj *self) { ! t_binbuf *buf = binbuf_new(); t_class *c = self->g_pd; int n; char *s; if (c==canvas_class) { /* just the "#N canvas" line, not the contents */ ! canvas_savecontainerto((t_canvas *)self,buf); ! /* note: this does NOT handle the restore. */ } else { /* this was outside of the "else" for a while. why? I don't remember */ ! c->c_savefn(self,buf); } ! binbuf_gettext(buf,&s,&n); if (s[n-1]=='\n') n--; sys_vgui("update_object x%lx {%.*s} %d %d\n", --- 11644,11689 ---- void pd_upload(t_gobj *self) { ! t_binbuf *b = binbuf_new(); t_class *c = self->g_pd; int n; char *s; + t_text *x = (t_text *)self; + #if 1 if (c==canvas_class) { /* just the "#N canvas" line, not the contents */ ! canvas_savecontainerto((t_canvas *)self,b); ! binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), ! (t_int)x->te_xpix, (t_int)x->te_ypix); ! if (x->te_binbuf) { ! binbuf_addbinbuf(b, x->te_binbuf); ! } else { ! bug("binbuf missing at #X restore !!!"); ! } ! binbuf_addv(b, ";"); } else { /* this was outside of the "else" for a while. why? I don't remember */ ! c->c_savefn(self,b); } ! #endif ! #if 0 ! /* adapted from text_save. sorry */ ! if (x->te_type == T_OBJECT && zgetfn(&x->te_pd, gensym("saveto")) && ! !((pd_class(&x->te_pd) == canvas_class) && ! (canvas_isabstraction((t_canvas *)x) ! || canvas_istable((t_canvas *)x)))) { ! mess1(&x->te_pd, gensym("saveto"), b); ! binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), ! (t_int)x->te_xpix, (t_int)x->te_ypix); ! if (x->te_binbuf) { ! binbuf_addbinbuf(b, x->te_binbuf); ! } else { ! bug("binbuf missing at #X restore !!!"); ! } ! binbuf_addv(b, ";"); ! } else { ! c->c_savefn(self,b); ! } ! #endif ! ! binbuf_gettext(b,&s,&n); if (s[n-1]=='\n') n--; sys_vgui("update_object x%lx {%.*s} %d %d\n", *************** *** 11658,11662 **** obj_ninlets((t_text *)self), obj_noutlets((t_text *)self)); ! binbuf_free(buf); free(s); if (c==canvas_class) { --- 11691,11695 ---- obj_ninlets((t_text *)self), obj_noutlets((t_text *)self)); ! binbuf_free(b); free(s); if (c==canvas_class) {

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
47
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 August 2006