Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

externals/miXed Makefile.common,1.29,1.30
by Krzysztof Czaja 30 May '05

30 May '05

Update of /cvsroot/pure-data/externals/miXed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23253 Modified Files: Makefile.common Log Message: toxy alpha18 and pddp alpha2 (see notes.txt for toxy, pddp and shared) Index: Makefile.common =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile.common 10 May 2005 20:26:37 -0000 1.29 --- Makefile.common 30 May 2005 09:29:25 -0000 1.30 *************** *** 75,78 **** --- 75,84 ---- BASE_NAME = $(shell basename `pwd` | awk -F - '{print $$1}') + INCLUDES = -I . -I $(PD_DIR) -I $(SHARED_DIR) + + ifdef CAML_TYPES + include $(ROOT_DIR)/Makefile.caml + endif + # CX: control external's main file # AX: audio (tilde) external's main file *************** *** 100,105 **** $(foreach type,$(TYPES),$($(type)_PRIVATEOBJECTS:.o=.c)) - INCLUDES = -I. -I$(PD_DIR) -I$(SHARED_DIR) - ifeq ($(MY_NAME),krzYszcz) WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \ --- 106,109 ---- *************** *** 124,130 **** TYPES_RULE = $(foreach fn,$(call TYPES_EXTERNS,$1),$(OUT_DIR)/$(fn)): \ $(OUT_DIR)/%$($1_TILDE).$(X_SUFFIX) \ ! : $(call TYPES_DIR,$1)%.o $($1_PRIVATEOBJECTS) \ $(foreach obj,$($1_OBJECTS),$(SHARED_DIR)/$(obj)) \ ! ; $(CC) -o $$@ $(CFLAGS) $(LFLAGS) $($1_LIBS) $$+ # LATER find a better way... --- 128,135 ---- TYPES_RULE = $(foreach fn,$(call TYPES_EXTERNS,$1),$(OUT_DIR)/$(fn)): \ $(OUT_DIR)/%$($1_TILDE).$(X_SUFFIX) \ ! : $(call TYPES_DIR,$1)%.o \ ! $($1_PRIVATEOBJECTS) $($1_FOREIGNOBJECTS) \ $(foreach obj,$($1_OBJECTS),$(SHARED_DIR)/$(obj)) \ ! ; $(CC) -o $$@ $(CFLAGS) $(LFLAGS) $$+ $($1_LIBS) # LATER find a better way... *************** *** 241,245 **** $(SUBDIRS_DEFAULT) ! clean: emptydeps # remove all objects and externs that are contained in current directory -rm -f *.o *.$(X_SUFFIX) --- 246,250 ---- $(SUBDIRS_DEFAULT) ! clean:: emptydeps # remove all objects and externs that are contained in current directory -rm -f *.o *.$(X_SUFFIX)

1 0

externals/miXed/bin/pddp pddpboot.tcl, NONE, 1.1 pddpclient.tcl, NONE, 1.1 pddpserver.tcl, NONE, 1.1 pkgIndex.tcl, NONE, 1.1
by Krzysztof Czaja 30 May '05

30 May '05

