Pd-cvs August 2004

pd-cvs@lists.iem.at

10 participants
171 discussions

abstractions/footils/foo foo.scale.pd,NONE,1.1
by Frank Barknecht 20 Aug '04

20 Aug '04

Update of /cvsroot/pure-data/abstractions/footils/foo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16911 Added Files: foo.scale.pd Log Message: simplyfied maxlib.scale clone --- NEW FILE: foo.scale.pd --- #N canvas 542 303 677 498 10; #X obj 352 92 f \$1; #X obj 464 94 f \$4; #X obj 426 94 f \$3; #X obj 386 92 f \$2; #X obj 300 142 s \$0-il; #X obj 354 140 s \$0-ih; #X obj 476 134 s \$0-oh; #X obj 412 138 s \$0-ol; #X obj 375 185 -; #X obj 384 161 t b f; #X obj 461 248 s \$0-ir; #X obj 461 199 -; #X obj 462 169 t b f; #X obj 521 248 s \$0-or; #X obj 61 206 spigot; #X obj 372 214 select 0; #X obj 98 174 r \$0-ir; #X obj 423 285 t b f; #X obj 423 324 /; #X obj 423 365 s \$0-k; #X obj 61 55 inlet; #X obj 77 354 r \$0-ol; #X obj 61 382 +; #X obj 77 306 r \$0-k; #X obj 61 331 *; #X obj 61 273 -; #X obj 77 240 r \$0-il; #X obj 61 423 outlet; #X msg 275 403 WARNING: Input range of 0 detected. Object might block! ; #X obj 318 45 inlet; #X obj 422 45 inlet; #X obj 472 45 inlet; #X obj 522 43 inlet; #X obj 371 28 t b b; #X obj 368 5 loadbang; #X text 118 28 ARGS; #X text 128 52 1: input_low_border; #X text 128 74 2: input_high_border; #X text 128 100 3: output_low_border; #X text 128 122 4: output_high_border; #X obj 268 437 print \$0-scaler; #X connect 0 0 4 0; #X connect 0 0 8 0; #X connect 1 0 6 0; #X connect 1 0 12 0; #X connect 2 0 7 0; #X connect 2 0 11 0; #X connect 3 0 5 0; #X connect 3 0 9 0; #X connect 8 0 15 0; #X connect 9 0 8 0; #X connect 9 1 8 1; #X connect 11 0 13 0; #X connect 11 0 18 0; #X connect 12 0 11 0; #X connect 12 1 11 1; #X connect 14 0 25 0; #X connect 15 0 28 0; #X connect 15 1 10 0; #X connect 15 1 17 0; #X connect 16 0 14 1; #X connect 17 0 18 0; #X connect 17 1 18 1; #X connect 18 0 19 0; #X connect 20 0 14 0; #X connect 21 0 22 1; #X connect 22 0 27 0; #X connect 23 0 24 1; #X connect 24 0 22 0; #X connect 25 0 24 0; #X connect 26 0 25 1; #X connect 28 0 40 0; #X connect 29 0 0 0; #X connect 30 0 3 0; #X connect 31 0 2 0; #X connect 32 0 1 0; #X connect 33 0 0 0; #X connect 33 0 2 0; #X connect 33 1 1 0; #X connect 33 1 3 0; #X connect 34 0 33 0;

1 0

externals/OSCx/send+dump dumpOSC.c,1.6,1.7 dumpUDP.c,1.1.1.1,1.2 htmsocket.c,1.6,1.7 htmsocket.h,1.1.1.1,1.2 sendOSC.c,1.4,1.5
by jdl 20 Aug '04

20 Aug '04

Update of /cvsroot/pure-data/externals/OSCx/send+dump In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv855/send+dump Modified Files: dumpOSC.c dumpUDP.c htmsocket.c htmsocket.h sendOSC.c Log Message: changed offending cnmat licences to current ones (2) Index: dumpUDP.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/dumpUDP.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dumpUDP.c 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- dumpUDP.c 19 Aug 2004 22:05:58 -0000 1.2 *************** *** 1,28 **** /* ! Copyright (c) 1998. The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. dumpUDP.c: smallest UDP receiving application --- 1,27 ---- /* ! Written by Matt Wright, The Center for New Music and ! Audio Technologies, University of California, Berkeley. Copyright (c) ! 1998,99,2000,01,02,03,04 The Regents of the University of ! California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl dumpUDP.c: smallest UDP receiving application Index: htmsocket.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/htmsocket.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** htmsocket.h 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- htmsocket.h 19 Aug 2004 22:05:58 -0000 1.2 *************** *** 1,30 **** /* ! Copyright (c) 1992,1996. The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ /* htmparam.h --- 1,29 ---- /* ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ + /* htmparam.h Index: htmsocket.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/htmsocket.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** htmsocket.c 4 Apr 2004 22:10:41 -0000 1.6 --- htmsocket.c 19 Aug 2004 22:05:58 -0000 1.7 *************** *** 1,29 **** /* ! Copyright (c) 1992,1996,1998. ! The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ --- 1,26 ---- /* ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ *************** *** 35,38 **** --- 32,38 ---- Modified 6/6/96 by Matt Wright to understand symbolic host names in addition to X.X.X.X addresses. + + pd ------------ + -- added BROADCAST socket option jdl */ Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/dumpOSC.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dumpOSC.c 4 Apr 2004 22:10:41 -0000 1.6 --- dumpOSC.c 19 Aug 2004 22:05:58 -0000 1.7 *************** *** 1,31 **** /* ! Copyright (c) 1992,1993,1994,1995,1996,1997,2000. ! The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright and Adrian Freed, The Center for New Music and Audio ! Technologies, University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ /* --- 1,30 ---- /* ! Written by Matt Wright and Adrian Freed, The Center for New Music and ! Audio Technologies, University of California, Berkeley. Copyright (c) ! 1992,93,94,95,96,97,98,99,2000,01,02,03,04 The Regents of the University of ! California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ + /* *************** *** 43,47 **** to support little-endian architectures. ! compile: --- 42,46 ---- to support little-endian architectures. ! CNMAT OSX compile changes not included (20040820) jdl compile: Index: sendOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/sendOSC.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sendOSC.c 7 Apr 2004 04:15:04 -0000 1.4 --- sendOSC.c 19 Aug 2004 22:05:58 -0000 1.5 *************** *** 1,28 **** /* ! Copyright (c) 1996,1997. The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ --- 1,26 ---- /* ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */

1 0

externals/OSCx/src OSC.c,1.4,1.5 OSCroute.c,1.3,1.4 dumpOSC.c,1.3,1.4 htmsocket.c,1.3,1.4 htmsocket.h,1.2,1.3 sendOSC.c,1.3,1.4
by jdl 20 Aug '04