Update of /cvsroot/pure-data/externals/miXed/bin/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23253/bin/pddp Added Files: pddpboot.tcl pddpclient.tcl pddpserver.tcl pkgIndex.tcl Log Message: toxy alpha18 and pddp alpha2 (see notes.txt for toxy, pddp and shared) --- NEW FILE: pddpclient.tcl --- # pddpclient.tcl # Synopsis # not to be run by itself (see pddpboot.tcl) if {![namespace exists ::pddp]} { puts stderr "Error: invalid invocation of pddpclient (boot pddp first)" puts stderr "exiting..." exit 1 } if {$::pddp::testrun} { ;# true if sourced from standalone "pddpboot.tcl" puts stderr "Loading pddpclient, test run..." if {$argc > 3} { set path [lindex $argv 3] if {[string length $path]} { puts stderr "Scheduling \"$path\" for opening" after idle ::pddp::cliOpen $path } unset path } } else { puts stderr "Loading pddpclient" } namespace eval ::pddp { variable theBrowserCommand switch -- $::tcl_platform(platform) { unix { switch -- $tcl_platform(os) { Darwin { set theBrowserCommand "sh -c \"open %s\"" } Linux { foreach candidate \ {firefox mozilla galeon konqueror netscape lynx} { set browser [lindex [auto_execok $candidate] 0] if {[string length $browser]} { set theBrowserCommand "$browser %s &" break } } } } } windows { # should not this be just: [auto_execok start]? set theBrowserCommand \ "rundll32 url.dll,FileProtocolHandler file:%s &" } } } proc ::pddp::cliError {err} { puts stderr "Error in pddpclient: $err" } proc ::pddp::cliOpen {path} { if {[string first "://" $path] < 1} { if {[info exists ::pddp::thePort]} { set path "http://localhost:$::pddp::thePort/$path" } else { cliError "pddpserver not running" return } } variable theBrowserCommand if {[string length $theBrowserCommand]} { set command [format $theBrowserCommand $path] puts stderr "pddpclient: exec $command" if {[catch {eval [list exec] $command} err]} { if {[lindex $::errorCode 0] eq "CHILDSTATUS"} { cliError "$err (child status [lindex $::errorCode 2])" } else { cliError $err } } } else { cliError "browser unavailable" } } --- NEW FILE: pddpboot.tcl --- #!/bin/sh # \ exec tclsh "$0" -- "$@" # Synopsis # test run: # ./pddpboot.tcl [root [port [path]]] # from Pd: # source pddpboot.tcl # ::pddp::srvUse root (or ::pddp::srvStart root [port]) # ::pddp::cliOpen path # ... (more "::pddp::cliOpen" calls) ... # ::pddp::srvStop if {[namespace exists ::pddp]} { ;# created by pddplink's setup puts stderr "Booting pddp" set ::pddp::testrun 0 } else { puts stderr "Booting pddp, test run..." namespace eval ::pddp { variable testrun 1 } } if {[info exists ::pddp::theDir]} { source [file join $::pddp::theDir pddpclient.tcl] source [file join $::pddp::theDir pddpserver.tcl] if {[info exists ::pddp::theVersion]} { package provide pddp $::pddp::theVersion } } else { source pddpclient.tcl] source pddpserver.tcl] } --- NEW FILE: pddpserver.tcl --- # pddpserver.tcl # Synopsis # not to be run by itself (see pddpboot.tcl) # based on: # Simple Sample httpd/1.[01] server # Stephen Uhler (c) 1996-1997 Sun Microsystems # http://cvs.sourceforge.net/viewcvs.py/tclhttpd/tclhttpd/bin/mini/mini1.1.tcl # modified by krzYszcz (2005): # putting per-server data and all commands in a namespace "::pddp" # supporting sourcing from within Pd, through the "pddpboot.tcl" wrapper # inserting the .pd handler # lots of other changes, too many to list here (run "diff" if curious...) if {![namespace exists ::pddp]} { puts stderr "Error: invalid invocation of pddpserver (boot pddp first)" puts stderr "exiting..." exit 1 } if {$::pddp::testrun} { ;# true if sourced from standalone "pddpboot.tcl" puts stderr "Loading pddpserver, test run..." proc bgerror {msg} { global errorInfo puts stderr "bgerror: $msg\n$errorInfo" } } else { puts stderr "Loading pddpserver" catch {console show} } namespace eval ::pddp { variable thePort 0 variable theState variable theMimeTypes variable theErrors variable theErrorFormat # "theState" contains the server state: # root: the root of the document directory # default: default document name # listen: the main listening socket id # naccepts: a count of accepted connections so far # maxtime: the max time (msec) allowed to complete an http request # maxused: the max # of requests for a socket array set theState { root "" default index.html listen "" naccepts 0 nrequests 0 nerrors 0 maxtime 600000 maxused 25 bufsize 32768 } set theState(root) $env(HOME) array set theMimeTypes { {} text/plain .txt text/plain .html text/html .gif image/gif .jpg image/jpeg .pd text/html } # HTTP/1.[01] error codes (the ones we use) array set theErrors { 204 {No Content} 400 {Bad Request} 404 {Not Found} 405 {Method Not Allowed} 408 {Request Timeout} 411 {Length Required} 419 {Expectation Failed} 500 {Internal Server Error} 503 {Service Unavailable} 504 {Service Temporarily Unavailable} 505 {HTTP Version Not Supported} } # Generic error response set theErrorFormat { <title>Error: %1$s</title> Got the error: %2$s while trying to obtain %3$s } } proc ::pddp::srvUse {{root {}} {port 0}} { variable theState if {[string length $theState(listen)]} { if {[string length $root] && ![string equal $root $theState(root)]} { srvLog $theState(listen) Warning "Redirection attempt for $root" } } else { srvStart $root $port } } # Start the server by listening for connections on the desired port. proc ::pddp::srvStart {{root {}} {port 0}} { variable thePort variable theState puts stderr "Starting pddp server on [info hostname]" if {[string length $root]} { set theState(root) $root } # we do not handle multiple pddpservers, LATER rethink srvStop array set theState [list naccepts 0 nrequests 0 nerrors 0] for { set thePort $port } {$thePort < 65535 } {incr thePort } { if {[catch {set theState(listen) \ [socket -server ::pddp::srvAccept $thePort]} res]} { if {$thePort == 0} { # FIXME this is a critical error set thePort 32768 } } else { break } } if {$thePort == 65535} { srvLog none Error "Could not find port available for listening" } else { if {$thePort == 0} { set thePort [lindex [fconfigure $theState(listen) -sockname] 2] } srvLog $theState(listen) Port $thePort srvLog $theState(listen) Root directory \"$root\" } after 120 update ;# FIXME might be needed on windows they say, test there return $thePort } proc ::pddp::srvStop {} { variable thePort variable theState if {[string length $theState(listen)]} { if {[catch {close $theState(listen)} res]} { srvLog $theState(listen) Warning [list $res while closing socket] } else { srvLog $theState(listen) Closed. } set theState(listen) "" update } } # Accept a new connection from the server and set up a handler # to read the request from the client. proc ::pddp::srvAccept {sock ipaddr port} { variable theState variable theSockData$sock # reject remote requests, LATER revisit if {[string equal $ipaddr "127.0.0.1"]} { incr theState(naccepts) srvReset $sock $theState(maxused) srvLog $sock Connect $ipaddr $port } else { srvLog $sock Warning "rejecting remote connection request from $ipaddr" srvSockDone $sock 1 } } # Initialize or reset the socket state proc ::pddp::srvReset {sock nlft} { variable theState upvar 0 ::pddp::theSockData$sock sockData array set sockData [list state start linemode 1 version 0 nleft $nlft] set sockData(cancel) \ [after $theState(maxtime) [list srvTimeout $sock]] fconfigure $sock -blocking 0 -buffersize $theState(bufsize) \ -translation {auto crlf} fileevent $sock readable [list ::pddp::srvRead $sock] } # Read data from a client request # 1) read the request line # 2) read the mime headers # 3) read the additional data (if post && content-length not satisfied) proc ::pddp::srvRead {sock} { variable theState upvar 0 ::pddp::theSockData$sock sockData # Use line mode to read the request and the mime headers if {$sockData(linemode)} { set readCount [gets $sock line] set state [string compare $readCount 0],$sockData(state) switch -glob -- $state { 1,start { if {[regexp {(HEAD|POST|GET) ([^?]+)\??([^ ]*) HTTP/1.([01])} \ $line x sockData(proto) sockData(url) \ sockData(query) sockData(version)]} { set sockData(state) mime incr theState(nrequests) srvLog $sock Request $sockData(nleft) $line } else { srvError $sock 400 $line } } 0,start { srvLog $sock Warning "Initial blank line fetching request" } 1,mime { if {[regexp {([^:]+):[ ]*(.*)} $line {} key value]} { set key [string tolower $key] set sockData(key) $key if {[info exists sockData(mime,$key)]} { append sockData(mime,$key) ", $value" } else { set sockData(mime,$key) $value } } elseif {[regexp {^[ ]+(.+)} $line {} value] && \ [info exists sockData(key)]} { append sockData(mime,$sockData($key)) " " $value } else { srvError $sock 400 $line } } 0,mime { if {$sockData(proto) == "POST" && \ [info exists sockData(mime,content-length)]} { set sockData(linemode) 0 set sockData(count) $sockData(mime,content-length) if {$sockData(version) && \ [info exists sockData(mime,expect)]} { if {$sockData(mime,expect) == "100-continue"} { puts $sock "100 Continue HTTP/1.1\n" flush $sock } else { srvError $sock 419 $sockData(mime,expect) } } fconfigure $sock -translation {binary crlf} } elseif {$sockData(proto) != "POST"} { srvRespond $sock } else { srvError $sock 411 "Confusing mime headers" } } -1,* { if {[eof $sock]} { srvLog $sock Error "Broken connection fetching request" srvSockDone $sock 1 } else { puts stderr "Partial read, retrying" } } default { srvError $sock 404 "Invalid http state: $state,[eof $sock]" } } # Use counted mode to get the post data } elseif {![eof $sock]} { append sockData(postdata) [read $sock $sockData(count)] set sockData(count) [expr {$sockData(mime,content-length) - \ [string length $sockData(postdata)]}] if {$sockData(count) == 0} { srvRespond $sock } } else { srvLog $sock Error "Broken connection reading POST data" srvSockDone $sock 1 } } # Done with the socket, either close it, or set up for next fetch # sock: The socket I'm done with # doclose: If true, close the socket, otherwise set up for reuse proc ::pddp::srvSockDone {sock doclose} { variable theState upvar 0 ::pddp::theSockData$sock sockData after cancel $sockData(cancel) set nleft [incr sockData(nleft) -1] unset sockData if {$doclose} { close $sock } else { srvReset $sock $nleft } return "" } # A timeout happened proc ::pddp::srvTimeout {sock} { srvError $sock 408 } # FIXME test if "path" has its patch window already open... proc ::pddp::srvPdHandler {sock path} { set dir [file dirname $path] set tail [file tail $path] if {[catch {pd [concat pd open $tail $dir \;]}]} { srvError $sock 504 } else { srvError $sock 204 # FIXME raise; focus (test on windows) } } # Handle file system queries. This is a place holder for a more # generic dispatch mechanism. proc ::pddp::srvRespond {sock} { variable theState variable theUrlCache upvar 0 ::pddp::theSockData$sock sockData regsub {(^http://[^/]+)?} $sockData(url) {} url if {[info exists theUrlCache($url)]} { set mypath $theUrlCache($url) } else { set mypath [srvUrl2File $theState(root) $url] if {[file isdirectory $mypath]} { append mypath / $theState(default) } set theUrlCache($url) $mypath } if {[string length $mypath] == 0} { srvError $sock 400 } elseif {![file readable $mypath]} { if {[string equal [file tail $mypath] "favicon.ico"]} { srvError $sock 204 ;# FIXME design something } else { srvError $sock 404 $mypath } } else { set ext [file extension $mypath] if {[string equal $ext ".pd"]} { srvPdHandler $sock $mypath return } puts $sock "HTTP/1.$sockData(version) 200 Data follows" puts $sock "Date: [srvGetDate [clock seconds]]" puts $sock "Last-Modified: [srvGetDate [file mtime $mypath]]" puts $sock "Content-Type: [srvContentType $ext]" puts $sock "Content-Length: [file size $mypath]" ## Should also close socket if recvd connection close header set doclose [expr {$sockData(nleft) == 0}] if {$doclose} { puts $sock "Connection close:" } elseif {$sockData(version) == 0 && \ [info exists sockData(mime,connection)]} { if {$sockData(mime,connection) == "Keep-Alive"} { set doclose 0 puts $sock "Connection: Keep-Alive" } } puts $sock "" flush $sock if {$sockData(proto) != "HEAD"} { set in [open $mypath] fconfigure $sock -translation binary fconfigure $in -translation binary fcopy $in $sock -command \ [list ::pddp::srvCopyDone $in $sock $doclose] } else { srvSockDone $sock $doclose } } } # Callback when file is done being output to client # in: The fd for the file being copied # sock: The client socket # doclose: close the socket if true # bytes: The # of bytes copied # error: The error message (if any) proc ::pddp::srvCopyDone {in sock doclose bytes {error {}}} { close $in srvLog $sock Done $bytes bytes srvSockDone $sock $doclose } # Convert the file suffix into a mime type. proc ::pddp::srvContentType {ext} { variable theMimeTypes set type text/plain catch {set type $theMimeTypes($ext)} return $type } # Respond with an error reply # sock: The socket handle to the client # code: The httpd error code # args: Additional information for error logging proc ::pddp::srvError {sock code args} { variable theState variable theErrors variable theErrorFormat upvar 0 ::pddp::theSockData$sock sockData append sockData(url) "" incr theState(nerrors) set message [format $theErrorFormat $code $theErrors($code) $sockData(url)] append head "HTTP/1.$sockData(version) $code $theErrors($code)" \n append head "Date: [srvGetDate [clock seconds]]" \n append head "Connection: close" \n append head "Content-Length: [string length $message]" \n # Because there is an error condition, the socket may be "dead" catch { fconfigure $sock -translation crlf puts -nonewline $sock $head\n$message flush $sock } reason srvSockDone $sock 1 if {$code < 300} {set status Status} else {set status Error} srvLog $sock $status $code $theErrors($code) $args $reason } # Generate a date string in HTTP format. proc ::pddp::srvGetDate {seconds} { return [clock format $seconds -format {%a, %d %b %Y %T %Z}] } # Log an Httpd transaction. # This should be replaced as needed. proc ::pddp::srvLog {sock args} { puts stderr "pddp log ($sock): $args" } # Convert a url into a pathname. (UNIX version only) # This is probably not right, and belongs somewhere else. # - Remove leading http://... if any # - Collapse all /./ and /../ constructs # - expand %xx sequences -> disallow "/"'s and "."'s due to expansions proc ::pddp::srvUrl2File {root url} { regsub -all {//+} $url / url ;# collapse multiple /'s while {[regsub -all {/\./} $url / url]} {} ;# collapse /./ while {[regsub -all {/\.\.(/|$)} $url /\x81\\1 url]} {} ;# mark /../ while {[regsub "/\[^/\x81]+/\x81/" $url / url]} {} ;# collapse /../ if {![regexp "\x81|%2\[eEfF]" $url]} { ;# invalid /../, / or . ? return $root[srvCgiMap $url] } else { return "" } } # Decode url-encoded strings. proc ::pddp::srvCgiMap {data} { regsub -all {([][$\\])} $data {\\\1} data regsub -all {%([0-9a-fA-F][0-9a-fA-F])} $data {[format %c 0x\1]} data return [subst $data] } if {$::pddp::testrun} { ;# true if tested as a standalone script if {$argc > 1} { set root [lindex $argv 1] set port [lindex $argv 2] if {![string is integer -strict $port]} { set port 32768 } } else { set root $env(HOME) set port 32768 } ::pddp::srvStart $root $port vwait forever } --- NEW FILE: pkgIndex.tcl --- proc LoadPddp { version dir } { namespace eval ::pddp {} set ::pddp::theVersion $version set ::pddp::theDir $dir source [file join $dir pddpboot.tcl] } set version "0.1.0.2" package ifneeded pddp $version [list LoadPddp $version $dir]