20 Aug '04

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32326/src Modified Files: OSC.c OSCroute.c dumpOSC.c htmsocket.c htmsocket.h sendOSC.c Log Message: changed offending cnmat licences to current one Index: htmsocket.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/htmsocket.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** htmsocket.c 4 Apr 2004 22:10:41 -0000 1.3 --- htmsocket.c 19 Aug 2004 22:01:38 -0000 1.4 *************** *** 1,29 **** /* ! Copyright (c) 1992,1996,1998. ! The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ --- 1,26 ---- /* ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ *************** *** 35,38 **** --- 32,39 ---- Modified 6/6/96 by Matt Wright to understand symbolic host names in addition to X.X.X.X addresses. + + pd: branched jdl + -- win additions raf 2002 + -- enabled broadcast jdl 2003 */ *************** *** 84,96 **** #endif - - - - - - - - - #define UNIXDG_PATH "/tmp/htm" #define UNIXDG_TMP "/tmp/htm.XXXXXX" --- 85,88 ---- *************** *** 234,238 **** cl_addr.sin_port = htons(0); ! // enable broadcast if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) { perror("setsockopt"); --- 226,230 ---- cl_addr.sin_port = htons(0); ! // enable broadcast: jdl ~2003 if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) { perror("setsockopt"); *************** *** 255,259 **** cl_addr.sin_port = htons(0); ! // enable broadcast if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) { perror("setsockopt"); --- 247,251 ---- cl_addr.sin_port = htons(0); ! // enable broadcast: jdl ~2003 if(setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &oval, sizeof(int)) == -1) { perror("setsockopt"); Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/dumpOSC.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dumpOSC.c 4 Apr 2004 22:10:41 -0000 1.3 --- dumpOSC.c 19 Aug 2004 22:01:38 -0000 1.4 *************** *** 1,31 **** /* ! Copyright (c) 1992,1993,1994,1995,1996,1997,2000. ! The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright and Adrian Freed, The Center for New Music and Audio ! Technologies, University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ /* --- 1,30 ---- /* ! Written by Matt Wright and Adrian Freed, The Center for New Music and ! Audio Technologies, University of California, Berkeley. Copyright (c) ! 1992,93,94,95,96,97,98,99,2000,01,02,03,04 The Regents of the University of ! California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ + /* *************** *** 58,64 **** Clean up to separate OSC parsing code from socket/select stuff ! pd ------------- ! -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 */ --- 57,67 ---- Clean up to separate OSC parsing code from socket/select stuff ! pd: branched from http://www.cnmat.berkeley.edu/OpenSoundControl/src/dumpOSC/dumpOSC.c ------------- ! -- added pd functions ! -- socket is made differently than original via pd mechanisms ! -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 ! -- the OSX changes from cnmat didnt make it here yet but this compiles ! on OSX anyway. */ *************** *** 71,75 **** //#include "m_imp.h" #include "s_stuff.h" - //#include "x_osc.h" /* declarations */ --- 74,77 ---- *************** *** 208,211 **** --- 210,214 ---- //while( (n = recvfrom(sockfd, mbuf, MAXMESG, 0, &cl_addr, &clilen)) >0) // while(( + #ifdef WIN32 if ((n = recvfrom(sockfd, mbuf, MAXMESG, 0, (SOCKADDR*)&x->x_server, &clilen)) >0) Index: OSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSC.c 5 Apr 2004 04:26:00 -0000 1.4 --- OSC.c 19 Aug 2004 22:01:38 -0000 1.5 *************** *** 1,8 **** /* ! ! pd ------------- -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 -- smoothed out build, clean up for Darwin <hans(a)at.or.at> 2004.04.04 */ --- 1,9 ---- /* ! OpenSoundControl for PD ------------- + -- init jdl at xdv dot org -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 -- smoothed out build, clean up for Darwin <hans(a)at.or.at> 2004.04.04 + -- shoutz: miller and the others */ Index: OSCroute.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSCroute.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSCroute.c 4 Apr 2004 22:10:41 -0000 1.3 --- OSCroute.c 19 Aug 2004 22:01:38 -0000 1.4 *************** *** 1,34 **** /* ! Copyright (c) 1999, 2000, 20010 The Regents of the University of ! California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING - DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". - REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, - ENHANCEMENTS, OR MODIFICATIONS. ! The OpenSound Control WWW page is ! http://www.cnmat.berkeley.edu/OpenSoundControl ! OSC-route.c Max object for OSC-style dispatching --- 1,29 ---- /* ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl ! */ ! /* OSC-route.c Max object for OSC-style dispatching Index: sendOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/sendOSC.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sendOSC.c 7 Apr 2004 04:15:06 -0000 1.3 --- sendOSC.c 19 Aug 2004 22:01:38 -0000 1.4 *************** *** 1,34 **** /* ! Copyright (c) 1996,1997. The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ /* sendOSC.c Matt Wright, 6/3/97 ! based on sendOSC.c, which was based on a version by Adrian Freed Text-based OpenSoundControl client. User can enter messages via command --- 1,34 ---- /* ! Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ + + /* sendOSC.c Matt Wright, 6/3/97 ! based on sendOSC.c, which was based on a version by Adrian Freed Text-based OpenSoundControl client. User can enter messages via command *************** *** 36,50 **** Version 0.1: "play" feature ! Version 0.2: Message type tags. ! ! ! pd ! ------------- ! -- added bundle stuff to send. jdl 20020416 ! -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 ! -- ost_at_test.at + i22_at_test.at, 2000-2002 ! modified to compile as pd externel ! */ --- 36,47 ---- Version 0.1: "play" feature ! Version 0.2: Message type tags. ! pd version branched from http://www.cnmat.berkeley.edu/OpenSoundControl/src/sendOSC/sendOSC.c ! ------------- ! -- added bundle stuff to send. jdl 20020416 ! -- tweaks for Win32 www.zeggz.com/raf 13-April-2002 ! -- ost_at_test.at + i22_at_test.at, 2000-2002 ! modified to compile as pd externel */ *************** *** 53,64 **** #endif - //#define VERSION "http://cnmat.berkeley.edu/OpenSoundControl/sendOSC-0.1.html" #define MAX_ARGS 2000 #define SC_BUFFER_SIZE 64000 - /* - compiling: - cc -o sendOSC sendOSC.c htmsocket.c OpenSoundControl.c OSC_timeTag.c - */ #include "m_pd.h" --- 50,56 ---- *************** *** 72,88 **** #ifdef WIN32 ! #include <winsock2.h> ! #include <io.h> ! #include <errno.h> ! #include <fcntl.h> ! #include <sys/stat.h> #else ! //#include "x_osc.h" ! ! #include <stdio.h> ! #include <sys/socket.h> ! #include <netinet/in.h> ! #include <netdb.h> ! #include <ctype.h> #endif --- 64,78 ---- #ifdef WIN32 ! #include <winsock2.h> ! #include <io.h> ! #include <errno.h> ! #include <fcntl.h> ! #include <sys/stat.h> #else ! #include <stdio.h> ! #include <sys/socket.h> ! #include <netinet/in.h> ! #include <netdb.h> ! #include <ctype.h> #endif *************** *** 101,105 **** void CommandLineMode(int argc, char *argv[], void *htmsocket); ! //void InteractiveMode(void *htmsocket); OSCTimeTag ParseTimeTag(char *s); void ParseInteractiveLine(OSCbuf *buf, char *mesg); --- 91,95 ---- void CommandLineMode(int argc, char *argv[], void *htmsocket); ! OSCTimeTag ParseTimeTag(char *s); void ParseInteractiveLine(OSCbuf *buf, char *mesg); *************** *** 261,265 **** ////////////////////////////////////////////////////////////////////// ! // this is the real and only sending routine now, for both typed and undtyped mode. static void sendOSC_sendtyped(t_sendOSC *x, t_symbol *s, int argc, t_atom *argv) --- 251,256 ---- ////////////////////////////////////////////////////////////////////// ! // this is the real and only sending routine now, for both typed and ! // undtyped mode. static void sendOSC_sendtyped(t_sendOSC *x, t_symbol *s, int argc, t_atom *argv) Index: htmsocket.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/htmsocket.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** htmsocket.h 10 Mar 2004 00:01:56 -0000 1.2 --- htmsocket.h 19 Aug 2004 22:01:38 -0000 1.3 *************** *** 1,30 **** /* ! Copyright (c) 1992,1996. The Regents of the University of California (Regents). ! All Rights Reserved. ! Permission to use, copy, modify, and distribute this software and its ! documentation for educational, research, and not-for-profit purposes, without ! fee and without a signed licensing agreement, is hereby granted, provided that ! the above copyright notice, this paragraph and the following two paragraphs ! appear in all copies, modifications, and distributions. Contact The Office of ! Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, ! CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ /* htmparam.h --- 1,29 ---- /* ! Written by Adrian Freed, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. ! ! The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl */ + /* htmparam.h