1 0

externals/miXed/bin/pddp - New directory
by Krzysztof Czaja 30 May '05

30 May '05

Update of /cvsroot/pure-data/externals/miXed/bin/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/bin/pddp Log Message: Directory /cvsroot/pure-data/externals/miXed/bin/pddp added to the repository

1 0

pd/src configure.in, 1.9, 1.10 makefile, 1.12, 1.13 makefile.dependencies, 1.4, 1.5
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16783/pd/src Modified Files: configure.in makefile makefile.dependencies Log Message: fixed makefile, configure to work on Mac as well as linux. Almost have it compiling on Windows too, but don't have a machine here to check it on. Set "-ko" flag on portaudio so CVS will preserve the key strings as they appear in the portaudio tarballs. Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile 30 May 2005 03:04:18 -0000 1.12 --- makefile 30 May 2005 04:37:25 -0000 1.13 *************** *** 11,19 **** MANDIR = ${prefix}/man ! MORECFLAGS = -DUSEAPI_PORTAUDIO -DPA19 -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_linux -fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA -Wno-error INCLUDE = -I. GINCLUDE = $(INCLUDE) ! GLIB = -ltk8.4 -ltcl8.4 -lX11 -L/usr/X11R6/lib LDFLAGS = -Wl,-export-dynamic -lasound --- 11,19 ---- MANDIR = ${prefix}/man ! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_linux -fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA INCLUDE = -I. GINCLUDE = $(INCLUDE) ! GLIB = -ltk8.4 -ltcl8.4 LDFLAGS = -Wl,-export-dynamic -lasound *************** *** 29,33 **** # the sources ! SYSSRC += s_audio_pa.c s_audio_pablio.c s_audio_paring.c ../portaudio/pa_common/pa_allocation.c ../portaudio/pa_common/pa_converters.c ../portaudio/pa_common/pa_cpuload.c ../portaudio/pa_common/pa_dither.c ../portaudio/pa_common/pa_front.c ../portaudio/pa_common/pa_process.c ../portaudio/pa_common/pa_skeleton.c ../portaudio/pa_common/pa_stream.c ../portaudio/pa_common/pa_trace.c ../portaudio/pa_unix/pa_unix_hostapis.c ../portaudio/pa_unix/pa_unix_util.c ../portaudio/pa_unix_oss/pa_unix_oss.c s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c ../portaudio/pa_linux_alsa/pa_linux_alsa.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ --- 29,33 ---- # the sources ! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ Index: makefile.dependencies =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.dependencies,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.dependencies 30 May 2005 03:04:18 -0000 1.4 --- makefile.dependencies 30 May 2005 04:37:25 -0000 1.5 *************** *** 913,1122 **** /usr/include/stdlib.h /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h m_pd.h - s_audio_pa.o: s_audio_pa.c m_pd.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ - /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h ../portaudio/pa_common/portaudio.h \ - s_audio_pablio.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h ../portaudio/pablio/ringbuffer.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h - s_audio_pablio.o: s_audio_pablio.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h ../portaudio/pa_common/portaudio.h \ - s_audio_paring.h ../portaudio/pablio/ringbuffer.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h s_audio_pablio.h - s_audio_paring.o: s_audio_paring.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h s_audio_paring.h \ - ../portaudio/pablio/ringbuffer.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h - pa_allocation.o: ../portaudio/pa_common/pa_allocation.c \ - ../portaudio/pa_common/pa_allocation.h ../portaudio/pa_common/pa_util.h \ - ../portaudio/pa_common/portaudio.h - pa_converters.o: ../portaudio/pa_common/pa_converters.c \ - ../portaudio/pa_common/pa_converters.h \ - ../portaudio/pa_common/portaudio.h ../portaudio/pa_common/pa_dither.h \ - ../portaudio/pa_common/pa_endianness.h \ - ../portaudio/pa_common/pa_types.h - pa_cpuload.o: ../portaudio/pa_common/pa_cpuload.c \ - ../portaudio/pa_common/pa_cpuload.h /usr/include/assert.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h ../portaudio/pa_common/pa_util.h \ - ../portaudio/pa_common/portaudio.h - pa_dither.o: ../portaudio/pa_common/pa_dither.c \ - ../portaudio/pa_common/pa_dither.h - pa_front.o: ../portaudio/pa_common/pa_front.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/memory.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ - /usr/include/assert.h ../portaudio/pa_common/portaudio.h \ - ../portaudio/pa_common/pa_util.h ../portaudio/pa_common/pa_endianness.h \ - ../portaudio/pa_common/pa_types.h ../portaudio/pa_common/pa_hostapi.h \ - ../portaudio/pa_common/pa_stream.h ../portaudio/pa_common/pa_trace.h - pa_process.o: ../portaudio/pa_common/pa_process.c /usr/include/assert.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/string.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/stdlib.h \ - ../portaudio/pa_common/pa_process.h ../portaudio/pa_common/portaudio.h \ - ../portaudio/pa_common/pa_converters.h \ - ../portaudio/pa_common/pa_dither.h ../portaudio/pa_common/pa_util.h - pa_skeleton.o: ../portaudio/pa_common/pa_skeleton.c /usr/include/string.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/stdlib.h \ - ../portaudio/pa_common/pa_util.h ../portaudio/pa_common/portaudio.h \ - ../portaudio/pa_common/pa_allocation.h \ - ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/pa_stream.h \ - ../portaudio/pa_common/pa_cpuload.h ../portaudio/pa_common/pa_process.h \ - ../portaudio/pa_common/pa_converters.h \ - ../portaudio/pa_common/pa_dither.h - pa_stream.o: ../portaudio/pa_common/pa_stream.c \ - ../portaudio/pa_common/pa_stream.h ../portaudio/pa_common/portaudio.h - pa_trace.o: ../portaudio/pa_common/pa_trace.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h ../portaudio/pa_common/pa_trace.h - pa_unix_hostapis.o: ../portaudio/pa_unix/pa_unix_hostapis.c \ - ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/portaudio.h - pa_unix_util.o: ../portaudio/pa_unix/pa_unix_util.c \ - /usr/include/pthread.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/sched.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/time.h \ - /usr/include/bits/sched.h /usr/include/bits/time.h \ - /usr/include/signal.h /usr/include/bits/sigset.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/initspin.h \ - /usr/include/bits/sigthread.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/sys/sysmacros.h /usr/include/alloca.h \ - /usr/include/sys/time.h /usr/include/assert.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - ../portaudio/pa_common/pa_util.h ../portaudio/pa_common/portaudio.h \ - ../portaudio/pa_unix/pa_unix_util.h ../portaudio/pa_common/pa_cpuload.h - pa_unix_oss.o: ../portaudio/pa_unix_oss/pa_unix_oss.c \ - /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/sys/ioctl.h \ - /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ - /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ - /usr/include/sys/ttydefaults.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/pthread.h /usr/include/sched.h \ - /usr/include/signal.h /usr/include/bits/initspin.h \ - /usr/include/bits/sigthread.h /usr/include/alloca.h \ - /usr/include/malloc.h /usr/include/assert.h /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/sys/stat.h \ - /usr/include/bits/stat.h /usr/include/sys/poll.h \ - /usr/include/bits/poll.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ - /usr/include/limits.h /usr/include/bits/posix1_lim.h \ - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ - /usr/include/bits/posix2_lim.h /usr/include/semaphore.h \ - /usr/include/linux/soundcard.h /usr/include/linux/ioctl.h \ - ../portaudio/pa_common/portaudio.h ../portaudio/pa_common/pa_util.h \ - ../portaudio/pa_common/pa_allocation.h \ - ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/pa_stream.h \ - ../portaudio/pa_common/pa_cpuload.h ../portaudio/pa_common/pa_process.h \ - ../portaudio/pa_common/pa_converters.h \ - ../portaudio/pa_common/pa_dither.h ../portaudio/pa_unix/pa_unix_util.h s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ --- 913,916 ---- *************** *** 1241,1296 **** /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ /usr/include/sched.h s_audio_alsa.h - pa_linux_alsa.o: ../portaudio/pa_linux_alsa/pa_linux_alsa.c \ - /usr/include/alsa/asoundlib.h /usr/include/unistd.h \ - /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/bits/typesizes.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/stdio.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \ - /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ - /usr/include/alsa/global.h /usr/include/alsa/input.h \ - /usr/include/alsa/output.h /usr/include/alsa/error.h \ - /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \ - /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \ - /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \ - /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \ - /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \ - /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \ - /usr/include/alsa/instr.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ - /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ - /usr/include/limits.h /usr/include/bits/posix1_lim.h \ - /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ - /usr/include/bits/posix2_lim.h /usr/include/math.h \ - /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ - /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ - /usr/include/pthread.h /usr/include/sched.h /usr/include/signal.h \ - /usr/include/bits/initspin.h /usr/include/bits/sigthread.h \ - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ - /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ - /usr/include/sys/mman.h /usr/include/bits/mman.h \ - ../portaudio/pa_common/portaudio.h ../portaudio/pa_common/pa_util.h \ - ../portaudio/pa_unix/pa_unix_util.h ../portaudio/pa_common/pa_cpuload.h \ - ../portaudio/pa_common/pa_allocation.h \ - ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/pa_stream.h \ - ../portaudio/pa_common/pa_process.h \ - ../portaudio/pa_common/pa_converters.h \ - ../portaudio/pa_common/pa_dither.h \ - ../portaudio/pa_linux_alsa/pa_linux_alsa.h --- 1035,1036 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.in 30 May 2005 03:04:17 -0000 1.9 --- configure.in 30 May 2005 04:37:25 -0000 1.10 *************** *** 78,88 **** echo "pthreads required" || exit 1) - - dnl Find paths to includes and libraries for X11 - AC_PATH_X - dnl Checking for `XCreateWindow' function in -lX11: - AC_CHECK_LIB(X11, XCreateWindow, LIBS="$LIBS -lX11 -L$x_libraries", - echo "no X11 found" || exit 1, -L$x_libraries) - dnl look for tcl 8.x... do I really have to go through all this!? --- 78,81 ---- *************** *** 231,242 **** -I../portmidi/porttime \ -Wno-error \ ! -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" SYSSRC="s_midi_pm.c s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ ! ../portaudio/pa_common/pa_lib.c \ ! ../portaudio/pa_common/pa_trace.c \ ! ../portaudio/pa_common/pa_convert.c \ ! ../portaudio/pa_mac_core/pa_mac_core.c \ ../portmidi/pm_mac/pmmac.c \ ../portmidi/pm_mac/pmmacosxcm.c \ --- 224,243 ---- -I../portmidi/porttime \ -Wno-error \ ! -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19" SYSSRC="s_midi_pm.c s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \ ! ../portaudio/pa_common/pa_allocation.c \ ! ../portaudio/pa_common/pa_converters.c \ ! ../portaudio/pa_common/pa_cpuload.c \ ! ../portaudio/pa_common/pa_dither.c \ ! ../portaudio/pa_common/pa_front.c \ ! ../portaudio/pa_common/pa_process.c \ ! ../portaudio/pa_common/pa_skeleton.c \ ! ../portaudio/pa_common/pa_stream.c \ ! ../portaudio/pa_common/pa_trace.c \ ! ../portaudio/pa_unix/pa_unix_util.c \ ! ../portaudio/pa_mac_core/pa_mac_core.c \ ! ../portaudio/pa_mac/pa_mac_hostapis.c \ ../portmidi/pm_mac/pmmac.c \ ../portmidi/pm_mac/pmmacosxcm.c \