1 0

externals/OSCx/libOSC OSC-client.c,1.4,1.5 OSC-client.h,1.1.1.1,1.2 OSC-timetag.c,1.2,1.3 OSC-timetag.h,1.2,1.3 OSC-client.c.pre-htonl,1.1.1.1,NONE
by jdl 20 Aug '04

20 Aug '04

Update of /cvsroot/pure-data/externals/OSCx/libOSC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32326/libOSC Modified Files: OSC-client.c OSC-client.h OSC-timetag.c OSC-timetag.h Removed Files: OSC-client.c.pre-htonl Log Message: changed offending cnmat licences to current one Index: OSC-timetag.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSC-timetag.h 7 Apr 2004 04:15:04 -0000 1.2 --- OSC-timetag.h 19 Aug 2004 22:01:37 -0000 1.3 *************** *** 1,8 **** /* - Copyright © 1998. The Regents of the University of California (Regents). - All Rights Reserved. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Permission to use, copy, modify, distribute, and distribute modified versions --- 1,6 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1998,99,2000,01,02,03,04 ! The Regents of the University of California (Regents). Permission to use, copy, modify, distribute, and distribute modified versions *************** *** 27,31 **** */ - /* OSC_timeTag.h: library for manipulating OSC time tags --- 25,28 ---- Index: OSC-client.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-client.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSC-client.h 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- OSC-client.h 19 Aug 2004 22:01:37 -0000 1.2 *************** *** 1,28 **** /* - Copyright (c) 1996,1997. The Regents of the University of California (Regents). - All Rights Reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for educational, research, and not-for-profit purposes, without - fee and without a signed licensing agreement, is hereby granted, provided that - the above copyright notice, this paragraph and the following two paragraphs - appear in all copies, modifications, and distributions. Contact The Office of - Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, - CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ --- 1,23 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ Index: OSC-client.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-client.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSC-client.c 4 Apr 2004 22:10:41 -0000 1.4 --- OSC-client.c 19 Aug 2004 22:01:27 -0000 1.5 *************** *** 1,28 **** /* - Copyright (c) 1996. The Regents of the University of California (Regents). - All Rights Reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for educational, research, and not-for-profit purposes, without - fee and without a signed licensing agreement, is hereby granted, provided that - the above copyright notice, this paragraph and the following two paragraphs - appear in all copies, modifications, and distributions. Contact The Office of - Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, - CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */ --- 1,23 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents). ! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions. ! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ *************** *** 41,44 **** --- 36,42 ---- rev. for Win32 build (verified under Win-2ooo) 11-April-2002 + -- changed licence part (20040820) jdl + -- Version 2.4 changes not in here (20040820) jdl + */ Index: OSC-timetag.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSC-timetag.c 7 Apr 2004 04:15:04 -0000 1.2 --- OSC-timetag.c 19 Aug 2004 22:01:37 -0000 1.3 *************** *** 1,7 **** /* ! Copyright © 1998. The Regents of the University of California (Regents). ! All Rights Reserved. ! ! Written by Matt Wright, The Center for New Music and Audio Technologies, University of California, Berkeley. --- 1,5 ---- /* ! Copyright (c) 1998,99,2000,01,02,03. The Regents of the University of California (Regents). ! All Rights Reserved. Written by Matt Wright, Center for New Music and Audio Technologies, University of California, Berkeley. *************** *** 27,31 **** */ - /* --- 25,28 ---- --- OSC-client.c.pre-htonl DELETED ---

1 0

externals/OSCx/src Makefile.in,1.7,1.8
by juan d. luciano 19 Aug '04

19 Aug '04

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28103/src Modified Files: Makefile.in Log Message: fixed prefix setting via configure Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 18 Aug 2004 22:23:51 -0000 1.7 --- Makefile.in 18 Aug 2004 22:35:23 -0000 1.8 *************** *** 25,29 **** LDFLAGS = @LDFLAGS@ ! prefix=$(DESTDIR)/usr SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c OSC-system-dependent.c --- 25,29 ---- LDFLAGS = @LDFLAGS@ ! prefix=@prefix@ SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c OSC-system-dependent.c

1 0

externals/OSCx configure,1.3,1.4 configure.ac,1.3,1.4
by juan d. luciano 19 Aug '04

19 Aug '04

Update of /cvsroot/pure-data/externals/OSCx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28103 Modified Files: configure configure.ac Log Message: fixed prefix setting via configure Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.ac 5 Apr 2004 04:26:00 -0000 1.3 --- configure.ac 18 Aug 2004 22:35:22 -0000 1.4 *************** *** 141,144 **** --- 141,149 ---- ]) + if test $prefix == NONE; + then + prefix=/usr/local + fi + dnl ------------------------------------------ dnl ---- check for PureData Header Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure 5 Apr 2004 04:26:00 -0000 1.3 --- configure 18 Aug 2004 22:35:22 -0000 1.4 *************** *** 1,10 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57 for OSCxpd 0.2. # # Report bugs to <jdl(a)xdv.org>. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. [...2984 lines suppressed...] sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 5377,5384 **** as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X$//$[^/]' \| \ ! X"$as_dir" : 'X$//$$' \| \ ! X"$as_dir" : 'X$/$' \| \ ! . : '$.$' 2>/dev/null || echo X"$as_dir" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } --- 5696,5703 ---- as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X$//$[^/]' \| \ ! X"$as_dir" : 'X$//$$' \| \ ! X"$as_dir" : 'X$/$' \| \ ! . : '$.$' 2>/dev/null || echo X"$as_dir" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

1 0

externals/OSCx/src Makefile.in,1.6,1.7
by juan d. luciano 19 Aug '04

19 Aug '04

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25454 Modified Files: Makefile.in Log Message: fixed wrong pd_suffix in install target Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 7 Apr 2004 04:15:06 -0000 1.6 --- Makefile.in 18 Aug 2004 22:23:51 -0000 1.7 *************** *** 58,62 **** install: install-doc @test -d $(prefix)/lib/pd/extra || mkdir -p $(prefix)/lib/pd/extra ! install -m644 *.pd_linux $(prefix)/lib/pd/extra clean: --- 58,62 ---- install: install-doc @test -d $(prefix)/lib/pd/extra || mkdir -p $(prefix)/lib/pd/extra ! install -m644 *.@pd_suffix@ $(prefix)/lib/pd/extra clean:

1 0

pd/src g_hslider.c,1.1.1.3.2.2.2.33,1.1.1.3.2.2.2.34
by Mathieu Bouchard 18 Aug '04

18 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18254 Modified Files: Tag: impd_0_37 g_hslider.c Log Message: . Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.33 retrieving revision 1.1.1.3.2.2.2.34 diff -C2 -d -r1.1.1.3.2.2.2.33 -r1.1.1.3.2.2.2.34 *** g_hslider.c 13 Aug 2004 16:39:38 -0000 1.1.1.3.2.2.2.33 --- g_hslider.c 18 Aug 2004 19:09:09 -0000 1.1.1.3.2.2.2.34 *************** *** 24,35 **** static t_symbol *sym_vsl, *sym_vslider; - /* widget helper functions */ - static int isvert(t_slider *x) { return x->x_flavor == sym_vsl || x->x_flavor == sym_vslider; } - /* ------------------------ hsl widgetbehaviour----------------------------- */ - static void slider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { --- 24,31 ---- *************** *** 59,70 **** if(min == 0.0 && max == 0.0) max = 1.0; if(max > 0.0) { if (min<=0.0) min = 0.01*max; } ! else { if(min > 0.0) max = 0.01*min; } } x->x_min = min; x->x_max = max; diff = x->x_is_log ? log(x->x_max/x->x_min) : (x->x_max-x->x_min); ! x->x_k = isvert(x) ? ! diff/(double)(x->x_gui.x_h-1) : ! diff/(double)(x->x_gui.x_w-1); } --- 55,64 ---- if(min == 0.0 && max == 0.0) max = 1.0; if(max > 0.0) { if (min<=0.0) min = 0.01*max; } ! else { if (min >0.0) max = 0.01*min; } } x->x_min = min; x->x_max = max; diff = x->x_is_log ? log(x->x_max/x->x_min) : (x->x_max-x->x_min); ! x->x_k = diff / (double)(isvert(x) ? (x->x_gui.x_h-1) : (x->x_gui.x_w-1)); } *************** *** 84,90 **** static void slider_bang(t_slider *x) { ! double out = x->x_is_log ? ! x->x_min*exp(x->x_k*(double)(x->x_val)*0.01) : ! (double)(x->x_val)*0.01*x->x_k + x->x_min; if (fabs(out) < 1.0e-10) out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); --- 78,83 ---- static void slider_bang(t_slider *x) { ! double t = (double)(x->x_val)*x->x_k*0.01; ! double out = x->x_is_log ? x->x_min*exp(t) : x->x_min+t; if (fabs(out) < 1.0e-10) out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); *************** *** 98,104 **** int b = ac>1 ? atom_getintarg(1,ac,av) : 0; if (isvert(x)) { ! x->x_gui.x_w = iemgui_clip_size(a); if(ac>1) slider_check_width(x,b); } else { ! slider_check_width(x,a); if(ac>1) x->x_gui.x_h = iemgui_clip_size(b); } iemgui_size((t_iemgui *)x); --- 91,99 ---- int b = ac>1 ? atom_getintarg(1,ac,av) : 0; if (isvert(x)) { ! x->x_gui.x_w = iemgui_clip_size(a); ! if(ac>1) slider_check_width(x,b); } else { ! slider_check_width(x,a); ! if(ac>1) x->x_gui.x_h = iemgui_clip_size(b); } iemgui_size((t_iemgui *)x); *************** *** 107,111 **** static void slider_range(t_slider *x, t_float min, t_float max) {x->x_min = min; x->x_max = max; slider_check_minmax(x);} ! static void slider_lin(t_slider *x) {x->x_is_log=0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);} static void slider_log(t_slider *x) {x->x_is_log=1; slider_check_minmax(x);} static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;} --- 102,106 ---- static void slider_range(t_slider *x, t_float min, t_float max) {x->x_min = min; x->x_max = max; slider_check_minmax(x);} ! static void slider_lin(t_slider *x) {x->x_is_log=0; slider_check_minmax(x);} static void slider_log(t_slider *x) {x->x_is_log=1; slider_check_minmax(x);} static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;}

1 0

pd/src g_dropper.c,1.1.2.23,1.1.2.24
by Mathieu Bouchard 18 Aug '04

18 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18091 Modified Files: Tag: impd_0_37 g_dropper.c Log Message: [dropper] bugfix Index: g_dropper.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v retrieving revision 1.1.2.23 retrieving revision 1.1.2.24 diff -C2 -d -r1.1.2.23 -r1.1.2.24 *** g_dropper.c 14 Aug 2004 03:38:19 -0000 1.1.2.23 --- g_dropper.c 18 Aug 2004 19:08:06 -0000 1.1.2.24 *************** *** 6,17 **** #include <stdlib.h> - #include <string.h> #include <stdio.h> - #include <ctype.h> #include "m_pd.h" #include "g_canvas.h" #include "t_tk.h" #include "g_all_guis.h" - #include <math.h> #ifdef MSW --- 6,14 ---- *************** *** 36,39 **** --- 33,46 ---- } + static void dropper_save(t_dropper *x, t_binbuf *b) { + t_iemgui *y = (t_iemgui *)x; + if (!b) return; + pd_savehead(b, y, "bng"); + pd_saveargs(b, "iiaaaiiiiccc", + &y->x_w,&y->x_isa,&y->x_snd,&y->x_rcv,&y->x_lab, + &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, + &y->x_bcol,&y->x_fcol,&y->x_lcol); + } + static void dropper_reload(t_dropper *x, t_symbol *s, int argc, t_atom *argv) { *************** *** 81,84 **** --- 88,92 ---- wb.w_clickfn = 0; class_setwidget(c, &wb); + class_setsavefn(c, dropper_save); class_sethelpsymbol(c, gensym("dropper")); }