1 0

pd/src configure.in, 1.8, 1.9 d_fft.c, 1.2, 1.3 d_soundfile.c, 1.4, 1.5 g_array.c, 1.5, 1.6 g_template.c, 1.6, 1.7 makefile, 1.11, 1.12 makefile.dependencies, 1.3, 1.4 makefile.nt, 1.2, 1.3 notes.txt, 1.10, 1.11 s_file.c, 1.4, 1.5 s_inter.c, 1.8, 1.9 s_loader.c, 1.5, 1.6 s_main.c, 1.11, 1.12 s_midi_pm.c, 1.4, 1.5 x_connective.c, 1.4, 1.5 x_net.c, 1.2, 1.3
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/src Modified Files: configure.in d_fft.c d_soundfile.c g_array.c g_template.c makefile makefile.dependencies makefile.nt notes.txt s_file.c s_inter.c s_loader.c s_main.c s_midi_pm.c x_connective.c x_net.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though. Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** s_loader.c 18 May 2005 04:28:51 -0000 1.5 --- s_loader.c 30 May 2005 03:04:19 -0000 1.6 *************** *** 136,140 **** ret = NSLinkModule( image, filename, NSLINKMODULE_OPTION_BINDNOW | - //NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR); --- 136,139 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.in 18 May 2005 04:28:50 -0000 1.8 --- configure.in 30 May 2005 03:04:17 -0000 1.9 *************** *** 5,8 **** --- 5,9 ---- AC_SUBST(jack, no) AC_SUBST(portaudio, no) + AC_SUBST(portmidi, no) AC_SUBST(binarymode, -m755) AC_SUBST(PDLIB) *************** *** 28,31 **** --- 29,34 ---- AC_ARG_ENABLE(portaudio,[ --enable-portaudio portaudio], portaudio=$enableval) + AC_ARG_ENABLE(portmidi, [ --enable-portmidi portmidi], + portmidi=$enableval) AC_ARG_ENABLE(debug, [ --enable-debug debugging support], USE_DEBUG_CFLAGS="no") *************** *** 167,171 **** -DUSEAPI_OSS \ -I../portaudio/pa_common -I../portaudio/pablio \ ! -I../portaudio/portmidi-macosx \ -fno-strict-aliasing" SYSSRC="s_midi_oss.c s_audio_oss.c" --- 170,175 ---- -DUSEAPI_OSS \ -I../portaudio/pa_common -I../portaudio/pablio \ ! -I../portmidi/pm_common \ ! -I../portmidi/pm_linux \ -fno-strict-aliasing" SYSSRC="s_midi_oss.c s_audio_oss.c" *************** *** 223,228 **** EXT=pd_darwin MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ ! -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \ ! -I../portmidi_osx \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" --- 227,233 ---- EXT=pd_darwin MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ ! -I../portaudio/pa_common -I../portaudio/pablio \ ! -I../portmidi/pm_common -I../portmidi/pm_mac \ ! -I../portmidi/porttime \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN" *************** *** 230,242 **** s_audio_pablio.c \ s_audio_paring.c \ ! ../portaudio_v18/pa_common/pa_lib.c \ ! ../portaudio_v18/pa_common/pa_trace.c \ ! ../portaudio_v18/pa_common/pa_convert.c \ ! ../portaudio_v18/pa_mac_core/pa_mac_core.c \ ! ../portmidi_osx/pmdarwin.c \ ! ../portmidi_osx/pmmacosx.c \ ! ../portmidi_osx/pmutil.c \ ! ../portmidi_osx/portmidi.c \ ! ../portmidi_osx/ptdarwin.c " STRIPFLAG="" GUINAME="pdtcl" --- 235,247 ---- s_audio_pablio.c \ s_audio_paring.c \ ! ../portaudio/pa_common/pa_lib.c \ ! ../portaudio/pa_common/pa_trace.c \ ! ../portaudio/pa_common/pa_convert.c \ ! ../portaudio/pa_mac_core/pa_mac_core.c \ ! ../portmidi/pm_mac/pmmac.c \ ! ../portmidi/pm_mac/pmmacosxcm.c \ ! ../portmidi/pm_common/pmutil.c \ ! ../portmidi/pm_common/portmidi.c \ ! ../portmidi/porttime/ptmacosx_cf.c " STRIPFLAG="" GUINAME="pdtcl" Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** s_main.c 18 May 2005 04:28:51 -0000 1.11 --- s_main.c 30 May 2005 03:04:19 -0000 1.12 *************** *** 52,61 **** int sys_oldtclversion; /* hack to warn g_rtext.c about old text sel */ ! int sys_nmidiout = 1; ! #ifdef MSW ! int sys_nmidiin = 0; ! #else ! int sys_nmidiin = 1; ! #endif int sys_midiindevlist[MAXMIDIINDEV] = {1}; int sys_midioutdevlist[MAXMIDIOUTDEV] = {1}; --- 52,57 ---- int sys_oldtclversion; /* hack to warn g_rtext.c about old text sel */ ! int sys_nmidiout = -1; ! int sys_nmidiin = -1; int sys_midiindevlist[MAXMIDIINDEV] = {1}; int sys_midioutdevlist[MAXMIDIOUTDEV] = {1}; *************** *** 922,927 **** --- 918,925 ---- audiooutdev[i] = sys_soundoutdevlist[i]; } + sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev); if (sys_nmidiin >= 0) { + post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev); nmidiindev = sys_nmidiin; for (i = 0; i < nmidiindev; i++) Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** s_file.c 18 May 2005 04:28:51 -0000 1.4 --- s_file.c 30 May 2005 03:04:18 -0000 1.5 *************** *** 312,330 **** /* load MIDI preferences */ ! for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) { sprintf(keybuf, "midiindev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; ! if (sscanf(prefbuf, "%d %d", &midiindev[i], &chindev[i]) < 2) break; nmidiindev++; } ! for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++) { sprintf(keybuf, "midioutdev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; ! if (sscanf(prefbuf, "%d %d", &midioutdev[i], &choutdev[i]) < 2) break; nmidioutdev++; --- 312,334 ---- /* load MIDI preferences */ ! if (sys_getpreference("nomidiin", prefbuf, MAXPDSTRING)) ! nmidiindev = 0; ! else for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) { sprintf(keybuf, "midiindev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; ! if (sscanf(prefbuf, "%d", &midiindev[i]) < 1) break; nmidiindev++; } ! if (sys_getpreference("nomidiout", prefbuf, MAXPDSTRING)) ! nmidioutdev = 0; ! else for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++) { sprintf(keybuf, "midioutdev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; ! if (sscanf(prefbuf, "%d", &midioutdev[i]) < 1) break; nmidioutdev++; Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.nt 6 Sep 2004 20:20:35 -0000 1.2 --- makefile.nt 30 May 2005 03:04:18 -0000 1.3 *************** *** 17,21 **** GLIB = $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ LFLAGS = /nologo --- 17,21 ---- GLIB = $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \ ! -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ -DPA19 LFLAGS = /nologo *************** *** 40,44 **** PADIR = ..\portaudio INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio ! SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp --- 40,55 ---- PADIR = ..\portaudio INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio ! SRCPA = $(PADIR)/pa_common/pa_stream.c \ ! $(PADIR)/pa_common/pa_trace.c \ ! $(PADIR)/pa_common/pa_skeleton.c \ ! $(PADIR)/pa_common/pa_process.c \ ! $(PADIR)/pa_common/pa_front.c \ ! $(PADIR)/pa_common/pa_dither.c \ ! $(PADIR)/pa_common/pa_cpuload.c \ ! $(PADIR)/pa_common/pa_converters.c \ ! $(PADIR)/pa_win/pa_win_util.c \ ! $(PADIR)/pa_win/pa_win_hostapis.c \ ! $(PADIR)/pa_common/pa_allocation.c ! SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp *************** *** 48,52 **** ! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj --- 59,65 ---- ! PAOBJ = pa_stream.obj pa_trace.obj pa_skeleton.obj pa_process.obj \ ! pa_front.obj pa_dither.obj pa_cpuload.obj pa_converters.obj \ ! pa_allocation.obj pa_win_util.obj pa_win_hostapis.obj pa_asio.obj *************** *** 90,102 **** # explicit rules to compile portaudio sources: ! pa_lib.obj: $(PADIR)\pa_common\pa_lib.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c pa_trace.obj: $(PADIR)\pa_common\pa_trace.c cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c ! pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c ! ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c ! cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp --- 103,129 ---- # explicit rules to compile portaudio sources: ! pa_stream.obj: $(PADIR)\pa_common\pa_stream.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_stream.c pa_trace.obj: $(PADIR)\pa_common\pa_trace.c cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c ! pa_skeleton.obj: $(PADIR)\pa_common\pa_skeleton.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_skeleton.c ! pa_process.obj: $(PADIR)\pa_common\pa_process.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_process.c ! pa_front.obj: $(PADIR)\pa_common\pa_front.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_front.c ! pa_dither.obj: $(PADIR)\pa_common\pa_dither.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_dither.c ! pa_cpuload.obj: $(PADIR)\pa_common\pa_cpuload.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_cpuload.c ! pa_converters.obj: $(PADIR)\pa_common\pa_converters.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_converters.c ! pa_allocation.obj: $(PADIR)\pa_common\pa_allocation.c ! cl /c $(ALLCF) $(PADIR)\pa_common\pa_allocation.c + pa_win_util.obj: $(PADIR)\pa_win\pa_win_util.c + cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_util.c + pa_win_hostapis.obj: $(PADIR)\pa_win\pa_win_hostapis.c + cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_hostapis.c pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** s_inter.c 18 May 2005 04:28:51 -0000 1.8 --- s_inter.c 30 May 2005 03:04:18 -0000 1.9 *************** *** 19,22 **** --- 19,23 ---- #include <sys/time.h> #include <sys/mman.h> + #include <sys/resource.h> #endif #ifdef HAVE_BSTRING_H *************** *** 279,282 **** --- 280,289 ---- #ifdef _POSIX_MEMLOCK + /* tb: force memlock to physical memory { */ + struct rlimit mlock_limit; + mlock_limit.rlim_cur=0; + mlock_limit.rlim_max=0; + setrlimit(RLIMIT_MEMLOCK,&mlock_limit); + /* } tb */ if (mlockall(MCL_FUTURE) != -1) fprintf(stderr, "memory locking enabled.\n"); Index: d_fft.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** d_fft.c 6 Sep 2004 20:20:33 -0000 1.2 --- d_fft.c 30 May 2005 03:04:17 -0000 1.3 *************** *** 5,8 **** --- 5,39 ---- #include "m_pd.h" + /* ---------------- utility functions for DSP chains ---------------------- */ + + /* swap two arrays */ + static t_int *sigfft_swap(t_int *w) + { + float *in1 = (t_float *)(w[1]); + float *in2 = (t_float *)(w[2]); + int n = w[3]; + for (;n--; in1++, in2++) + { + float f = *in1; + *in1 = *in2; + *in2 = f; + } + return (w+4); + } + + /* take array1 (supply a pointer to beginning) and copy it, + into decreasing addresses, into array 2 (supply a pointer one past the + end), and negate the sign. */ + + static t_int *sigrfft_flip(t_int *w) + { + float *in = (t_float *)(w[1]); + float *out = (t_float *)(w[2]); + int n = w[3]; + while (n--) + *(--out) = - *in++; + return (w+4); + } + /* ------------------------ fft~ and ifft~ -------------------------------- */ static t_class *sigfft_class, *sigifft_class; *************** *** 34,51 **** } - static t_int *sigfft_swap(t_int *w) - { - float *in1 = (t_float *)(w[1]); - float *in2 = (t_float *)(w[2]); - int n = w[3]; - for (;n--; in1++, in2++) - { - float f = *in1; - *in1 = *in2; - *in2 = f; - } - return (w+4); - } - static t_int *sigfft_perform(t_int *w) { --- 65,68 ---- *************** *** 131,144 **** } - static t_int *sigrfft_flip(t_int *w) - { - float *in = (t_float *)(w[1]); - float *out = (t_float *)(w[2]); - int n = w[3]; - while (n--) *(--out) = *in++; - *(--out) = 0; /* to hell with it */ - return (w+4); - } - static t_int *sigrfft_perform(t_int *w) { --- 148,151 ---- *************** *** 160,177 **** return; } ! if (in1 == out2) /* this probably never happens */ ! { ! dsp_add(sigrfft_perform, 2, out2, n); ! dsp_add(copy_perform, 3, out2, out1, n2); ! dsp_add(sigrfft_flip, 3, out2 + (n2+1), out2 + n2, n2-1); ! } ! else ! { ! if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n); ! dsp_add(sigrfft_perform, 2, out1, n); ! dsp_add(sigrfft_flip, 3, out1 + (n2+1), out2 + n2, n2-1); ! } ! dsp_add_zero(out1 + n2, n2); dsp_add_zero(out2 + n2, n2); } --- 167,178 ---- return; } ! if (in1 != out1) ! dsp_add(copy_perform, 3, in1, out1, n); ! dsp_add(sigrfft_perform, 2, out1, n); ! dsp_add(sigrfft_flip, 3, out1 + (n2+1), out2 + n2, n2-1); ! dsp_add_zero(out1 + (n2+1), ((n2-1)&(~7))); ! dsp_add_zero(out1 + (n2+1) + ((n2-1)&(~7)), ((n2-1)&7)); dsp_add_zero(out2 + n2, n2); + dsp_add_zero(out2, 1); } *************** *** 225,234 **** if (in2 == out1) { ! dsp_add(sigrfft_flip, 3, out1+1, out1 + n, (n2-1)); ! dsp_add(copy_perform, 3, in1, out1, n2); } else { ! if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n2); dsp_add(sigrfft_flip, 3, in2+1, out1 + n, n2-1); } --- 226,235 ---- if (in2 == out1) { ! dsp_add(sigrfft_flip, 3, out1+1, out1 + n, n2-1); ! dsp_add(copy_perform, 3, in1, out1, n2+1); } else { ! if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n2+1); dsp_add(sigrfft_flip, 3, in2+1, out1 + n, n2-1); } Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile 18 May 2005 04:28:51 -0000 1.11 --- makefile 30 May 2005 03:04:18 -0000 1.12 *************** *** 11,19 **** MANDIR = ${prefix}/man ! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portaudio/portmidi-macosx -fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA INCLUDE = -I. GINCLUDE = $(INCLUDE) ! GLIB = -ltk8.4 -ltcl8.4 -lX11 -L/usr/X11R6/lib -lrt LDFLAGS = -Wl,-export-dynamic -lasound --- 11,19 ---- MANDIR = ${prefix}/man ! MORECFLAGS = -DUSEAPI_PORTAUDIO -DPA19 -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_linux -fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA -Wno-error INCLUDE = -I. GINCLUDE = $(INCLUDE) ! GLIB = -ltk8.4 -ltcl8.4 -lX11 -L/usr/X11R6/lib LDFLAGS = -Wl,-export-dynamic -lasound *************** *** 29,33 **** # the sources ! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ --- 29,33 ---- # the sources ! SYSSRC += s_audio_pa.c s_audio_pablio.c s_audio_paring.c ../portaudio/pa_common/pa_allocation.c ../portaudio/pa_common/pa_converters.c ../portaudio/pa_common/pa_cpuload.c ../portaudio/pa_common/pa_dither.c ../portaudio/pa_common/pa_front.c ../portaudio/pa_common/pa_process.c ../portaudio/pa_common/pa_skeleton.c ../portaudio/pa_common/pa_stream.c ../portaudio/pa_common/pa_trace.c ../portaudio/pa_unix/pa_unix_hostapis.c ../portaudio/pa_unix/pa_unix_util.c ../portaudio/pa_unix_oss/pa_unix_oss.c s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c ../portaudio/pa_linux_alsa/pa_linux_alsa.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** s_midi_pm.c 6 Sep 2004 20:20:36 -0000 1.4 --- s_midi_pm.c 30 May 2005 03:04:19 -0000 1.5 *************** *** 61,65 **** { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], ! j, NULL, 100, NULL, NULL, NULL); if (err) post("could not open midi input %d (%s): %s", --- 61,65 ---- { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], ! j, NULL, 100, NULL, NULL); if (err) post("could not open midi input %d (%s): %s", *************** *** 259,277 **** } - #if 0 - void sys_listmididevs(void) /* lifted from pa_devs.c in portaudio */ - { - int i,j; - for (i = 0; i < Pm_CountDevices(); i++) - { - const PmDeviceInfo *info = Pm_GetDeviceInfo(i); - printf("%d: %s, %s", i, info->interf, info->name); - if (info->input) printf(" (input)"); - if (info->output) printf(" (output)"); - printf("\n"); - } - } - #endif - void midi_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize) --- 259,262 ---- Index: notes.txt =================================================================== RCS file: /cvsroot/pure-data/pd/src/notes.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** notes.txt 18 May 2005 04:28:51 -0000 1.10 --- notes.txt 30 May 2005 03:04:18 -0000 1.11 *************** *** 4,7 **** --- 4,11 ---- array elements can be clicked on, etc fixed array onset bug + rfft bug fix + + check: + MIDI I/O for windows At the source level, "regular" arrays and arrays withing data structures *************** *** 24,27 **** --- 28,33 ---- problems: + Macintosh .pd extension not added to filenames + need to optimize canvas_motion (get rid of box hit test??) check if there's a problem loading libs on startup if superuser tk errors for large tables? Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** g_array.c 18 May 2005 04:28:50 -0000 1.5 --- g_array.c 30 May 2005 03:04:17 -0000 1.6 *************** *** 81,84 **** --- 81,85 ---- char *cp = x->a_vec + elemsize * oldn; int i = n - oldn; + post("%d->%d", oldn, i); for (; i--; cp += elemsize) { *************** *** 469,473 **** { yval = *(float *)(a->a_vec + ! elemsize * i * sizeof (t_word) + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, --- 470,474 ---- { yval = *(float *)(a->a_vec + ! elemsize * i + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, *************** *** 513,517 **** { yval = *(float *)(a->a_vec + \ ! elemsize * i * sizeof (t_word) + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, --- 514,518 ---- { yval = *(float *)(a->a_vec + \ ! elemsize * i + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, Index: x_net.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_net.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** x_net.c 6 Sep 2004 20:20:36 -0000 1.2 --- x_net.c 30 May 2005 03:04:19 -0000 1.3 *************** *** 82,86 **** intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } --- 82,86 ---- intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } *************** *** 274,278 **** intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (SO_REUSEADDR) failed\n"); #endif --- 274,278 ---- intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (SO_REUSEADDR) failed\n"); #endif *************** *** 288,292 **** intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! &intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } --- 288,292 ---- intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, ! (char *)&intarg, sizeof(intarg)) < 0) post("setsockopt (TCP_NODELAY) failed\n"); } Index: makefile.dependencies =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.dependencies,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.dependencies 18 May 2005 04:28:51 -0000 1.3 --- makefile.dependencies 30 May 2005 03:04:18 -0000 1.4 *************** *** 0 **** --- 1,1296 ---- + g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ + /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ + /usr/include/sys/types.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ [...1267 lines suppressed...] + /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ + /usr/include/limits.h /usr/include/bits/posix1_lim.h \ + /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ + /usr/include/bits/posix2_lim.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ + /usr/include/pthread.h /usr/include/sched.h /usr/include/signal.h \ + /usr/include/bits/initspin.h /usr/include/bits/sigthread.h \ + /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ + /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ + /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ + /usr/include/sys/mman.h /usr/include/bits/mman.h \ + ../portaudio/pa_common/portaudio.h ../portaudio/pa_common/pa_util.h \ + ../portaudio/pa_unix/pa_unix_util.h ../portaudio/pa_common/pa_cpuload.h \ + ../portaudio/pa_common/pa_allocation.h \ + ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/pa_stream.h \ + ../portaudio/pa_common/pa_process.h \ + ../portaudio/pa_common/pa_converters.h \ + ../portaudio/pa_common/pa_dither.h \ + ../portaudio/pa_linux_alsa/pa_linux_alsa.h Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** d_soundfile.c 6 Sep 2004 20:20:33 -0000 1.4 --- d_soundfile.c 30 May 2005 03:04:17 -0000 1.5 *************** *** 31,35 **** typedef unsigned short uint16; ! typedef unsigned long uint32; #define FORMAT_WAVE 0 --- 31,35 ---- typedef unsigned short uint16; ! typedef unsigned int uint32; #define FORMAT_WAVE 0 Index: x_connective.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** x_connective.c 6 Nov 2004 16:07:34 -0000 1.4 --- x_connective.c 30 May 2005 03:04:19 -0000 1.5 *************** *** 972,993 **** t_triggerout *u; int i; - t_atom at; - if (!argc) - { - argc = 1; - SETFLOAT(&at, 0); - argv = &at; - } for (i = x->x_n, u = x->x_vec + i; u--, i--;) { if (u->u_type == TR_FLOAT) ! outlet_float(u->u_outlet, atom_getfloat(argv)); else if (u->u_type == TR_BANG) outlet_bang(u->u_outlet); else if (u->u_type == TR_SYMBOL) ! outlet_symbol(u->u_outlet, atom_getsymbol(argv)); else if (u->u_type == TR_POINTER) { ! if (argv->a_type != TR_POINTER) pd_error(x, "unpack: bad pointer"); else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer); --- 972,986 ---- t_triggerout *u; int i; for (i = x->x_n, u = x->x_vec + i; u--, i--;) { if (u->u_type == TR_FLOAT) ! outlet_float(u->u_outlet, (argc ? atom_getfloat(argv) : 0)); else if (u->u_type == TR_BANG) outlet_bang(u->u_outlet); else if (u->u_type == TR_SYMBOL) ! outlet_symbol(u->u_outlet, (argc ? atom_getsymbol(argv) : 0)); else if (u->u_type == TR_POINTER) { ! if (!argc || argv->a_type != TR_POINTER) pd_error(x, "unpack: bad pointer"); else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer); Index: g_template.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_template.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** g_template.c 18 May 2005 04:28:51 -0000 1.6 --- g_template.c 30 May 2005 03:04:18 -0000 1.7 *************** *** 483,486 **** --- 483,501 ---- } + #if 0 + /* bash the first of (argv) with a pointer to a scalar, and send on + to template as a notification message */ + static void template_notifyforscalar(t_template *template, t_glist *owner, + t_scalar *sc, t_symbol *s, int argc, t_atom *argv) + { + t_gpointer gp; + gpointer_init(&gp); + gpointer_setglist(&gp, owner, x); + SETPOINTER(argv, &gp); + template_notify(template, s, argc, argv); + gpointer_unset(&gp); + } + #endif + /* call this when reading a patch from a file to declare what templates we'll need. If there's already a template, check if it matches. *************** *** 1900,1903 **** --- 1915,1921 ---- t_drawnumber *x = (t_drawnumber *)z; t_atom at; + int xloc, yloc, font, fontwidth, fontheight; + char buf[DRAWNUMBER_BUFSIZE]; + if (!x->x_vis) { *************** *** 1906,1916 **** return; } ! int xloc = glist_xtopixels(glist, basex + fielddesc_getfloat(&x->x_xloc, template, data, 0)); ! int yloc = glist_ytopixels(glist, basey + fielddesc_getfloat(&x->x_yloc, template, data, 0)); ! int font = glist_getfont(glist); ! int fontwidth = sys_fontwidth(font), fontheight = sys_fontheight(font); ! char buf[DRAWNUMBER_BUFSIZE]; if (x->x_flags & DRAW_SYMBOL) SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0)); --- 1924,1934 ---- return; } ! xloc = glist_xtopixels(glist, basex + fielddesc_getfloat(&x->x_xloc, template, data, 0)); ! yloc = glist_ytopixels(glist, basey + fielddesc_getfloat(&x->x_yloc, template, data, 0)); ! font = glist_getfont(glist); ! fontwidth = sys_fontwidth(font); ! fontheight = sys_fontheight(font); if (x->x_flags & DRAW_SYMBOL) SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0));

1 0

pd/portaudio_v18/pablio pablio.c, 1.8, 1.9 pablio.h, 1.8, 1.9 ringbuffer.c, 1.8, 1.9 ringbuffer.h, 1.8, 1.9 test_rw.c, 1.8, 1.9 test_rw_echo.c, 1.8, 1.9 test_w_saw.c, 1.8, 1.9 test_w_saw8.c, 1.8, 1.9
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pablio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio_v18/pablio Modified Files: pablio.c pablio.h ringbuffer.c ringbuffer.h test_rw.c test_rw_echo.c test_w_saw.c test_w_saw8.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

1 0

pd/portaudio_v18/pa_win_wmme pa_win_wmme.c,1.8,1.9
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_win_wmme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio_v18/pa_win_wmme Modified Files: pa_win_wmme.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

1 0

pd/portaudio_v18/pa_win_ds dsound_wrapper.c, 1.8, 1.9 dsound_wrapper.h, 1.8, 1.9 pa_dsound.c, 1.8, 1.9
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_win_ds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio_v18/pa_win_ds Modified Files: dsound_wrapper.c dsound_wrapper.h pa_dsound.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

1 0

pd/portaudio_v18/pa_sgi pa_sgi.c,1.8,1.9
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_sgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio_v18/pa_sgi Modified Files: pa_sgi.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

1 0

pd/portaudio_v18/pa_mac_core pa_mac_core.c,1.8,1.9
by Miller Puckette 30 May '05

30 May '05

Update of /cvsroot/pure-data/pd/portaudio_v18/pa_mac_core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio_v18/pa_mac_core Modified Files: pa_mac_core.c Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

1 0

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 May 2005