1 0

pd/src g_canvas.c,1.1.1.4.2.7.2.15,1.1.1.4.2.7.2.16 g_canvas.h,1.1.1.4.2.4.2.4,1.1.1.4.2.4.2.5 m_atom.c,1.1.1.2.2.3.2.2,1.1.1.2.2.3.2.3
by Mathieu Bouchard 18 Aug '04

18 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18042 Modified Files: Tag: impd_0_37 g_canvas.c g_canvas.h m_atom.c Log Message: . Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.1.1.4.2.4.2.4 retrieving revision 1.1.1.4.2.4.2.5 diff -C2 -d -r1.1.1.4.2.4.2.4 -r1.1.1.4.2.4.2.5 *** g_canvas.h 3 May 2004 02:57:27 -0000 1.1.1.4.2.4.2.4 --- g_canvas.h 18 Aug 2004 19:07:47 -0000 1.1.1.4.2.4.2.5 *************** *** 313,317 **** }; ! /* cursor definitions; used as return value for t_parentclickfn */ #define CURSOR_RUNMODE_NOTHING 0 #define CURSOR_RUNMODE_CLICKME 1 --- 313,317 ---- }; ! /* cursor definitions; used as return value for t_parentclickfn */ #define CURSOR_RUNMODE_NOTHING 0 #define CURSOR_RUNMODE_CLICKME 1 *************** *** 341,345 **** EXTERN void gobj_save(t_gobj *x, t_binbuf *b); EXTERN void gobj_properties(t_gobj *x, struct _glist *glist); - EXTERN void gobj_save(t_gobj *x, t_binbuf *b); /* -------------------- functions on glists --------------------- */ --- 341,344 ---- Index: m_atom.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_atom.c,v retrieving revision 1.1.1.2.2.3.2.2 retrieving revision 1.1.1.2.2.3.2.3 diff -C2 -d -r1.1.1.2.2.3.2.2 -r1.1.1.2.2.3.2.3 *** m_atom.c 24 May 2004 22:20:18 -0000 1.1.1.2.2.3.2.2 --- m_atom.c 18 Aug 2004 19:07:47 -0000 1.1.1.2.2.3.2.3 *************** *** 73,77 **** case A_COMMA: strcpy(buf, ","); break; case A_POINTER: ! strcpy(buf, "(pointer)"); break; case A_FLOAT: --- 73,77 ---- case A_COMMA: strcpy(buf, ","); break; case A_POINTER: ! sprintf (buf, "<pointer:0x%08x>",a->a_w.w_gpointer); break; case A_FLOAT: *************** *** 83,91 **** case A_SYMBOL: { char *sp; unsigned int len; int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if (*sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) --- 83,94 ---- case A_SYMBOL: { + /* HERE the quoting of whitespace (now disabled) was a hack by Guenter */ char *sp; unsigned int len; int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if ( ! /* *sp == ' ' || */ ! *sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) *************** *** 97,101 **** while (bp < ep && *sp) { ! if (*sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\\'; --- 100,107 ---- while (bp < ep && *sp) { ! /* GG: quoting for whitespace */ ! if ( ! /* *sp == ' ' || */ ! *sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\\'; *************** *** 116,128 **** } } ! break; ! case A_DOLLAR: ! sprintf(buf, "$%d", a->a_w.w_index); ! break; ! case A_DOLLSYM: ! sprintf(buf, "$%s", a->a_w.w_symbol->s_name); ! break; ! default: ! bug("atom_string"); } } --- 122,129 ---- } } ! break; ! case A_DOLLAR: sprintf(buf, "$%d", a->a_w.w_index); break; ! case A_DOLLSYM: sprintf(buf, "$%s", a->a_w.w_symbol->s_name); break; ! default: bug("atom_string"); } } Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.15 retrieving revision 1.1.1.4.2.7.2.16 diff -C2 -d -r1.1.1.4.2.7.2.15 -r1.1.1.4.2.7.2.16 *** g_canvas.c 1 May 2004 18:19:03 -0000 1.1.1.4.2.7.2.15 --- g_canvas.c 18 Aug 2004 19:07:47 -0000 1.1.1.4.2.7.2.16 *************** *** 159,175 **** { if (!x) bug("canvas_getenv"); ! while (!x->gl_env) ! if (!(x = x->gl_owner)) ! bug("t_canvasenvironment", x); ! return (x->gl_env); } ! int canvas_getdollarzero( void) { t_canvas *x = canvas_getcurrent(); t_canvasenvironment *env = (x ? canvas_getenv(x) : 0); ! if (env) ! return (env->ce_dollarzero); ! else return (0); } --- 159,171 ---- { if (!x) bug("canvas_getenv"); ! while (!x->gl_env) { x=x->gl_owner; if (!x) bug("t_canvasenvironment",x);} ! return x->gl_env; } ! int canvas_getdollarzero(void) { t_canvas *x = canvas_getcurrent(); t_canvasenvironment *env = (x ? canvas_getenv(x) : 0); ! return env ? env->ce_dollarzero : 0; } *************** *** 197,212 **** } - t_symbol *canvas_getcurrentdir(void) - { - t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); - return (e->ce_dir); - } - t_symbol *canvas_getdir(t_canvas *x) { t_canvasenvironment *e = canvas_getenv(x); ! return (e->ce_dir); } void canvas_makefilename(t_canvas *x, char *file, char *result, int resultsize) { --- 193,204 ---- } t_symbol *canvas_getdir(t_canvas *x) { t_canvasenvironment *e = canvas_getenv(x); ! return e->ce_dir; } + t_symbol *canvas_getcurrentdir(void) {return canvas_getdir(canvas_getcurrent());} + void canvas_makefilename(t_canvas *x, char *file, char *result, int resultsize) { *************** *** 232,247 **** void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! if (strcmp(x->gl_name->s_name, "Pd")) ! pd_unbind(&x->gl_pd, canvas_makebindsym(x->gl_name)); x->gl_name = s; ! if (strcmp(x->gl_name->s_name, "Pd")) ! pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); ! if (glist_isvisible(x)) ! canvas_reflecttitle(x); ! if (dir && dir != &s_) ! { ! t_canvasenvironment *e = canvas_getenv(x); ! e->ce_dir = dir; ! } } --- 224,233 ---- void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! t_symbol *a = x->gl_name; ! if (strcmp(a->s_name, "Pd")) pd_unbind(&x->gl_pd, canvas_makebindsym(a)); x->gl_name = s; ! if (strcmp(a->s_name, "Pd")) pd_bind( &x->gl_pd, canvas_makebindsym(a)); ! if (glist_isvisible(x)) canvas_reflecttitle(x); ! if (dir && dir != &s_) canvas_getenv(x)->ce_dir = dir; } *************** *** 906,911 **** canvas_pop(x, x->gl_willvis); ! if (!(z = gensym("#X")->s_thing)) error("canvas_restore: out of context"); ! else if (*z != canvas_class) error("canvas_restore: wasn't a canvas"); else { --- 892,897 ---- canvas_pop(x, x->gl_willvis); ! if (!(z = gensym("#X")->s_thing)) pd_error(x,"canvas_restore: out of context"); ! else if (*z != canvas_class) pd_error(x,"canvas_restore: wasn't a canvas"); else {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
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 2004