Pd-cvs April 2004

pd-cvs@lists.iem.at

10 participants
178 discussions

externals/OSCx/libOSC OSC-timetag.c,1.1.1.1,1.2 OSC-timetag.h,1.1.1.1,1.2
by Hans-Christoph Steiner 07 Apr '04

07 Apr '04

Update of /cvsroot/pure-data/externals/OSCx/libOSC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27559/libOSC Modified Files: OSC-timetag.c OSC-timetag.h Log Message: added files from OSC-Kit 1.0 in order to get updated free license; added GPL to my modifications Index: OSC-timetag.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSC-timetag.h 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- OSC-timetag.h 7 Apr 2004 04:15:04 -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. The OpenSound Control WWW page is --- 1,25 ---- /* ! 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 ! 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 OpenSound Control WWW page is *************** *** 30,33 **** --- 27,31 ---- */ + /* OSC_timeTag.h: library for manipulating OSC time tags *************** *** 36,44 **** Time tags in OSC have the same format as in NTP: 64 bit fixed point, with the top 32 bits giving number of seconds sinve midnight 1/1/1900 and the bottom ! 32 bits giving fractional parts of a second. We represent this by a 64-bit unsigned long if possible, or else a struct. ! NB: On many architectures with 64-bit ints, it's illegal (like maybe a bus error) ! to dereference a pointer to a 64-bit int that's not 64-bit aligned. */ --- 34,42 ---- Time tags in OSC have the same format as in NTP: 64 bit fixed point, with the top 32 bits giving number of seconds sinve midnight 1/1/1900 and the bottom ! 32 bits giving fractional parts of a second. We represent this by an 8-byte unsigned long if possible, or else a struct. ! NB: On many architectures with 8-byte ints, it's illegal (like maybe a bus error) ! to dereference a pointer to an 8 byte int that's not 8-byte aligned. */ *************** *** 49,69 **** #define HAS8BYTEINT /* You may have to change this typedef if there's some other ! way to specify 64 bit ints on your system */ ! typedef long long int64; ! typedef unsigned long long uint64; ! typedef unsigned long uint32; #else /* You may have to redefine this typedef if ints on your system ! aren't 32 bits. */ ! typedef unsigned int uint32; #endif #ifdef HAS8BYTEINT ! typedef uint64 OSCTimeTag; #else typedef struct { ! uint32 seconds; ! uint32 fraction; } OSCTimeTag; #endif --- 47,67 ---- #define HAS8BYTEINT /* You may have to change this typedef if there's some other ! way to specify 8 byte ints on your system */ ! typedef long long int8; ! typedef unsigned long long uint8; ! typedef unsigned long uint4; #else /* You may have to redefine this typedef if ints on your system ! aren't 4 bytes. */ ! typedef unsigned int uint4; #endif #ifdef HAS8BYTEINT ! typedef uint8 OSCTimeTag; #else typedef struct { ! uint4 seconds; ! uint4 fraction; } OSCTimeTag; #endif Index: OSC-timetag.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSC-timetag.c 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- OSC-timetag.c 7 Apr 2004 04:15:04 -0000 1.2 *************** *** 1,175 **** ! /* ! 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. ! ! The OpenSound Control WWW page is ! http://www.cnmat.berkeley.edu/OpenSoundControl ! */ ! ! /* ! ! OSC_timeTag.c: library for manipulating OSC time tags ! Matt Wright, 5/29/97 ! ! Version 0.2 (9/11/98): cleaned up so no explicit type names in the .c file. ! ! */ ! ! #include "OSC-timetag.h" ! ! ! #ifdef HAS8BYTEINT ! #define TWO_TO_THE_32_FLOAT 4294967296.0f ! ! OSCTimeTag OSCTT_Immediately(void) { ! return (OSCTimeTag) 1; ! } ! ! OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) { ! return (OSCTimeTag) 0xffffffffffffffff; ! } ! ! OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) { ! int64 offset = (int64) (secondsOffset * TWO_TO_THE_32_FLOAT); ! ! /* printf("* OSCTT_PlusSeconds %llx plus %f seconds (i.e., %lld offset) is %llx\n", original, ! secondsOffset, offset, original + offset); */ ! ! return original + offset; ! } ! ! int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) { ! #if 0 ! printf("***** OSCTT_Compare(%llx, %llx): %d\n", left, right, ! (left<right) ? -1 : ((left == right) ? 0 : 1)); ! #endif ! if (left < right) { ! return -1; ! } else if (left == right) { ! return 0; ! } else { ! return 1; ! } ! } ! ! #ifdef __sgi ! #include <sys/time.h> ! ! #define SECONDS_FROM_1900_to_1970 2208988800 /* 17 leap years */ ! #define TWO_TO_THE_32_OVER_ONE_MILLION 4295 ! ! ! OSCTimeTag OSCTT_CurrentTime(void) { ! uint64 result; ! uint32 usecOffset; ! struct timeval tv; ! struct timezone tz; ! ! BSDgettimeofday(&tv, &tz); ! ! /* First get the seconds right */ ! result = (unsigned) SECONDS_FROM_1900_to_1970 + ! (unsigned) tv.tv_sec - ! (unsigned) 60 * tz.tz_minuteswest + ! (unsigned) (tz.tz_dsttime ? 3600 : 0); ! ! #if 0 ! /* No timezone, no DST version ... */ ! result = (unsigned) SECONDS_FROM_1900_to_1970 + ! (unsigned) tv.tv_sec; ! #endif ! ! ! /* make seconds the high-order 32 bits */ ! result = result << 32; ! ! /* Now get the fractional part. */ ! usecOffset = (unsigned) tv.tv_usec * (unsigned) TWO_TO_THE_32_OVER_ONE_MILLION; ! /* printf("** %ld microsec is offset %x\n", tv.tv_usec, usecOffset); */ ! ! result += usecOffset; ! ! /* printf("* OSCTT_CurrentTime is %llx\n", result); */ ! return result; ! } ! ! #else /* __sgi */ ! ! /* Instead of asking your operating system what time it is, it might be ! clever to find out the current time at the instant your application ! starts audio processing, and then keep track of the number of samples ! output to know how much time has passed. */ ! ! /* Loser version for systems that have no ability to tell the current time: */ ! OSCTimeTag OSCTT_CurrentTime(void) { ! return (OSCTimeTag) 1; ! } ! ! #endif /* __sgi */ ! ! ! #else /* Not HAS8BYTEINT */ ! ! OSCTimeTag OSCTT_CurrentTime(void) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) { ! OSCTimeTag result; ! result.seconds = 0xffffffff; ! result.fraction = 0xffffffff; ! return result; ! } ! ! OSCTimeTag OSCTT_Immediately(void) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) { ! /* Untested! */ ! int highResult = left.seconds - right.seconds; ! ! if (highResult != 0) return highResult; ! ! return left.fraction - right.fraction; ! } ! ! ! #endif /* HAS8BYTEINT */ ! --- 1,173 ---- ! /* ! 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 ! 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 OpenSound Control WWW page is ! http://www.cnmat.berkeley.edu/OpenSoundControl ! */ ! ! ! /* ! ! OSC_timeTag.c: library for manipulating OSC time tags ! Matt Wright, 5/29/97 ! ! Version 0.2 (9/11/98): cleaned up so no explicit type names in the .c file. ! ! */ ! ! #include "OSC-timetag.h" ! ! ! #ifdef HAS8BYTEINT ! #define TWO_TO_THE_32_FLOAT 4294967296.0f ! ! OSCTimeTag OSCTT_Immediately(void) { ! return (OSCTimeTag) 1; ! } ! ! OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) { ! return (OSCTimeTag) 0xffffffffffffffff; ! } ! ! OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) { ! int8 offset = (int8) (secondsOffset * TWO_TO_THE_32_FLOAT); ! ! /* printf("* OSCTT_PlusSeconds %llx plus %f seconds (i.e., %lld offset) is %llx\n", original, ! secondsOffset, offset, original + offset); */ ! ! return original + offset; ! } ! ! int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) { ! #if 0 ! printf("***** OSCTT_Compare(%llx, %llx): %d\n", left, right, ! (left<right) ? -1 : ((left == right) ? 0 : 1)); ! #endif ! if (left < right) { ! return -1; ! } else if (left == right) { ! return 0; ! } else { ! return 1; ! } ! } ! ! #ifdef __sgi ! #include <sys/time.h> ! ! #define SECONDS_FROM_1900_to_1970 2208988800 /* 17 leap years */ ! #define TWO_TO_THE_32_OVER_ONE_MILLION 4295 ! ! ! OSCTimeTag OSCTT_CurrentTime(void) { ! uint8 result; ! uint4 usecOffset; ! struct timeval tv; ! struct timezone tz; ! ! BSDgettimeofday(&tv, &tz); ! ! /* First get the seconds right */ ! result = (unsigned) SECONDS_FROM_1900_to_1970 + ! (unsigned) tv.tv_sec - ! (unsigned) 60 * tz.tz_minuteswest + ! (unsigned) (tz.tz_dsttime ? 3600 : 0); ! ! #if 0 ! /* No timezone, no DST version ... */ ! result = (unsigned) SECONDS_FROM_1900_to_1970 + ! (unsigned) tv.tv_sec; ! #endif ! ! ! /* make seconds the high-order 32 bits */ ! result = result << 32; ! ! /* Now get the fractional part. */ ! usecOffset = (unsigned) tv.tv_usec * (unsigned) TWO_TO_THE_32_OVER_ONE_MILLION; ! /* printf("** %ld microsec is offset %x\n", tv.tv_usec, usecOffset); */ ! ! result += usecOffset; ! ! /* printf("* OSCTT_CurrentTime is %llx\n", result); */ ! return result; ! } ! ! #else /* __sgi */ ! ! /* Instead of asking your operating system what time it is, it might be ! clever to find out the current time at the instant your application ! starts audio processing, and then keep track of the number of samples ! output to know how much time has passed. */ ! ! /* Loser version for systems that have no ability to tell the current time: */ ! OSCTimeTag OSCTT_CurrentTime(void) { ! return (OSCTimeTag) 1; ! } ! ! #endif /* __sgi */ ! ! ! #else /* Not HAS8BYTEINT */ ! ! OSCTimeTag OSCTT_CurrentTime(void) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) { ! OSCTimeTag result; ! result.seconds = 0xffffffff; ! result.fraction = 0xffffffff; ! return result; ! } ! ! OSCTimeTag OSCTT_Immediately(void) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) { ! OSCTimeTag result; ! result.seconds = 0; ! result.fraction = 1; ! return result; ! } ! ! int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) { ! /* Untested! */ ! int highResult = left.seconds - right.seconds; ! ! if (highResult != 0) return highResult; ! ! return left.fraction - right.fraction; ! } ! ! ! #endif /* HAS8BYTEINT */ !

1 0

externals/OSCx LICENSE,1.1,1.2
by Hans-Christoph Steiner 07 Apr '04

07 Apr '04

Update of /cvsroot/pure-data/externals/OSCx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27559 Modified Files: LICENSE Log Message: added files from OSC-Kit 1.0 in order to get updated free license; added GPL to my modifications Index: LICENSE =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/LICENSE,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LICENSE 4 Apr 2004 22:10:39 -0000 1.1 --- LICENSE 7 Apr 2004 04:15:03 -0000 1.2 *************** *** 24,25 **** --- 24,371 ---- The OpenSound Control WWW page is http://www.cnmat.berkeley.edu/OpenSoundControl + + + + Additions and modifications to this code by Hans-Christoph Steiner are only + available under the GNU GPL: + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + License is intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Library General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights that + you have. You must make sure that they, too, receive or can get the + source code. And you must show them these terms so they know their + rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, we + want its recipients to know that what they have is not the original, so + that any problems introduced by others will not reflect on the original + authors' reputations. + + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR PDP.LICENSE, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains + a notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running the Program is not restricted, and the output from the Program + is covered only if its contents constitute a work based on the + Program (independent of having been made by running the Program). + Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any warranty; + and give any other recipients of the Program a copy of this License + along with the Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion + of it, thus forming a work based on the Program, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Program, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source + code means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the executable. However, as a + special exception, the source code distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of the + operating system on which the executable runs, unless that component + itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is + void, and will automatically terminate your rights under this License. + However, parties who have received copies, or rights, from you under + this License will not have their licenses terminated so long as such + parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties to + this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions + of the General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free Software + Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the author + to ask for permission. For software which is copyrighted by the Free + Software Foundation, write to the Free Software Foundation; we sometimes + make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS + TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, + REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING + OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED + TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the appropriate + parts of the General Public License. Of course, the commands you use may + be called something other than `show w' and `show c'; they could even be + mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Library General + Public License instead of this License.

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.15,1.1.1.4.2.4.2.16 g_bang.c,1.1.1.3.2.2.2.12,1.1.1.3.2.2.2.13 g_editor.c,1.1.1.4.2.3.2.10,1.1.1.4.2.3.2.11 g_hdial.c,1.1.1.4.2.2.2.9,1.1.1.4.2.2.2.10 g_hslider.c,1.1.1.3.2.2.2.12,1.1.1.3.2.2.2.13 g_mycanvas.c,1.1.1.3.2.2.2.4,1.1.1.3.2.2.2.5 g_numbox.c,1.1.1.4.2.2.2.8,1.1.1.4.2.2.2.9 g_text.c,1.1.1.4.2.2.2.9,1.1.1.4.2.2.2.10 g_toggle.c,1.1.1.3.2.2.2.9,1.1.1.3.2.2.2.10 g_vumeter.c,1.1.1.3.2.2.2.7,1.1.1.3.2.2.2.8 u_main.tk,1.1.1.4.2.7.4.34,1.1.1.4.2.7.4.35 u_object.t
by Mathieu Bouchard 07 Apr '04

07 Apr '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19254 Modified Files: Tag: impd_0_37 g_all_guis.c g_bang.c g_editor.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_text.c g_toggle.c g_vumeter.c u_main.tk u_object.tk Log Message: more gui changes (more gop fixes) Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.9 retrieving revision 1.1.1.3.2.2.2.10 diff -C2 -d -r1.1.1.3.2.2.2.9 -r1.1.1.3.2.2.2.10 *** g_toggle.c 3 Apr 2004 23:10:26 -0000 1.1.1.3.2.2.2.9 --- g_toggle.c 7 Apr 2004 03:17:40 -0000 1.1.1.3.2.2.2.10 *************** *** 198,205 **** x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; ! x->x_gui.x_w = iemgui_clip_size(a); ! x->x_gui.x_h = x->x_gui.x_w; iemgui_all_colfromload(&x->x_gui, bflcol); iemgui_verify_snd_ne_rcv(&x->x_gui); --- 198,204 ---- x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); x->x_gui.x_fontsize = fs; ! x->x_gui.x_h = x->x_gui.x_w = iemgui_clip_size(a); iemgui_all_colfromload(&x->x_gui, bflcol); iemgui_verify_snd_ne_rcv(&x->x_gui); Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.9 retrieving revision 1.1.1.4.2.2.2.10 diff -C2 -d -r1.1.1.4.2.2.2.9 -r1.1.1.4.2.2.2.10 *** g_text.c 3 Apr 2004 23:10:26 -0000 1.1.1.4.2.2.2.9 --- g_text.c 7 Apr 2004 03:17:40 -0000 1.1.1.4.2.2.2.10 *************** *** 16,19 **** --- 16,20 ---- #include <string.h> #include <math.h> + #include "g_all_guis.h" static t_class *text_class, *message_class, *gatom_class; *************** *** 105,113 **** } else x = 0; ! if (!x) ! { ! /* LATER make the color reflect this */ ! x = (t_text *)pd_new(text_class); ! } x->te_binbuf = b; x->te_xpix = xpix; --- 106,110 ---- } else x = 0; ! if (!x) x = (t_text *)pd_new(text_class); x->te_binbuf = b; x->te_xpix = xpix; *************** *** 118,122 **** if (selected) { ! /* this is called if we've been created from the menu. */ glist_select(gl, &x->te_g); gobj_activate(&x->te_g, gl, 1); --- 115,119 ---- if (selected) { ! /* this is called if we've been created from the menu. */ glist_select(gl, &x->te_g); gobj_activate(&x->te_g, gl, 1); *************** *** 287,293 **** if (glist_isvisible(x->m_glist)) { - t_rtext *y = glist_findrtext(x->m_glist, &x->m_text); sys_vgui(".x%x.c itemconfigure %sBASE -width 5\n", ! glist_getcanvas(x->m_glist), rtext_gettag(y)); clock_delay(x->m_clock, 120); } --- 284,289 ---- if (glist_isvisible(x->m_glist)) { sys_vgui(".x%x.c itemconfigure %sBASE -width 5\n", ! glist_getcanvas(x->m_glist), x); clock_delay(x->m_clock, 120); } *************** *** 298,304 **** if (glist_isvisible(x->m_glist)) { - t_rtext *y = glist_findrtext(x->m_glist, &x->m_text); sys_vgui(".x%x.c itemconfigure %sBASE -width 1\n", ! glist_getcanvas(x->m_glist), rtext_gettag(y)); } } --- 294,299 ---- if (glist_isvisible(x->m_glist)) { sys_vgui(".x%x.c itemconfigure %sBASE -width 1\n", ! glist_getcanvas(x->m_glist), x); } } *************** *** 673,677 **** t_gatom *x = (t_gatom*)z; text_displace(z, glist, dx, dy); - sys_vgui(".x%x.c move %x.l %d %d\n", glist_getcanvas(glist), x, dx, dy); } --- 668,671 ---- *************** *** 808,817 **** case T_OBJECT: /* if (x->te_g.g_pd==text_class && glist_findrtext(glist, x)->x_active) { */ ! if (x->te_g.g_pd==text_class) { ! return "brokenbox"; ! } else { ! return "objectbox"; ! } ! /* case T_OBJECT: return "objectbox"; */ case T_MESSAGE: return "message"; case T_ATOM: return "atom"; --- 802,806 ---- case T_OBJECT: /* if (x->te_g.g_pd==text_class && glist_findrtext(glist, x)->x_active) { */ ! return x->te_g.g_pd==text_class ? "brokenbox" : "objectbox"; case T_MESSAGE: return "message"; case T_ATOM: return "atom"; *************** *** 863,868 **** } ! static void text_displace(t_gobj *z, t_glist *glist, ! int dx, int dy) { t_text *x = (t_text *)z; --- 852,856 ---- } ! static void text_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_text *x = (t_text *)z; *************** *** 885,889 **** rtext_select(y, state); if (glist_isvisible(glist) && text_shouldvis(x, glist)) { ! sys_vgui("%s_select %s .x%x.c %d\n", text_classname(x), rtext_gettag(y), glist_getcanvas(glist), state); } --- 873,877 ---- rtext_select(y, state); if (glist_isvisible(glist) && text_shouldvis(x, glist)) { ! sys_vgui("%s_select %x .x%x.c %d\n", text_classname(x), x, glist_getcanvas(glist), state); } *************** *** 922,926 **** if (x->te_type == T_ATOM) glist_retext(glist, x); ! text_drawborder(x, glist_getcanvas(glist), rtext_gettag(y), rtext_width(y), rtext_height(y), 1); rtext_draw(y); --- 910,914 ---- if (x->te_type == T_ATOM) glist_retext(glist, x); ! text_drawborder(x, glist, rtext_gettag(y), rtext_width(y), rtext_height(y), 1); rtext_draw(y); *************** *** 1010,1016 **** t==A_FLOAT ? gensym("floatatom") : gensym("BOOM"); - t_symbol *label = gatom_escapit(((t_gatom *)x)->a_label); - t_symbol *symfrom = gatom_escapit(((t_gatom *)x)->a_symfrom); - t_symbol *symto = gatom_escapit(((t_gatom *)x)->a_symto); binbuf_addv(b, "ssiiifffsss", gensym("#X"), sel, (t_int)x->te_xpix, (t_int)x->te_ypix, (t_int)x->te_width, --- 998,1001 ---- *************** *** 1018,1022 **** (double)((t_gatom *)x)->a_draghi, (double)((t_gatom *)x)->a_wherelabel, ! label, symfrom, symto); binbuf_addv(b, ";"); } --- 1003,1009 ---- (double)((t_gatom *)x)->a_draghi, (double)((t_gatom *)x)->a_wherelabel, ! gatom_escapit(((t_gatom *)x)->a_label), ! gatom_escapit(((t_gatom *)x)->a_symfrom), ! gatom_escapit(((t_gatom *)x)->a_symto)); binbuf_addv(b, ";"); } *************** *** 1055,1070 **** /* -------------------- the "text" class ------------ */ - #ifdef MACOSX - #define EXTRAPIX 2 - #else - #define EXTRAPIX 1 - #endif - /* draw inlets and outlets for a text object or for a graph. */ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, char *tag, int x1, int y1, int x2, int y2) { ! sys_vgui("io_draw %s .x%x.c %d %d %d %d %d %d\n", ! tag, glist_getcanvas(glist), x1, y1, x2-x1, y2-x1, obj_ninlets(ob), obj_noutlets(ob)); } --- 1042,1051 ---- /* -------------------- the "text" class ------------ */ /* draw inlets and outlets for a text object or for a graph. */ void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, char *tag, int x1, int y1, int x2, int y2) { ! sys_vgui("io_draw %x .x%x.c %d %d %d %d %d %d\n", ! ob, glist_getcanvas(glist), x1, y1, x2-x1, y2-x1, obj_ninlets(ob), obj_noutlets(ob)); } *************** *** 1124,1127 **** --- 1105,1109 ---- int xwas = x->te_xpix, ywas = x->te_ypix; glist_delete(glist, &x->te_g); + text_eraseborder(x, glist, 0); canvas_objtext(glist, xwas, ywas, 0, b); /* if it's an abstraction loadbang it here */ *************** *** 1154,1163 **** class_addmethod(message_class, (t_method)message_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(message_class, (t_method)message_set, gensym("set"), ! A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add, gensym("add"), ! A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add2, gensym("add2"), ! A_GIMME, 0); messresponder_class = class_new(gensym("messresponder"), 0, 0, --- 1136,1142 ---- class_addmethod(message_class, (t_method)message_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(message_class, (t_method)message_set, gensym("set"), A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add, gensym("add"), A_GIMME, 0); ! class_addmethod(message_class, (t_method)message_add2, gensym("add2"),A_GIMME, 0); messresponder_class = class_new(gensym("messresponder"), 0, 0, *************** *** 1174,1183 **** class_addfloat(gatom_class, gatom_float); class_addsymbol(gatom_class, gatom_symbol); ! class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), ! A_GIMME, 0); class_addmethod(gatom_class, (t_method)gatom_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(gatom_class, (t_method)gatom_param, gensym("param"), ! A_GIMME, 0); class_setwidget(gatom_class, &gatom_widgetbehavior); class_setpropertiesfn(gatom_class, gatom_properties); --- 1153,1160 ---- class_addfloat(gatom_class, gatom_float); class_addsymbol(gatom_class, gatom_symbol); ! class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), A_GIMME, 0); class_addmethod(gatom_class, (t_method)gatom_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(gatom_class, (t_method)gatom_param, gensym("param"), A_GIMME, 0); class_setwidget(gatom_class, &gatom_widgetbehavior); class_setpropertiesfn(gatom_class, gatom_properties); Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.9 retrieving revision 1.1.1.4.2.2.2.10 diff -C2 -d -r1.1.1.4.2.2.2.9 -r1.1.1.4.2.2.2.10 *** g_hdial.c 30 Mar 2004 01:35:09 -0000 1.1.1.4.2.2.2.9 --- g_hdial.c 7 Apr 2004 03:17:40 -0000 1.1.1.4.2.2.2.10 *************** *** 42,45 **** --- 42,46 ---- } else { pd_upload((t_gobj *)x); + pd_upload2((t_gobj *)x,glist); sys_mgui((t_iemgui *)x,"radio","draw",""); sys_mgui((t_iemgui *)x,"radio","set","i",x->x_on); *************** *** 67,72 **** iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist), ! (t_int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist), isvert(x) ? (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class ? --- 68,72 ---- iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, isvert(x) ? (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class ? *************** *** 350,360 **** x->x_on = x->x_gui.x_isa.x_loadinit ? on : 0; x->x_on_old = x->x_on; ! x->x_change = (chg==0)?0:1; if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(a); x->x_gui.x_h = x->x_gui.x_w; --- 350,359 ---- x->x_on = x->x_gui.x_isa.x_loadinit ? on : 0; x->x_on_old = x->x_on; ! x->x_change = !! chg; if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); x->x_gui.x_w = iemgui_clip_size(a); x->x_gui.x_h = x->x_gui.x_w; Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.34 retrieving revision 1.1.1.4.2.7.4.35 diff -C2 -d -r1.1.1.4.2.7.4.34 -r1.1.1.4.2.7.4.35 *** u_main.tk 3 Apr 2004 23:10:26 -0000 1.1.1.4.2.7.4.34 --- u_main.tk 7 Apr 2004 03:17:40 -0000 1.1.1.4.2.7.4.35 *************** *** 625,636 **** $name.m.edit entryconfigure "Edit mode" -indicatoron false } - populate_menu $name.m.edit $name { - {Redraw {pd "%W map 0 ; %W map 1 ;"} {}} - } - menu $name.m.view -tearoff $pd_tearoff $name.m add cascade -label View -menu $name.m.view populate_menu $name.m.view $name { ! {hello {} ""} } # {Crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle} --- 625,632 ---- $name.m.edit entryconfigure "Edit mode" -indicatoron false } menu $name.m.view -tearoff $pd_tearoff $name.m add cascade -label View -menu $name.m.view populate_menu $name.m.view $name { ! {Redraw {pd "%W map 0 ; %W map 1 ;"} {}} } # {Crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle} *************** *** 755,760 **** bind $name.c <Button-5> "$name.c yview scroll +1 units" }} ! #catch {image create photo mybackground -file "test2.gif"} ! #catch {$name.c create image -6 -39 -anchor nw -image mybackground -tag bg} #scale $name.bbar.bg -orient horizontal -showvalue false -from 0 -to 255 -command {} #pack $name.bbar.bg -side right --- 751,756 ---- bind $name.c <Button-5> "$name.c yview scroll +1 units" }} ! catch {image create photo mybackground -file "test2.gif"} ! catch {$name.c create image -6 -39 -anchor nw -image mybackground -tag bg} #scale $name.bbar.bg -orient horizontal -showvalue false -from 0 -to 255 -command {} #pack $name.bbar.bg -side right *************** *** 792,796 **** set tags [$canvas gettags [lindex $stack end]] puts stderr "(click) $canvas $cx $cy $b $f : $tags " ! if {[regexp {^(?:\.x)?([a-f0-9]{7})} $tags tag]} { global _ if {[info exists _($tag:class)]} {set class $_($tag:class)} {set class unknown} --- 788,793 ---- set tags [$canvas gettags [lindex $stack end]] puts stderr "(click) $canvas $cx $cy $b $f : $tags " ! if {[regexp {^([a-f0-9]{7})} $tags tag] || ! [regexp {^\.x[a-f0-9]+\.t([a-f0-9]{7})} $tags tag]} { global _ if {[info exists _($tag:class)]} {set class $_($tag:class)} {set class unknown} *************** *** 825,829 **** # x->gl_editor->e_xwas = xpos # x->gl_editor->e_ywas = ypos ! # wire_draw x .x%x.c %d %d %d %d %d\n", x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos # } {canvas_setcursor(x, CURSOR_EDITMODE_CONNECT)} # } {if (doit) goto nooutletafterall} --- 822,826 ---- # x->gl_editor->e_xwas = xpos # x->gl_editor->e_ywas = ypos ! # wire_draw x .x%x.c %d %d %d %d %d\n", x, issignal?2:1, xpos, ypos, xpos, ypos # } {canvas_setcursor(x, CURSOR_EDITMODE_CONNECT)} # } {if (doit) goto nooutletafterall} *************** *** 2443,2446 **** --- 2440,2444 ---- ############ tooltips + # woops, self is for future use proc show_canvas_tooltip {self canvas x y text} { set border 4 *************** *** 2505,2509 **** set look(objectframe2) #668888 set look(objectframe3) #000000 ! set look(objectframe4) #ffaa00 set look(canvasbgrun) #ffffff set look(canvasbgedit) #dddddd --- 2503,2507 ---- set look(objectframe2) #668888 set look(objectframe3) #000000 ! set look(objectframe4) #00ffff set look(canvasbgrun) #ffffff set look(canvasbgedit) #dddddd Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.4 retrieving revision 1.1.1.3.2.2.2.5 diff -C2 -d -r1.1.1.3.2.2.2.4 -r1.1.1.3.2.2.2.5 *** g_mycanvas.c 2 Apr 2004 00:16:43 -0000 1.1.1.3.2.2.2.4 --- g_mycanvas.c 7 Apr 2004 03:17:40 -0000 1.1.1.3.2.2.2.5 *************** *** 304,314 **** x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; ! if(a < 1) a = 1; ! x->x_gui.x_w = a; ! x->x_gui.x_h = x->x_gui.x_w; ! if(w < 1) w = 1; ! x->x_vis_w = w; ! if(h < 1) h = 1; ! x->x_vis_h = h; iemgui_set_font_style((t_iemgui *)x, x->x_gui.x_fsf.x_font_style); if (x->x_gui.x_fsf.x_rcv_able) --- 304,310 ---- x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; ! x->x_gui.x_h = x->x_gui.x_w = MAX(a,1); ! x->x_vis_w = MAX(w,1); ! x->x_vis_h = MAX(h,1); iemgui_set_font_style((t_iemgui *)x, x->x_gui.x_fsf.x_font_style); if (x->x_gui.x_fsf.x_rcv_able) *************** *** 316,321 **** x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; iemgui_all_colfromload(&x->x_gui, bflcol); x->x_at[0].a_type = A_FLOAT; --- 312,316 ---- x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); iemgui_all_colfromload(&x->x_gui, bflcol); x->x_at[0].a_type = A_FLOAT; *************** *** 334,352 **** void g_mycanvas_setup(void) { ! my_canvas_class = class_new(gensym("cnv"), (t_newmethod)my_canvas_new, (t_method)my_canvas_ff, sizeof(t_my_canvas), CLASS_NOINLET, A_GIMME, 0); class_addcreator((t_newmethod)my_canvas_new, gensym("my_canvas"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_size, gensym("size"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_vis_size, gensym("vis_size"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_color, gensym("color"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(my_canvas_class, (t_method)my_canvas_get_pos, gensym("get_pos"), 0); my_canvas_widgetbehavior.w_getrectfn = my_canvas_getrect; --- 329,347 ---- void g_mycanvas_setup(void) { ! t_class *c = my_canvas_class = class_new(gensym("cnv"), (t_newmethod)my_canvas_new, (t_method)my_canvas_ff, sizeof(t_my_canvas), CLASS_NOINLET, A_GIMME, 0); class_addcreator((t_newmethod)my_canvas_new, gensym("my_canvas"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_size, gensym("size"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_vis_size, gensym("vis_size"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_color, gensym("color"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_canvas_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_canvas_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(c, (t_method)my_canvas_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(c, (t_method)my_canvas_get_pos, gensym("get_pos"), 0); my_canvas_widgetbehavior.w_getrectfn = my_canvas_getrect; *************** *** 357,363 **** my_canvas_widgetbehavior.w_visfn = iemgui_vis; my_canvas_widgetbehavior.w_clickfn = NULL; ! class_setwidget(my_canvas_class, &my_canvas_widgetbehavior); ! class_sethelpsymbol(my_canvas_class, gensym("my_canvas")); ! class_setsavefn(my_canvas_class, my_canvas_save); ! class_setpropertiesfn(my_canvas_class, my_canvas_properties); } --- 352,358 ---- my_canvas_widgetbehavior.w_visfn = iemgui_vis; my_canvas_widgetbehavior.w_clickfn = NULL; ! class_setwidget(c, &my_canvas_widgetbehavior); ! class_sethelpsymbol(c, gensym("my_canvas")); ! class_setsavefn(c, my_canvas_save); ! class_setpropertiesfn(c, my_canvas_properties); } Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.15 retrieving revision 1.1.1.4.2.4.2.16 diff -C2 -d -r1.1.1.4.2.4.2.15 -r1.1.1.4.2.4.2.16 *** g_all_guis.c 3 Apr 2004 23:10:25 -0000 1.1.1.4.2.4.2.15 --- g_all_guis.c 7 Apr 2004 03:17:36 -0000 1.1.1.4.2.4.2.16 *************** *** 657,661 **** c->c_savefn(self,buf); binbuf_gettext(buf,&s,&n); ! sys_vgui("update_object %x {%s}\n",(unsigned)self,s); binbuf_free(buf); free(s); --- 657,662 ---- c->c_savefn(self,buf); binbuf_gettext(buf,&s,&n); ! if (s[n-1]=='\n') n--; ! sys_vgui("update_object %x {%.*s}\n",(unsigned)self,n,s); binbuf_free(buf); free(s); *************** *** 675,679 **** va_list val; va_start(val,fmt); ! i+=snprintf(buf+i,n-i,"%s_%s %x .x%x.c", qlass?qlass:cname, sel, (unsigned)self, (unsigned)canvas); if (i>=n) goto over; while (*fmt) { --- 676,681 ---- va_list val; va_start(val,fmt); ! i+=snprintf(buf+i,n-i,"%s_%s %x .x%x.c", ! qlass?qlass:cname, sel, (unsigned)self, (unsigned)canvas); if (i>=n) goto over; while (*fmt) { *************** *** 690,697 **** --- 692,701 ---- i+=snprintf(buf+i,n-i,"\n"); if (i>=n) goto over; + //fprintf(stderr,"%s",buf); sys_gui(buf); return; over: post("sys_mgui: can't send: buffer overflow"); + abort(); } Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** u_object.tk 3 Apr 2004 23:10:27 -0000 1.1.2.15 --- u_object.tk 7 Apr 2004 03:17:40 -0000 1.1.2.16 *************** *** 57,61 **** global _ global fields ! set d [string trimright $d ";\n"] set class [lindex $d 4] if {![info exists fields($class)]} {set class obj} --- 57,62 ---- global _ global fields ! set d [string trimright $d "\n"] ! set d [string trimright $d ";"] set class [lindex $d 4] if {![info exists fields($class)]} {set class obj} *************** *** 174,177 **** --- 175,179 ---- $canvas coords ${self}BASE3 $xyc } { + #$canvas create rectangle $xya -tag ${self}SHAD -fill [darker ${look(objectbg)}] -width 0 $canvas create rectangle $xya -tag ${self}BASE -fill ${look(objectbg)} $canvas create line $xyb -tag ${self}BASE2 -fill ${look(objectframe1)} *************** *** 192,198 **** } ! proc brokenbox_draw {self canvas x1 y1 xs ys ins outs} { ! objectbox_draw $self $canvas $x1 $y1 $xs $ys $ins $outs ! $canvas itemconfigure ${self}.l -fill #ffcccc } --- 194,200 ---- } ! proc brokenbox_draw {self canvas xs ys ins outs} { ! objectbox_draw $self $canvas $xs $ys $ins $outs ! $canvas itemconfigure ${self}BASE -outline #ff0000 } *************** *** 305,309 **** puts "numbox_select $self $canvas $flag" if {$flag==1} {set colour $look(objectframe4)} {set colour $look(objectframe3)} ! $canvas itemconfigure $self -outline $colour if {$flag==2} {set colour #00ff00} {set colour $look(objectbg)} $canvas itemconfigure ${self}BASE4 -fill $colour --- 307,311 ---- puts "numbox_select $self $canvas $flag" if {$flag==1} {set colour $look(objectframe4)} {set colour $look(objectframe3)} ! $canvas itemconfigure ${self}BASE -outline $colour if {$flag==2} {set colour #00ff00} {set colour $look(objectbg)} $canvas itemconfigure ${self}BASE4 -fill $colour *************** *** 393,402 **** } - proc slider_select {self canvas flag} { - global look - if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} - $canvas itemconfigure $self -outline $colour - } - proc radio_draw {self canvas} { global _ --- 395,398 ---- *************** *** 651,663 **** set x4 [expr $x1+$xs-$xs/4] global vu_col if {$isnew} { ! for {set i 0} {$i<=40} {incr i} { ! set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] ! $canvas create rectangle $x3 $y $x4 [expr $y+$led_size] \ ! -fill [parse_color [lindex $vu_col $i]] -tags ${self}RMS -width 0 ! } } - $canvas create rectangle $x3 $y1 $x4 $y1 -tags ${self}MASK \ - -width 0 -fill $colour if {!$_($self:scale)} {return} --- 647,664 ---- set x4 [expr $x1+$xs-$xs/4] global vu_col + + $canvas delete ${self}RMS + for {set i 0} {$i<=40} {incr i} { + set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] + $canvas create rectangle $x3 $y $x4 [expr $y+$led_size] \ + -fill [parse_color [lindex $vu_col $i]] -tags ${self}RMS -width 0 + } + if {$isnew} { ! $canvas create rectangle $x3 $y1 $x4 $y1 -tags ${self}MASK \ ! -width 0 -fill $colour ! } { ! $canvas coords ${self}MASK $x3 $y1 $x4 $y1 } if {!$_($self:scale)} {return} *************** *** 675,679 **** set k4 [expr $y1-$k3] set yyy [expr $k4 + $k1*($k2-4*$i)] ! $canvas create text [expr $x2+4] [expr $yyy+$k3] -text $level -anchor w \ -font $lfont -fill $lcolor -tags ${self}SCALE incr i --- 676,680 ---- set k4 [expr $y1-$k3] set yyy [expr $k4 + $k1*($k2-4*$i)] ! $canvas create text [expr $x2+4] [expr $yyy+$k3-3] -text $level -anchor w \ -font $lfont -fill $lcolor -tags ${self}SCALE incr i Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.7 retrieving revision 1.1.1.3.2.2.2.8 diff -C2 -d -r1.1.1.3.2.2.2.7 -r1.1.1.3.2.2.2.8 *** g_vumeter.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.2.2.7 --- g_vumeter.c 7 Apr 2004 03:17:40 -0000 1.1.1.3.2.2.2.8 *************** *** 67,70 **** --- 67,71 ---- } else { pd_upload((t_gobj *)x); + pd_upload2((t_gobj *)x,glist); sys_mgui((t_iemgui *)x,"vu","draw",""); sys_mgui((t_iemgui *)x,"vu","set","i",x->x_rms); *************** *** 233,238 **** x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(w); vu_check_height(x, h); --- 234,238 ---- x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); x->x_gui.x_w = iemgui_clip_size(w); vu_check_height(x, h); *************** *** 259,264 **** void g_vumeter_setup(void) { ! t_class *c = vu_class = class_new(gensym("vu"), (t_newmethod)vu_new, (t_method)vu_free, ! sizeof(t_vu), 0, A_GIMME, 0); class_addbang(c,vu_bang); class_addfloat(c,vu_float); --- 259,264 ---- void g_vumeter_setup(void) { ! t_class *c = vu_class = class_new(gensym("vu"), ! (t_newmethod)vu_new, (t_method)vu_free, sizeof(t_vu), 0, A_GIMME, 0); class_addbang(c,vu_bang); class_addfloat(c,vu_float); Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.10 retrieving revision 1.1.1.4.2.3.2.11 diff -C2 -d -r1.1.1.4.2.3.2.10 -r1.1.1.4.2.3.2.11 *** g_editor.c 3 Apr 2004 23:10:25 -0000 1.1.1.4.2.3.2.10 --- g_editor.c 7 Apr 2004 03:17:39 -0000 1.1.1.4.2.3.2.11 *************** *** 684,689 **** if (ob->ob_pd->c_firstin) closest--; text = closest < 0 ? ob->ob_pd->c_firsttip->s_name : inlet_tip(ob->te_inlet,closest); ! sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%d: %s\" -tags y\n", ! x, xpos, ypos-4,inlet,text); } --- 684,689 ---- if (ob->ob_pd->c_firstin) closest--; text = closest < 0 ? ob->ob_pd->c_firsttip->s_name : inlet_tip(ob->te_inlet,closest); ! sys_vgui("show_canvas_tooltip %x .x%x.c %d %d \"%d: %s\"\n", ! ob, x, xpos, ypos-20,inlet,text); } *************** *** 1021,1025 **** if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { ! /* int width = x2-x1; int nout1 = noutlet>1 ? noutlet-1 : 1; int closest = ((xpos-x1) * nout1 + width/2)/width; --- 1021,1025 ---- if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { ! int width = x2-x1; int nout1 = noutlet>1 ? noutlet-1 : 1; int closest = ((xpos-x1) * nout1 + width/2)/width; *************** *** 1039,1043 **** } else if (doit) goto nooutletafterall; - */ } /* look for an inlet */ --- 1039,1042 ---- *************** *** 1056,1060 **** t_rtext *rt; /* check if the box is being text edited */ ! /* nooutletafterall:*/ if (ob && (rt = x->gl_editor->e_textedfor) && rt == glist_findrtext(x, ob)) --- 1055,1059 ---- t_rtext *rt; /* check if the box is being text edited */ ! nooutletafterall: if (ob && (rt = x->gl_editor->e_textedfor) && rt == glist_findrtext(x, ob)) *************** *** 1385,1390 **** int mod = fmod; if (!x->gl_editor) {bug("editor"); return;} - sys_vgui(".x%x.c delete y\n",x); - glist_setlastxy(x, xpos, ypos); if (x->gl_editor->e_onmotion == MA_MOVE) --- 1384,1387 ---- Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.12 retrieving revision 1.1.1.3.2.2.2.13 diff -C2 -d -r1.1.1.3.2.2.2.12 -r1.1.1.3.2.2.2.13 *** g_hslider.c 3 Apr 2004 23:10:26 -0000 1.1.1.3.2.2.2.12 --- g_hslider.c 7 Apr 2004 03:17:40 -0000 1.1.1.3.2.2.2.13 *************** *** 396,401 **** x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0; x->x_pos = x->x_val; ! if(lilo != 0) lilo = 1; ! x->x_lin0_log1 = lilo; x->x_steady = steady; x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; --- 396,400 ---- x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0; x->x_pos = x->x_val; ! x->x_lin0_log1 = !!lilo; x->x_steady = steady; x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; *************** *** 405,410 **** x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; if (isvert(x)) { x->x_gui.x_w = iemgui_clip_size(w); --- 404,408 ---- x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); if (isvert(x)) { x->x_gui.x_w = iemgui_clip_size(w); Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.12 retrieving revision 1.1.1.3.2.2.2.13 diff -C2 -d -r1.1.1.3.2.2.2.12 -r1.1.1.3.2.2.2.13 *** g_bang.c 3 Apr 2004 23:10:25 -0000 1.1.1.3.2.2.2.12 --- g_bang.c 7 Apr 2004 03:17:39 -0000 1.1.1.3.2.2.2.13 *************** *** 217,224 **** if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; ! x->x_gui.x_w = iemgui_clip_size(a); ! x->x_gui.x_h = x->x_gui.x_w; bng_check_minmax(x, ftbreak, fthold); iemgui_all_colfromload(&x->x_gui, bflcol); --- 217,222 ---- if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); ! x->x_gui.x_fontsize = MAX(fs,4); ! x->x_gui.x_h = x->x_gui.x_w = iemgui_clip_size(a); bng_check_minmax(x, ftbreak, fthold); iemgui_all_colfromload(&x->x_gui, bflcol); Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.8 retrieving revision 1.1.1.4.2.2.2.9 diff -C2 -d -r1.1.1.4.2.2.2.8 -r1.1.1.4.2.2.2.9 *** g_numbox.c 30 Mar 2004 01:35:09 -0000 1.1.1.4.2.2.2.8 --- g_numbox.c 7 Apr 2004 03:17:40 -0000 1.1.1.4.2.2.2.9 *************** *** 119,123 **** sys_mgui((t_iemgui *)x,"numbox","select","i", (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change); ! else {pd_upload((t_gobj *)x); my_numbox_ftoa(x); sys_mgui((t_iemgui *)x,"numbox","draw",""); --- 119,125 ---- sys_mgui((t_iemgui *)x,"numbox","select","i", (int)x->x_gui.x_fsf.x_selected + 2*(int)x->x_gui.x_fsf.x_change); ! else { ! pd_upload((t_gobj *)x); ! pd_upload2((t_gobj *)x,glist); my_numbox_ftoa(x); sys_mgui((t_iemgui *)x,"numbox","draw",""); *************** *** 474,481 **** x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0.0; ! if(lilo != 0) lilo = 1; ! x->x_lin0_log1 = lilo; ! if(log_height < 10) log_height = 10; ! x->x_log_height = log_height; x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; --- 476,481 ---- x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); x->x_val = x->x_gui.x_isa.x_loadinit ? v : 0.0; ! x->x_lin0_log1 = !!lilo; ! x->x_log_height = MAX(log_height,10); x->x_gui.x_fsf.x_snd_able = strcmp(x->x_gui.x_snd->s_name, "empty")!=0; x->x_gui.x_fsf.x_rcv_able = strcmp(x->x_gui.x_rcv->s_name, "empty")!=0; *************** *** 485,494 **** x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; ! x->x_gui.x_fontsize = fs; ! if(w < 1) w = 1; ! x->x_gui.x_w = w; ! if(h < 8) h = 8; ! x->x_gui.x_h = h; x->x_buf[0] = 0; my_numbox_calc_fontwidth(x); --- 485,491 ---- x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! x->x_gui.x_fontsize = MAX(fs,4); ! x->x_gui.x_w = MAX(w,1); ! x->x_gui.x_h = MAX(h,8); x->x_buf[0] = 0; my_numbox_calc_fontwidth(x);

1 0

externals/grill/xsample/source groove.cpp,1.24,1.25 main.h,1.27,1.28
by Thomas Grill 07 Apr '04

07 Apr '04

Update of /cvsroot/pure-data/externals/grill/xsample/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14342/source Modified Files: groove.cpp main.h Log Message: "" Index: groove.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** groove.cpp 23 Mar 2004 03:27:37 -0000 1.24 --- groove.cpp 7 Apr 2004 02:48:18 -0000 1.25 *************** *** 44,55 **** virtual V m_min(F mn); virtual V m_max(F mx); ! V ms_xzone(F xz); ! V mg_xzone(F &xz); ! V m_xsymm(F xz); V m_xshape(I argc = 0,const t_atom *argv = NULL); inline V ms_xshape(const AtomList &ret) { m_xshape(ret.Count(),ret.Atoms()); } V mg_xshape(AtomList &ret) const; - V m_xkeep(BL k); enum xs_loop { --- 44,56 ---- virtual V m_min(F mn); virtual V m_max(F mx); ! ! V ms_xfade(I xf); ! V ms_xzone(F xz); ! V mg_xzone(F &xz) { xz = _xzone*s2u; } ! V m_xshape(I argc = 0,const t_atom *argv = NULL); inline V ms_xshape(const AtomList &ret) { m_xshape(ret.Count(),ret.Atoms()); } V mg_xshape(AtomList &ret) const; enum xs_loop { *************** *** 57,61 **** xsl_once = 0,xsl_loop,xsl_bidir }; ! V m_loop(xs_loop lp = xsl__); --- 58,67 ---- xsl_once = 0,xsl_loop,xsl_bidir }; ! ! enum xs_fade { ! xsf__ = -1, // don't change ! xsf_keeplooppos = 0,xsf_keeplooplen,xsf_keepfade,xsf_inside ! }; ! V m_loop(xs_loop lp = xsl__); *************** *** 66,75 **** I bidir; ! F _xzone,xzone,xsymm; L znsmin,znsmax; I xshape; F xshparam; D znmin,znmax; - BL xkeep; S **znbuf; S *znpos,*znmul,*znidx; --- 72,81 ---- I bidir; ! F _xzone,xzone; L znsmin,znsmax; + xs_fade xfade; I xshape; F xshparam; D znmin,znmax; S **znbuf; S *znpos,*znmul,*znidx; *************** *** 130,140 **** FLEXT_CALLBACK(m_all) FLEXT_CALLSET_F(ms_xzone) FLEXT_CALLGET_F(mg_xzone) - FLEXT_CALLSET_F(m_xsymm) - FLEXT_ATTRGET_F(xsymm) FLEXT_CALLVAR_V(mg_xshape,ms_xshape) - FLEXT_CALLSET_B(m_xkeep) - FLEXT_ATTRGET_B(xkeep) FLEXT_CALLVAR_F(mg_pos,m_pos) --- 136,144 ---- FLEXT_CALLBACK(m_all) + FLEXT_CALLSET_I(ms_xfade) + FLEXT_ATTRGET_I(xfade) FLEXT_CALLSET_F(ms_xzone) FLEXT_CALLGET_F(mg_xzone) FLEXT_CALLVAR_V(mg_xshape,ms_xshape) FLEXT_CALLVAR_F(mg_pos,m_pos) *************** *** 164,177 **** FLEXT_CADDATTR_VAR_E(c,"loop",loopmode,m_loop); FLEXT_CADDATTR_VAR(c,"xzone",mg_xzone,ms_xzone); - FLEXT_CADDATTR_VAR(c,"xsymm",xsymm,m_xsymm); FLEXT_CADDATTR_VAR(c,"xshape",mg_xshape,ms_xshape); - FLEXT_CADDATTR_VAR(c,"xkeep",xkeep,m_xkeep); } xgroove::xgroove(I argc,const t_atom *argv): loopmode(xsl_loop),curpos(0), ! _xzone(0),xzone(0),xsymm(0.5),xkeep(false),pblksz(0), ! xshape(0),xshparam(1), znbuf(NULL),znmul(NULL),znidx(NULL),znpos(NULL), bidir(1) --- 168,180 ---- FLEXT_CADDATTR_VAR_E(c,"loop",loopmode,m_loop); + FLEXT_CADDATTR_VAR(c,"xfade",xfade,ms_xfade); FLEXT_CADDATTR_VAR(c,"xzone",mg_xzone,ms_xzone); FLEXT_CADDATTR_VAR(c,"xshape",mg_xshape,ms_xshape); } xgroove::xgroove(I argc,const t_atom *argv): loopmode(xsl_loop),curpos(0), ! _xzone(0),xzone(0),pblksz(0), ! xfade(xsf_keeplooppos),xshape(0),xshparam(1), znbuf(NULL),znmul(NULL),znidx(NULL),znpos(NULL), bidir(1) *************** *** 217,225 **** AddOutBang("Bang on loop end/rollover"); // loop bang znbuf = new S *[outchns]; ! for(I i = 0; i < outchns; ++i) znbuf[i] = new S[0]; ! znpos = new S[0]; // don't know vector size yet -> wait for m_dsp ! znidx = new S[0]; znmul = new S[XZONE_TABLE+1]; m_xshape(); } --- 220,230 ---- AddOutBang("Bang on loop end/rollover"); // loop bang + // don't know vector size yet -> wait for m_dsp znbuf = new S *[outchns]; ! for(I i = 0; i < outchns; ++i) znbuf[i] = NULL; ! znpos = NULL; ! znidx = NULL; znmul = new S[XZONE_TABLE+1]; + m_xshape(); } *************** *** 228,238 **** { if(znbuf) { ! for(I i = 0; i < outchns; ++i) delete[] znbuf[i]; delete[] znbuf; } - if(znmul) delete[] znmul; if(znpos) delete[] znpos; if(znidx) delete[] znidx; } --- 233,243 ---- { if(znbuf) { ! for(I i = 0; i < outchns; ++i) if(znbuf[i]) delete[] znbuf[i]; delete[] znbuf; } if(znpos) delete[] znpos; if(znidx) delete[] znidx; + delete[] znmul; } *************** *** 260,264 **** xsample::m_min(mn); m_pos(curpos*s2u); ! do_xzone(); outputmin(); } --- 265,270 ---- xsample::m_min(mn); m_pos(curpos*s2u); ! // do_xzone(); ! s_dsp(); outputmin(); } *************** *** 268,272 **** xsample::m_max(mx); m_pos(curpos*s2u); ! do_xzone(); outputmax(); } --- 274,279 ---- xsample::m_max(mx); m_pos(curpos*s2u); ! // do_xzone(); ! s_dsp(); outputmax(); } *************** *** 280,284 **** { xsample::m_all(); ! do_xzone(); outputmin(); outputmax(); --- 287,292 ---- { xsample::m_all(); ! // do_xzone(); ! s_dsp(); outputmin(); outputmax(); *************** *** 292,295 **** --- 300,310 ---- } + V xgroove::ms_xfade(I xf) + { + xfade = (xs_fade)xf; + // do_xzone(); + s_dsp(); + } + V xgroove::ms_xzone(F xz) { *************** *** 300,321 **** } - V xgroove::mg_xzone(F &xz) - { - xz = _xzone*s2u; - } - - V xgroove::m_xsymm(F xs) - { - if(xs < 0) - xsymm = -1; - else if(xs <= 1) - xsymm = xs; - else { - post("%s - xsymm value out of range - set to center (0.5)",thisName()); - xsymm = 0.5; - } - do_xzone(); - } - V xgroove::m_xshape(I argc,const t_atom *argv) { --- 315,318 ---- *************** *** 361,370 **** - V xgroove::m_xkeep(BL k) - { - xkeep = k; - do_xzone(); - } - V xgroove::do_xzone() { --- 358,361 ---- *************** *** 372,419 **** xzone = _xzone; // make a copy for changing it - znsmin = curmin,znsmax = curmax; - I plen = znsmax-znsmin; //curlen; ! if(xsymm < 0) { ! // crossfade zone is inside the loop (-> loop is shorter than nominal!) ! if(xzone >= plen) xzone = plen-1; ! znmin = znsmin+xzone,znmax = znsmax-xzone; } ! else { ! // desired crossfade points ! znmin = znsmin+xzone*xsymm,znmax = znsmax+xzone*(xsymm-1); ! // extra space at beginning and end ! D o1 = znmin-xzone,o2 = buf->Frames()-(znmax+xzone); ! if(o1 < 0 || o2 < 0) { // or (o1*o2 < 0) ! if(o1+o2 < 0) { ! // must reduce crossfade/loop length ! if(!xkeep) { ! // prefer preservation of cross-fade length ! if(xzone*2 >= plen) // have to reduce cross-fade length ! xzone = plen/2; ! znmin = xzone,znmax = buf->Frames()-xzone; ! } ! else { ! // prefer preservation of loop length ! znmin += o1,znmax -= o2; ! xzone = (buf->Frames()-(znmax-znmin))/2; ! } ! znsmin = 0,znsmax = buf->Frames(); ! } ! else if(o1 < 0) { ! // min point is out of bounds (but enough space for mere shift) ! I i1 = (I)o1; ! znsmin -= i1,znsmax -= i1; ! znmin = znsmin+xzone*xsymm,znmax = znsmax+xzone*(xsymm-1); ! } ! else /* o2 < 0 */ { ! // max point is out of bounds (but enough space for mere shift) ! I i2 = (I)o2; ! znsmin += i2,znsmax += i2; ! znmin = znsmin+xzone*xsymm,znmax = znsmax+xzone*(xsymm-1); ! } } } } --- 363,432 ---- xzone = _xzone; // make a copy for changing it ! if(xfade == xsf_inside) { // fade zone goes inside the loop -> loop gets shorter ! const L maxfd = (curmax-curmin)/2; ! if(xzone > maxfd) xzone = maxfd; ! ! znsmin = curmin,znsmax = curmax; } ! else if(xfade == xsf_keepfade) { ! // try to keep fade zone ! // shifting of loop bounds may happen ! // restrict xzone to half of buffer ! const L maxfd = buf->Frames()/2; ! if(xzone > maxfd) xzone = maxfd; ! ! znsmin = curmin-xzone/2; ! znsmax = curmax+xzone/2; ! ! // check buffer limits and shift bounds if necessary ! if(znsmin < 0) { ! znsmax -= znsmin; ! znsmin = 0; ! } ! if(znsmax > buf->Frames()) ! znsmax = buf->Frames(); ! } ! else if(xfade == xsf_keeplooplen) { ! // try to keep loop length ! // shifting of loop bounds may happen ! ! const L maxfd = buf->Frames()-(curmax-curmin); ! if(xzone > maxfd) xzone = maxfd; ! ! znsmin = curmin-xzone/2; ! znsmax = curmax+xzone/2; ! ! // check buffer limits and shift bounds if necessary ! // both cases can't happen because of xzone having been limited above ! if(znsmin < 0) { ! znsmax -= znsmin; ! znsmin = 0; ! } ! else if(znsmax > buf->Frames()) { ! znsmin -= znsmax-buf->Frames(); ! znsmax = buf->Frames(); ! } ! } ! else if(xfade == xsf_keeplooppos) { ! // try to keep loop position and length ! ! znsmin = curmin-xzone/2; ! znsmax = curmax+xzone/2; ! ! L ovr = znsmax-buf->Frames(); ! if(-znsmin > ovr) ovr = -znsmin; ! if(ovr > 0) { ! znsmin += ovr; ! znsmax -= ovr; ! xzone -= ovr*2; } } + + znmin = znsmin+xzone; + znmax = znsmax-xzone; + + FLEXT_ASSERT(znsmin <= znsmax && (znsmax-znsmin) >= xzone*2); } *************** *** 443,447 **** BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 456,460 ---- BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 451,455 **** const S spd = speed[i]; // must be first because the vector is reused for output! ! if(o >= smax) { o = smax; lpbang = true; } else if(o < smin) { o = smin; lpbang = true; } --- 464,468 ---- const S spd = speed[i]; // must be first because the vector is reused for output! ! if(!(o < smax)) { o = smax; lpbang = true; } else if(o < smin) { o = smin; lpbang = true; } *************** *** 477,481 **** BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 490,494 ---- BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 483,487 **** for(I i = 0; i < n; ++i) { ! if(o >= smax) { o = smax; lpbang = true; } else if(o < smin) { o = smin; lpbang = true; } --- 496,500 ---- for(I i = 0; i < n; ++i) { ! if(!(o < smax)) { o = smax; lpbang = true; } else if(o < smin) { o = smin; lpbang = true; } *************** *** 523,527 **** #endif ! const D smin = curmin,smax = curmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 536,540 ---- #endif ! const D smin = curmin,smax = curmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 568,572 **** BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 581,585 ---- BL lpbang = false; ! const D smin = curmin,smax = curmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 616,624 **** BL lpbang = false; const F xz = xzone,xf = (F)XZONE_TABLE/xz; ! const D lmin = znmin,lmax = znmax,lsh = lmax+xz-lmin; // adapt the playing bounds to the current cross-fade zone ! const I smin = znsmin,smax = znsmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 629,639 ---- BL lpbang = false; + FLEXT_ASSERT(xzone); + const F xz = xzone,xf = (F)XZONE_TABLE/xz; ! const D lmin = znmin,lmax = znmax,lsh = lmax-lmin+xz; // adapt the playing bounds to the current cross-fade zone ! const L smin = znsmin,smax = znsmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 630,634 **** // normalize offset ! if(o >= smax) { o = fmod(o-smin,plen)+smin; lpbang = true; --- 645,649 ---- // normalize offset ! if(!(o < smax)) { o = fmod(o-smin,plen)+smin; lpbang = true; *************** *** 639,656 **** } - // now: smin <= o < smax - if(o >= lmax) { // in late cross-fade zone ! // shift it into early zone ! o -= lsh; ! } ! ! // now: lmin-xz <= o < lmax ! if(o < lmin) { // in early cross-fade zone ! register F inp = xz-(F)(lmin-o); // 0 <= inp < xz znidx[i] = inp*xf; znpos[i] = lmax+inp; --- 654,666 ---- } if(o >= lmax) { // in late cross-fade zone + o -= lsh; + } ! // now: smin <= o < smax if(o < lmin) { // in early cross-fade zone ! register F inp = xz+(F)(o-lmin); // 0 <= inp < xz znidx[i] = inp*xf; znpos[i] = lmax+inp; *************** *** 708,712 **** BL lpbang = false; ! const I smin = curmin,smax = curmax,plen = smax-smin; //curlen; if(buf && plen > 0) { --- 718,722 ---- BL lpbang = false; ! const I smin = curmin,smax = curmax,plen = smax-smin; if(buf && plen > 0) { *************** *** 718,722 **** // normalize offset ! if(o >= smax) { o = smax-fmod(o-smin,plen); // mirror the position at smax bd = -bd; --- 728,732 ---- // normalize offset ! if(!(o < smax)) { o = smax-fmod(o-smin,plen); // mirror the position at smax bd = -bd; *************** *** 753,775 **** case xsl_once: SETSIGFUN(posfun,SIGFUN(s_pos_once)); break; case xsl_loop: ! if(_xzone > 0) { ! // xzone might not be set yet (is done in do_xzone() ) const I blksz = Blocksize(); if(pblksz != blksz) { for(I o = 0; o < outchns; ++o) { ! delete[] znbuf[o]; znbuf[o] = new S[blksz]; } ! delete[] znpos; znpos = new S[blksz]; ! delete[] znidx; znidx = new S[blksz]; pblksz = blksz; } - do_xzone(); // recalculate (s2u may have been 0 before) - SETSIGFUN(posfun,SIGFUN(s_pos_loopzn)); --- 763,786 ---- case xsl_once: SETSIGFUN(posfun,SIGFUN(s_pos_once)); break; case xsl_loop: ! // xzone might not be set yet (is done in do_xzone() ) ! do_xzone(); // recalculate (s2u may have been 0 before) + if(xzone > 0) { const I blksz = Blocksize(); if(pblksz != blksz) { for(I o = 0; o < outchns; ++o) { ! if(znbuf[o]) delete[] znbuf[o]; znbuf[o] = new S[blksz]; } ! if(znpos) delete[] znpos; ! znpos = new S[blksz]; ! if(znidx) delete[] znidx; ! znidx = new S[blksz]; pblksz = blksz; } SETSIGFUN(posfun,SIGFUN(s_pos_loopzn)); Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** main.h 23 Mar 2004 03:27:37 -0000 1.27 --- main.h 7 Apr 2004 02:48:18 -0000 1.28 *************** *** 13,17 **** ! #define XSAMPLE_VERSION "0.3.0pre18" --- 13,17 ---- ! #define XSAMPLE_VERSION "0.3.0pre19" *************** *** 114,118 **** enum xs_intp { xsi__ = -1, // don't change ! xsi_none = 0,xsi_4p,xsi_lin }; --- 114,118 ---- enum xs_intp { xsi__ = -1, // don't change ! xsi_none = 0,xsi_lin,xsi_4p }; *************** *** 147,151 **** xs_sclmd sclmode; //isclmode,osclmode; ! I curmin,curmax; //,curlen; // in samples I sclmin; // in samples F sclmul; --- 147,151 ---- xs_sclmd sclmode; //isclmode,osclmode; ! L curmin,curmax; //,curlen; // in samples I sclmin; // in samples F sclmul;

1 0

externals/grill/xsample/pd xgroove~.pd,1.3,1.4
by Thomas Grill 07 Apr '04

07 Apr '04

Update of /cvsroot/pure-data/externals/grill/xsample/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14342/pd Modified Files: xgroove~.pd Log Message: "" Index: xgroove~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/pd/xgroove~.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xgroove~.pd 24 May 2003 09:18:37 -0000 1.3 --- xgroove~.pd 7 Apr 2004 02:48:18 -0000 1.4 *************** *** 1,5 **** ! #N canvas 92 110 847 566 12; #X obj 258 240 hsl 128 15 0.001 3 1 1 empty empty empty 20 8 0 8 -225271 ! -1 -1 3400 1; #X floatatom 255 261 8 0 0 0 - - -; #X floatatom 275 312 8 0 0 0 - - -; --- 1,5 ---- ! #N canvas 92 110 891 610 12; #X obj 258 240 hsl 128 15 0.001 3 1 1 empty empty empty 20 8 0 8 -225271 ! -1 -1 8500 1; #X floatatom 255 261 8 0 0 0 - - -; #X floatatom 275 312 8 0 0 0 - - -; *************** *** 9,14 **** #X obj 275 419 loadbang; #X obj 274 445 metro 30; ! #X obj 250 470 snapshot~; ! #X floatatom 250 494 8 0 0 0 - - -; #X msg 258 82 loop \$1; #X obj 159 27 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 --- 9,14 ---- #X obj 275 419 loadbang; #X obj 274 445 metro 30; ! #X obj 275 471 snapshot~; ! #X floatatom 275 495 8 0 0 0 - - -; #X msg 258 82 loop \$1; #X obj 159 27 bng 15 250 50 0 empty empty empty 20 8 0 8 -258699 -1 *************** *** 17,68 **** #N canvas 0 0 450 300 graph7 0; #X array buf 300 float 1; ! #A 0 0.841115 0.9094 0.95923 0.989636 0.999991 0.990063 0.960094 0.910649 ! 0.842757 0.757796 0.65746 0.543816 0.419143 0.285978 0.147021 0.00508036 ! -0.136962 -0.276228 -0.409895 -0.535265 -0.649771 -0.751121 -0.83725 ! -0.906401 -0.957205 -0.988587 -0.999947 -0.991051 -0.962051 -0.913577 ! -0.846573 -0.762418 -0.662823 -0.549777 -0.425604 -0.292801 -0.154064 ! -0.0122066 0.129898 0.269372 0.403387 0.529223 0.644347 0.746395 0.833328 ! 0.903378 0.955105 0.987498 0.99986 0.991967 0.963983 0.91644 0.850346 ! 0.767009 0.668129 0.555721 0.432034 0.299602 0.161097 0.0193266 -0.122836 ! -0.262506 -0.396859 -0.523173 -0.638875 -0.741645 -0.82937 -0.900294 ! -0.952984 -0.986339 -0.999729 -0.992844 -0.965842 -0.919283 -0.854067 ! -0.771564 -0.673418 -0.561622 -0.438457 -0.306392 -0.168126 -0.0264512 ! 0.115759 0.255627 0.390308 0.517083 0.633384 0.736837 0.825374 0.89717 ! 0.95079 0.985156 0.999531 0.993672 0.967666 0.922048 0.857765 0.776069 ! 0.678665 0.567504 0.444838 0.313167 0.175141 0.0335691 -0.108684 -0.248732 ! -0.383745 -0.510974 -0.627851 -0.732014 -0.821324 -0.894008 -0.948562 ! -0.983895 -0.999309 -0.994439 -0.96944 -0.924788 -0.861391 -0.780556 ! -0.683878 -0.573355 -0.451214 -0.319922 -0.182154 -0.0406903 0.101596 ! 0.241826 0.37715 0.504839 0.62229 0.727131 0.81725 0.890784 0.946286 ! 0.982602 0.999003 0.99518 0.971156 0.927473 0.864993 0.784974 0.689065 ! 0.579174 0.457555 0.326665 0.189149 0.047805 -0.0945095 -0.234908 -0.370551 ! -0.498674 -0.616703 -0.722227 -0.813114 -0.887541 -0.943952 -0.981256 ! -0.998669 -0.995836 -0.972845 -0.93011 -0.868543 -0.789377 -0.694202 ! -0.584975 -0.463879 -0.333389 -0.196144 -0.0549212 0.0874133 0.227976 ! 0.363918 0.492493 0.611072 0.717282 0.80895 0.88422 0.941593 0.979852 ! 0.998275 0.996467 0.974453 0.932714 0.872048 0.793723 0.699318 0.590728 ! 0.47018 0.340094 0.20312 0.0620311 -0.0803164 -0.221037 -0.357277 -0.486275 ! -0.605431 -0.712297 -0.804743 -0.880878 -0.939154 -0.97842 -0.99783 ! -0.997035 -0.976038 -0.935246 -0.875523 -0.798037 -0.704388 -0.596471 ! -0.476452 -0.346789 -0.210093 -0.0691412 0.0732124 0.21408 0.350613 ! 0.480039 0.599733 0.707289 0.800488 0.87748 0.936691 0.976908 0.997349 ! 0.997554 0.977556 0.937754 0.87893 0.802314 0.709426 0.602164 0.482708 ! 0.353456 0.217051 0.0762439 -0.0661074 -0.207122 -0.343933 -0.473779 ! -0.594024 -0.702224 -0.796211 -0.87404 -0.934169 -0.975372 -0.996792 ! -0.998035 -0.979032 -0.940196 -0.882319 -0.806539 -0.714434 -0.60784 ! -0.48893 -0.36012 -0.224 -0.0833475 0.0589955 0.200142 0.337238 0.467489 ! 0.588274 0.69714 0.791867 0.870566 0.931602 0.973768 0.996211 0.998443 ! 0.980464 0.9426 0.885637 0.810741 0.719392 0.613481 0.495132 0.366748 ! 0.230939 0.0904412 -0.0518851 -0.193161 -0.33052 -0.461188 -0.582499 ! -0.692013 -0.787507 -0.867028 -0.928998 -0.972125 -0.995556 -0.998827 ! -0.98183 -0.944959 -0.888927 -0.81488 -0.724336 -0.619089 -0.501311 ! -0.373371; #X coords 0 1 299 -1 300 200 1; #X restore 521 23 graph; ! #X obj 144 486 dac~; ! #X msg 157 86 reset; #X text 290 292 min/max points; #X text 289 390 min/max points; ! #X text 323 494 position; #X text 181 24 start; #X text 198 45 stop; --- 17,68 ---- #N canvas 0 0 450 300 graph7 0; #X array buf 300 float 1; ! #A 0 0.665266 0.658123 0.65098 0.643838 0.636695 0.629552 0.622409 ! 0.615266 0.611933 0.6086 0.605266 0.601933 0.5986 0.595266 0.591933 ! 0.5886 0.585266 0.581933 0.5786 0.575266 0.571933 0.5686 0.565266 0.561933 ! 0.5586 0.555266 0.551933 0.5486 0.545266 0.541933 0.5386 0.535266 0.531933 ! 0.5286 0.525266 0.521933 0.5186 0.515267 0.512236 0.509206 0.506176 ! 0.503145 0.500115 0.497085 0.494054 0.491024 0.487994 0.484964 0.481933 ! 0.478903 0.475873 0.472842 0.469812 0.466782 0.463751 0.460721 0.457691 ! 0.454661 0.45163 0.4486 0.44557 0.442539 0.439509 0.436479 0.433448 ! 0.430418 0.427388 0.424358 0.421327 0.418297 0.415267 0.408449 0.401631 ! 0.394812 0.387994 0.381176 0.374358 0.36754 0.360722 0.353903 0.347085 ! 0.340267 0.333449 0.326631 0.319813 0.312994 0.306176 0.299358 0.29254 ! 0.285722 0.278903 0.272085 0.265267 0.260823 0.256378 0.251934 0.247489 ! 0.243045 0.238601 0.234156 0.229712 0.225267 0.220823 0.216378 0.211934 ! 0.20749 0.203045 0.198601 0.194156 0.189712 0.185267 0.180601 0.175934 ! 0.171267 0.166601 0.161934 0.157267 0.152601 0.147934 0.143267 0.138601 ! 0.133934 0.129267 0.124601 0.104601 0.104601 0.104601 0.104601 0.104601 ! 0.0846011 0.0846011 0.0846011 0.0646012 0.0579345 0.0512679 0.0446012 ! 0.0446012 0.0446012 0.0306011 0.0259344 0.0212678 0.0166011 0.0119345 ! 0.00726783 0.00260118 -0.00206548 -0.00673213 -0.0113988 -0.0160654 ! -0.0207321 -0.0253987 -0.0300654 -0.034732 -0.0408859 -0.0470397 -0.0531935 ! -0.0593474 -0.0655012 -0.071655 -0.0778088 -0.0839627 -0.0901165 -0.0962703 ! -0.102424 -0.108578 -0.114732 -0.118232 -0.121732 -0.125232 -0.128732 ! -0.132232 -0.135732 -0.139232 -0.142732 -0.146232 -0.149732 -0.153232 ! -0.156732 -0.160232 -0.163732 -0.167232 -0.170732 -0.174232 -0.177732 ! -0.181232 -0.184732 -0.188065 -0.191398 -0.194732 -0.198065 -0.201398 ! -0.204732 -0.208065 -0.211398 -0.214731 -0.218065 -0.221398 -0.224731 ! -0.228065 -0.231398 -0.234731 -0.238898 -0.243065 -0.247231 -0.251398 ! -0.255565 -0.259731 -0.263898 -0.268065 -0.272231 -0.276398 -0.280565 ! -0.284731 -0.290731 -0.296731 -0.302731 -0.308731 -0.314731 -0.319398 ! -0.324065 -0.328731 -0.333398 -0.338064 -0.342731 -0.347398 -0.352064 ! -0.356731 -0.356731 -0.364731 -0.372731 -0.380731 -0.388731 -0.396731 ! -0.401437 -0.406143 -0.410848 -0.415554 -0.42026 -0.424966 -0.429672 ! -0.434378 -0.439084 -0.44379 -0.448495 -0.453201 -0.457907 -0.462613 ! -0.467319 -0.472025 -0.476731 -0.483397 -0.490064 -0.496731 -0.501731 ! -0.50673 -0.51173 -0.51673 -0.52173 -0.52673 -0.53173 -0.53673 -0.54173 ! -0.546731 -0.552064 -0.557397 -0.562731 -0.568064 -0.573397 -0.57873 ! -0.584064 -0.589397 -0.59473 -0.600064 -0.605397 -0.61073 -0.616064 ! -0.621397 -0.62673 -0.62673 -0.62673 -0.62673 -0.62673 -0.62673 -0.62673 ! -0.62673 -0.63298 -0.63923 -0.64548 -0.65173 -0.65798 -0.66423 -0.67048 ! -0.67673 -0.68073 -0.68473 -0.68873 -0.69273 -0.72673 -0.72673 -0.74673 ! ; #X coords 0 1 299 -1 300 200 1; #X restore 521 23 graph; ! #X obj 171 574 dac~; ! #X msg 155 88 reset; #X text 290 292 min/max points; #X text 289 390 min/max points; ! #X text 348 495 position; #X text 181 24 start; #X text 198 45 stop; *************** *** 70,77 **** #X text 416 234 speed; #X text 337 254 (float or signal); ! #X obj 656 365 table buf2; ! #X floatatom 519 380 8 0 0 0 - - -; ! #X obj 519 353 soundfiler; ! #X msg 158 172 set buf2; #X msg 157 144 set buf; #X msg 372 82 interp \$1; --- 70,74 ---- #X text 416 234 speed; #X text 337 254 (float or signal); ! #X msg 156 169 set buf2; #X msg 157 144 set buf; #X msg 372 82 interp \$1; *************** *** 80,90 **** #X text 255 10 looping mode; #X text 370 9 interpolation; ! #X msg 10 149 pos 100; ! #X msg 25 180 pos 200; ! #X obj 152 447 *~; ! #X msg 10 105 xzone \$1; ! #X obj 13 62 hsl 128 15 0 300 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X floatatom 10 83 5 0 0 0 - - -; #X obj 258 32 vdl 15 0 0 3 empty empty empty 0 -6 0 8 -262144 -1 -1 0; --- 77,87 ---- #X text 255 10 looping mode; #X text 370 9 interpolation; ! #X msg 11 114 pos 100; ! #X msg 31 138 pos 200; ! #X obj 172 384 *~; ! #X msg 13 359 xzone \$1; ! #X obj 16 321 hsl 128 15 0 300 0 0 empty empty empty -2 -6 0 8 -262131 ! -1 -1 1500 1; ! #X floatatom 13 339 5 0 0 0 - - -; #X obj 258 32 vdl 15 0 0 3 empty empty empty 0 -6 0 8 -262144 -1 -1 0; *************** *** 97,104 **** #X text 391 44 linear; #X text 391 60 4-point; - #X obj 520 299 openpanel; - #X msg 521 326 read -resize \$1 buf2; - #X obj 521 275 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 - -1; #X obj 256 134 vdl 15 0 0 4 empty empty empty 0 -6 0 8 -262144 -1 -1 0; --- 94,97 ---- *************** *** 117,125 **** #X text 383 178 loop; #X text 383 131 units in buffer; ! #X obj 524 440 osc~ 1000; ! #X obj 524 498 tabwrite~ buf; ! #X obj 536 467 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 557 468 stop; #X obj 319 343 print A; #X msg 131 213 getattributes; --- 110,118 ---- #X text 383 178 loop; #X text 383 131 units in buffer; ! #X obj 646 475 osc~ 1000; ! #X obj 646 533 tabwrite~ buf; ! #X obj 658 502 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; ! #X msg 679 503 stop; #X obj 319 343 print A; #X msg 131 213 getattributes; *************** *** 159,211 **** #X connect 12 0 0 0; #X connect 13 0 0 0; ! #X restore 19 287 pd ramp; ! #X obj 46 230 loadbang; ! #X msg 46 255 10; #X connect 0 0 1 0; ! #X connect 1 0 31 0; ! #X connect 2 0 31 1; ! #X connect 3 0 31 2; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 9 0; ! #X connect 10 0 31 0; ! #X connect 11 0 31 0; ! #X connect 12 0 31 0; ! #X connect 15 0 31 0; ! #X connect 21 0 31 0; ! #X connect 26 0 25 0; ! #X connect 27 0 31 0; ! #X connect 28 0 31 0; ! #X connect 29 0 31 0; ! #X connect 30 0 31 0; ! #X connect 31 0 36 1; ! #X connect 31 1 8 0; ! #X connect 31 2 4 0; ! #X connect 31 3 5 0; ! #X connect 31 5 69 0; ! #X connect 34 0 73 0; ! #X connect 35 0 73 0; ! #X connect 36 0 14 0; ! #X connect 36 0 14 1; ! #X connect 37 0 31 0; ! #X connect 38 0 39 0; ! #X connect 39 0 37 0; ! #X connect 40 0 10 0; ! #X connect 44 0 29 0; ! #X connect 48 0 49 0; ! #X connect 49 0 26 0; ! #X connect 50 0 48 0; ! #X connect 51 0 53 0; ! #X connect 53 0 31 0; ! #X connect 54 0 56 0; ! #X connect 56 0 31 0; ! #X connect 65 0 66 0; ! #X connect 67 0 66 0; ! #X connect 68 0 66 0; ! #X connect 70 0 31 0; ! #X connect 71 0 31 0; ! #X connect 72 0 31 0; ! #X connect 73 0 36 0; ! #X connect 73 1 31 0; ! #X connect 74 0 75 0; ! #X connect 75 0 73 1; --- 152,279 ---- #X connect 12 0 0 0; #X connect 13 0 0 0; ! #X restore 20 252 pd ramp; ! #X obj 49 199 loadbang; ! #X msg 49 224 10; ! #N canvas 0 0 450 300 graph2 0; ! #X array buf2 300 float 1; ! #A 0 0.0542877 0.0528716 0.0514554 0.0499469 0.0483065 0.0467235 0.0453892 ! 0.0444954 0.0441347 0.0441533 0.0443594 0.0445614 0.0446597 0.045062 ! 0.0455113 0.045605 0.0449404 0.043072 0.0400357 0.0364854 0.0330926 ! 0.0305273 0.0289475 0.0279315 0.027211 0.0265175 0.0256073 0.024616 ! 0.0236247 0.0226334 0.0216421 0.0206508 0.0196594 0.0186681 0.0176768 ! 0.0166855 0.0156941 0.0147029 0.0137115 0.0127203 0.0117289 0.0107376 ! 0.00974629 0.008755 0.00776365 0.0067723 0.00578102 0.00478967 0.00379839 ! 0.00280704 0.00181576 0.000824409 -0.000166872 -0.00115822 -0.0021495 ! -0.00314085 -0.00413213 -0.00512348 -0.00611476 -0.00710611 -0.00809747 ! -0.00908875 -0.0100801 -0.0110714 -0.0120627 -0.013054 -0.0140453 -0.0150366 ! -0.0160279 -0.0170192 -0.0180106 -0.0190019 -0.0199932 -0.0209845 -0.0219759 ! -0.0229672 -0.0239585 -0.0249498 -0.0259411 -0.0269325 -0.0279237 -0.0289151 ! -0.0299064 -0.0308783 -0.0318198 -0.032773 -0.0337804 -0.034885 -0.0361087 ! -0.0374184 -0.0387711 -0.0401239 -0.0414409 -0.0427481 -0.0440554 -0.0453626 ! -0.0466698 -0.047977 -0.0492843 -0.0505914 -0.0518987 -0.0532059 -0.0545132 ! -0.0558204 -0.0571277 -0.058435 -0.0597422 -0.0610494 -0.0623566 -0.0636639 ! -0.064971 -0.0662783 -0.0675855 -0.0688928 -0.0701999 -0.0715072 -0.0728144 ! -0.0741216 -0.0754288 -0.0767361 -0.0780434 -0.0793506 -0.0806578 -0.0819651 ! -0.0832723 -0.0845795 -0.0858868 -0.087194 -0.0885012 -0.0898084 -0.0911157 ! -0.0924229 -0.0937301 -0.0950373 -0.0963446 -0.0976517 -0.098959 -0.100266 ! -0.101573 -0.102881 -0.104188 -0.105495 -0.106802 -0.10811 -0.109438 ! -0.110829 -0.112215 -0.113519 -0.114664 -0.115596 -0.116359 -0.117031 ! -0.117687 -0.118401 -0.119144 -0.119888 -0.120631 -0.121374 -0.122118 ! -0.122861 -0.123605 -0.124348 -0.125092 -0.125835 -0.126579 -0.127322 ! -0.128066 -0.128809 -0.129553 -0.130296 -0.13104 -0.131783 -0.132527 ! -0.13327 -0.134014 -0.134757 -0.135501 -0.136244 -0.136988 -0.137731 ! -0.138475 -0.139218 -0.139962 -0.140705 -0.141449 -0.142192 -0.142936 ! -0.143679 -0.144423 -0.145166 -0.14591 -0.146653 -0.147397 -0.14814 ! -0.148884 -0.149627 -0.150371 -0.151114 -0.151858 -0.152601 -0.153345 ! -0.154088 -0.154832 -0.155575 -0.156319 -0.157062 -0.157806 -0.158549 ! -0.159292 -0.160036 -0.160779 -0.161523 -0.162266 -0.16301 -0.163753 ! -0.164497 -0.16524 -0.165984 -0.166727 -0.167471 -0.168214 -0.168958 ! -0.169701 -0.170445 -0.171188 -0.171932 -0.172675 -0.173419 -0.174162 ! -0.174906 -0.175649 -0.176393 -0.177136 -0.17788 -0.178623 -0.179367 ! -0.18011 -0.180854 -0.181598 -0.182346 -0.183095 -0.18384 -0.184575 ! -0.185297 -0.186007 -0.186711 -0.187414 -0.188119 -0.188827 -0.189535 ! -0.190243 -0.190951 -0.191659 -0.192367 -0.193076 -0.193784 -0.194492 ! -0.1952 -0.195908 -0.196616 -0.197324 -0.198032 -0.19874 -0.199448 ! -0.200156 -0.200864 -0.201572 -0.20228 -0.202989 -0.203697 -0.204405 ! -0.205113 -0.205821 -0.206529 -0.207237 -0.207945 -0.208653 -0.209361 ! -0.210069 -0.210777 -0.211485 -0.212193 -0.212901 -0.213609 -0.214317 ! -0.215026 -0.215734 -0.216442 -0.21715 -0.217859 -0.218567 -0.219275 ! -0.219983 -0.220691 -0.221399 -0.222107 -0.222815 -0.223523 -0.224231 ! -0.224939; ! #X coords 0 1 299 -1 300 140 1; ! #X restore 521 232 graph; ! #X obj 228 516 tabwrite~ buf2; ! #X obj 211 483 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X obj 15 421 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262131 ! -1 -1 0 1; ! #X msg 12 397 0.5; ! #X obj 172 548 *~; ! #X obj 228 553 hsl 128 15 0.0001 1 1 0 empty empty empty -2 -6 0 8 ! -261689 -1 -1 8800 1; ! #X obj 226 573 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0 ! 10 -261689 -1 -1 0.059109 256; ! #X msg 12 440 xshape 2 \$1; ! #X msg 11 564 xfade \$1; ! #X obj 10 499 vdl 15 0 0 4 empty empty empty 0 -6 0 8 -262144 -1 -1 ! 0; ! #X text 9 480 loop zone mode; ! #X text 29 498 keep loop pos; ! #X text 29 514 keep loop length; ! #X text 29 530 keep fade length; ! #X text 29 545 inside loop; #X connect 0 0 1 0; ! #X connect 1 0 28 0; ! #X connect 2 0 28 1; ! #X connect 3 0 28 2; #X connect 6 0 7 0; #X connect 7 0 8 0; + #X connect 7 0 71 0; #X connect 8 0 9 0; ! #X connect 10 0 28 0; ! #X connect 11 0 28 0; ! #X connect 12 0 28 0; ! #X connect 15 0 28 0; ! #X connect 21 0 28 0; ! #X connect 24 0 28 0; ! #X connect 25 0 28 0; ! #X connect 26 0 28 0; ! #X connect 27 0 28 0; ! #X connect 28 0 33 1; ! #X connect 28 0 71 0; ! #X connect 28 1 8 0; ! #X connect 28 2 4 0; ! #X connect 28 3 5 0; ! #X connect 28 5 63 0; ! #X connect 31 0 67 0; ! #X connect 32 0 67 0; ! #X connect 33 0 75 0; ! #X connect 34 0 28 0; ! #X connect 35 0 36 0; ! #X connect 36 0 34 0; ! #X connect 37 0 10 0; ! #X connect 41 0 26 0; ! #X connect 45 0 47 0; ! #X connect 47 0 28 0; ! #X connect 48 0 50 0; ! #X connect 50 0 28 0; ! #X connect 59 0 60 0; ! #X connect 61 0 60 0; ! #X connect 62 0 60 0; ! #X connect 64 0 28 0; ! #X connect 65 0 28 0; ! #X connect 66 0 28 0; ! #X connect 67 0 33 0; ! #X connect 67 1 28 0; ! #X connect 68 0 69 0; ! #X connect 69 0 67 1; ! #X connect 72 0 71 0; ! #X connect 73 0 78 0; ! #X connect 74 0 73 0; ! #X connect 75 0 14 0; ! #X connect 75 0 14 1; ! #X connect 76 0 75 1; ! #X connect 76 0 77 0; ! #X connect 78 0 28 0; ! #X connect 79 0 28 0; ! #X connect 80 0 79 0;

1 0

externals/zexy/src makefile.win,NONE,1.1
by carmen rocco 05 Apr '04

05 Apr '04

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9292 Added Files: makefile.win Log Message: where do you want to go today? --- NEW FILE: makefile.win --- current: all prefix=../../.. # the ZEXY-EXTERNAL-makefile # everything is GnuGPL that should come with the zexy.tgz # NO WARRANTIES FOR ANYTHING # et cetera # 1999:forum::für::umläute:2003 TARGETS = zexy \ z_connective z_pack z_multiplex z_drip \ z_makesymbol z_strings \ z_index z_msgfile \ z_stat z_average z_sort \ z_tabread4 z_coordinates \ z_datetime \ z_matrix \ z_noise z_testfun \ z_multiline z_sigmatrix \ z_nop z_zdelay \ z_limiter z_quantize z_swap \ z_sigbin z_sigaverage \ z_dfreq z_sigzero z_pdf \ z_sfplay z_sfrecord \ z_sigpack \ z_prime z_random z_wrap \ z_operating_system .SUFFIXES: .dll OBJECTS = $(TARGETS:%=%.o) INCLUDE = -I. -I$(prefix)/src $(OBJECTS): *.h CFLAGS = -DNT -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch $(INCLUDE) everything: clean all install clean: -rm *.dll *.o all: $(OBJECTS) @echo :: $(OBJECTS) gcc -shared -o zexy.dll *.o $(prefix)/bin/pd.dll .c.pd_linux: cc $(CFLAGS) -O2 -DPD -fPIC $(INCLUDE) -c -o $*.o $*.c install: installdocs @test -d $(prefix)/extra || mkdir -p $(prefix)/extra install *.dll $(prefix)/extra installdocs: install -d $(prefix)/doc/5.reference/zexy install -m644 ../examples/*.pd $(prefix)/doc/5.reference/zexy

1 0

externals/pdogg/oggcast~ oggcast~.c,1.6,1.7
by Bryan Jurish 05 Apr '04

05 Apr '04

Update of /cvsroot/pure-data/externals/pdogg/oggcast~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14481/oggcast~ Modified Files: oggcast~.c Log Message: Mon, 5 Apr 2004 12:12:00 +0200 + added dynamic allocattion of comment strings (TITLE,LOCATION,etc.) via 'pdogg_strdup(s)' macro. Index: oggcast~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/oggcast~.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** oggcast~.c 4 Jan 2004 12:16:07 -0000 1.6 --- oggcast~.c 5 Apr 2004 10:00:51 -0000 1.7 *************** *** 61,67 **** --- 61,69 ---- #ifdef UNIX #define sys_closesocket close + #define pdogg_strdup(s) strdup(s) #endif #ifdef NT #define sys_closesocket closesocket + #define pdogg_strdup(s) _strdup(s) #endif *************** *** 809,813 **** /* get the time for the DATE comment */ now=time(NULL); ! x->x_bcdate = ctime(&now); x->x_pages = 0; clock_delay(x->x_clock_pages, 0); --- 811,815 ---- /* get the time for the DATE comment */ now=time(NULL); ! x->x_bcdate = pdogg_strdup(ctime(&now)); /*--moo*/ x->x_pages = 0; clock_delay(x->x_clock_pages, 0); *************** *** 1055,1068 **** x->x_br_min = 96; x->x_pages = x->x_lastpages = 0; ! x->x_bcname = "ogg/vorbis stream"; ! x->x_bcurl = "http://www.akustische-kunst.org/puredata/"; ! x->x_bcgenre = "experimental"; ! x->x_bcdescription = "ogg/vorbis stream emitted from pure-data with oggcast~"; ! x->x_bcartist = "Pd and oggcast~ v0.2"; ! x->x_bclocation = x->x_bcurl; ! x->x_bccopyright = ""; ! x->x_bcperformer = ""; ! x->x_bccontact = ""; ! x->x_bcdate = ""; x->x_bcpublic = 1; x->x_mountpoint = "puredata.ogg"; --- 1057,1070 ---- x->x_br_min = 96; x->x_pages = x->x_lastpages = 0; ! x->x_bcname = pdogg_strdup("ogg/vorbis stream"); /*--moo: added strdup() */ ! x->x_bcurl = pdogg_strdup("http://www.akustische-kunst.org/puredata/"); ! x->x_bcgenre = pdogg_strdup("experimental"); ! x->x_bcdescription = pdogg_strdup("ogg/vorbis stream emitted from pure-data with oggcast~"); ! x->x_bcartist = pdogg_strdup("Pd and oggcast~ v0.2"); ! x->x_bclocation = pdogg_strdup(x->x_bcurl); ! x->x_bccopyright = pdogg_strdup(""); ! x->x_bcperformer = pdogg_strdup(""); ! x->x_bccontact = pdogg_strdup(""); ! x->x_bcdate = pdogg_strdup(""); x->x_bcpublic = 1; x->x_mountpoint = "puredata.ogg"; *************** *** 1256,1300 **** if(strstr(s->s_name, "ARTIST")) { ! strcpy(x->x_bcartist, comment); post("oggcast~: ARTIST = %s", x->x_bcartist); } else if(strstr(s->s_name, "GENRE")) { ! strcpy(x->x_bcgenre, comment); post("oggcast~: GENRE = %s", x->x_bcgenre); } else if(strstr(s->s_name, "TITLE")) { ! strcpy(x->x_bcname, comment); post("oggcast~: TITLE = %s", x->x_bcname); } else if(strstr(s->s_name, "PERFORMER")) { ! strcpy(x->x_bcperformer, comment); ! post("oggcast~: PERFORMER = %s", x->x_bcperformer); } else if(strstr(s->s_name, "LOCATION")) { ! strcpy(x->x_bclocation, comment); ! post("oggcast~: LOCATION = %s", x->x_bclocation); } else if(strstr(s->s_name, "COPYRIGHT")) { ! strcpy(x->x_bccopyright, comment); post("oggcast~: COPYRIGHT = %s", x->x_bccopyright); } else if(strstr(s->s_name, "CONTACT")) { ! strcpy(x->x_bccontact, comment); post("oggcast~: CONTACT = %s", x->x_bccontact); } else if(strstr(s->s_name, "DESCRIPTION")) { ! strcpy(x->x_bcdescription, comment); post("oggcast~: DESCRIPTION = %s", x->x_bcdescription); } else if(strstr(s->s_name, "DATE")) { ! strcpy(x->x_bcdate, comment); post("oggcast~: DATE = %s", x->x_bcdate); } --- 1258,1311 ---- if(strstr(s->s_name, "ARTIST")) { ! if (x->x_bcartist) free(x->x_bcartist); ! x->x_bcartist = pdogg_strdup(comment); /*-- moo: added strdup() */ post("oggcast~: ARTIST = %s", x->x_bcartist); } else if(strstr(s->s_name, "GENRE")) { ! free(x->x_bcgenre); ! x->x_bcgenre = pdogg_strdup(comment); post("oggcast~: GENRE = %s", x->x_bcgenre); } else if(strstr(s->s_name, "TITLE")) { ! free(x->x_bcname); ! x->x_bcname = pdogg_strdup(comment); post("oggcast~: TITLE = %s", x->x_bcname); } else if(strstr(s->s_name, "PERFORMER")) { ! free(x->x_bcperformer); ! x->x_bcperformer = pdogg_strdup(comment); ! post("oggcast~: PERFORMER = %s",x->x_bcperformer); } else if(strstr(s->s_name, "LOCATION")) { ! free(x->x_bclocation); ! x->x_bclocation = pdogg_strdup(comment); ! post("oggcast~: LOCATION = %s",x->x_bclocation); } else if(strstr(s->s_name, "COPYRIGHT")) { ! free(x->x_bccopyright); ! x->x_bccopyright = pdogg_strdup(comment); post("oggcast~: COPYRIGHT = %s", x->x_bccopyright); } else if(strstr(s->s_name, "CONTACT")) { ! free(x->x_bccontact); ! x->x_bccontact = pdogg_strdup(comment); post("oggcast~: CONTACT = %s", x->x_bccontact); } else if(strstr(s->s_name, "DESCRIPTION")) { ! free(x->x_bcdescription); ! x->x_bcdescription = pdogg_strdup(comment); post("oggcast~: DESCRIPTION = %s", x->x_bcdescription); } else if(strstr(s->s_name, "DATE")) { ! free(x->x_bcdate); ! x->x_bcdate = pdogg_strdup(comment); post("oggcast~: DATE = %s", x->x_bcdate); } *************** *** 1424,1427 **** --- 1435,1450 ---- clock_free(x->x_clock_connect); clock_free(x->x_clock_pages); + + /*-- moo: free dynamically allocated comment strings --*/ + free(x->x_bcname); + free(x->x_bcurl); + free(x->x_bcgenre); + free(x->x_bcdescription); + free(x->x_bcartist); + free(x->x_bclocation); + free(x->x_bccopyright); + free(x->x_bcperformer); + free(x->x_bccontact); + free(x->x_bcdate); } *************** *** 1442,1444 **** class_addanything(oggcast_class, oggcast_comment); class_sethelpsymbol(oggcast_class, gensym("help-oggcast~.pd")); ! } \ No newline at end of file --- 1465,1467 ---- class_addanything(oggcast_class, oggcast_comment); class_sethelpsymbol(oggcast_class, gensym("help-oggcast~.pd")); ! }

1 0

externals/OSCx/extra OSC.dll,1.1.1.1,NONE
by Hans-Christoph Steiner 05 Apr '04

05 Apr '04

Update of /cvsroot/pure-data/externals/OSCx/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24674 Removed Files: OSC.dll Log Message: removed OSC.dll since build system will build a new one --- OSC.dll DELETED ---

1 0

externals/OSCx/src Makefile.in,1.4,1.5 OSC.c,1.3,1.4
by Hans-Christoph Steiner 05 Apr '04

05 Apr '04

Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275/src Modified Files: Makefile.in OSC.c Log Message: made unified autoconf build, should work with MinGW also Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 4 Apr 2004 22:10:41 -0000 1.4 --- Makefile.in 5 Apr 2004 04:26:00 -0000 1.5 *************** *** 1,59 **** ! # current: all ! # pd_linux ! ############################### ! NAME=OSC EXT=o LIBS = -lm -lc ! LIBOSC = ../libOSC/libOSC.a ! DEFS= -Dunix ! ! prefix=$(DESTDIR)/usr ! ! current: @pd_suffix@ ! ! # ----------------------- LINUX i386 ----------------------- ! ! # pd_linux: $(NAME).pd_linux ! ! SFX=@pd_suffix@ ! ! .SUFFIXES: .$(SFX) ! CFLAGS += $(DEFS) -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \ ! -Wall -W -Wshadow \ ! -Wno-unused -Wno-parentheses -Wno-switch ! # where is your m_pd.h ??? ! INCLUDE = -I../../build/include -I../libOSC ! # LINUXEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o ! # SOURCES = $(wildcard *.c) ! SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c \ ! htmsocket.c OSCroute.c sendOSC.c TARGETS = $(SOURCES:.c=.o) EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix@ all: $(EXTS) - sendOSC.pd_linux: htmsocket.o sendOSC.o - cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ *.o -lc -lm ../libOSC/libOSC.a ! dumpOSC.pd_linux: dumpOSC.o ! cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $*.o -lc -lm ! OSCroute.pd_linux: OSCroute.o OSC-pattern-match.o ! cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $? -lc -lm ! OSC.pd_linux: OSC.o ! cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $? -lc -lm ! # $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) *.o $(LIBS) $(LIBOSC) ! # $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) $(LIBS) $(LIBOSC) ! $(TARGETS): %.o : %.c ! cc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c ! # cc -c $(CFLAGS) OSC.c ! # .c.pd_linux: ! # cc -O2 -Wall -DPD -fPIC $(LINUXCFLAGS) $(LINUXINCLUDE) -c *.c ! # ld -export_dynamic -shared -o $*.pd_linux $*.o $(LINUXEXTERNALS) $(LIBS) $(LIBOSC) ! # strip --strip-unneeded $*.pd_linux # ---------------------------------------------------------- --- 1,35 ---- ! EXT=o LIBS = -lm -lc ! LIBOSC = ../libOSC/@LIBOSC@ ! CFLAGS = @CFLAGS@ ! INCLUDES = @INCLUDES@ ! LDFLAGS = @LDFLAGS@ ! prefix=$(DESTDIR)/usr ! SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c TARGETS = $(SOURCES:.c=.o) EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix@ + # ----------------------- autoconf ----------------------- + all: $(EXTS) ! sendOSC.@pd_suffix@: sendOSC.o htmsocket.o ! cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC) ! dumpOSC.@pd_suffix@: dumpOSC.o ! cc $(LDFLAGS) -o dumpOSC.@pd_suffix@ $? -lc -lm ! OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o ! cc $(LDFLAGS) -o OSCroute.@pd_suffix@ $? -lc -lm ! OSC.@pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o ! cc $(LDFLAGS) -o OSC.@pd_suffix@ $? -lc -lm $(LIBOSC) ! ! $(TARGETS): %.o : %.c ! cc $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c # ---------------------------------------------------------- *************** *** 69,96 **** clean: rm -rf *.$(EXT) *.@pd_suffix@ - - # ----------------------- Mac OS X (Darwin) ----------------------- - - pd_darwin: $(NAME).pd_darwin - - SFX=.pd_darwin - - .SUFFIXES: $(SFX) - - DARWINCFLAGS = -DPD -DUNIX -O2 \ - -Wall -W -Wshadow -Wstrict-prototypes \ - -Wno-unused -Wno-parentheses -Wno-switch - - # where is your m_pd.h ??? - DARWININCLUDE = @INCLUDES@ - - DARWINEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o - - .c.pd_darwin: - cc $(DARWINCFLAGS) $(DARWININCLUDE) -c *.c - cc -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) $(LIBS) $(LIBOSC) - - rm -f $*.o ../$*.pd_darwin - # ln -s $*/$*.pd_darwin .. - - --- 45,46 ---- Index: OSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSC.c 4 Apr 2004 22:10:41 -0000 1.3 --- OSC.c 5 Apr 2004 04:26:00 -0000 1.4 *************** *** 48,53 **** post("OSC4PD Version " VERSION "\n ¯\\ original code by matt wright. pd-fication jdl(a)xdv.org\n" ! " · Win32-port raf(a)interaccess.com Darwin cleanup hans(a)at.or.at\n" ! " \\_ Compiled " __TIME__ " " __DATE__); // ExitCallback(); } --- 48,53 ---- post("OSC4PD Version " VERSION "\n ¯\\ original code by matt wright. pd-fication jdl(a)xdv.org\n" ! " · Win32-port raf(a)interaccess.com unified versions hans(a)at.or.at\n" ! " \\_ Compiled " __TIME__ " " __DATE__); // ExitCallback(); }

1 0

externals/OSCx/send+dump Makefile.in,1.2,1.3
by Hans-Christoph Steiner 05 Apr '04

05 Apr '04

Update of /cvsroot/pure-data/externals/OSCx/send+dump In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275/send+dump Modified Files: Makefile.in Log Message: made unified autoconf build, should work with MinGW also Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 4 Apr 2004 22:10:41 -0000 1.2 --- Makefile.in 5 Apr 2004 04:26:00 -0000 1.3 *************** *** 1,8 **** LIBOSCDIR = ../libOSC LIBOSC = ${LIBOSCDIR}/libOSC.a - # for eg. linux - # DEFS= -Dunix ! CFLAGS= @CFLAGS@ # INCLUDES= @INCLUDES@ --- 1,7 ---- LIBOSCDIR = ../libOSC LIBOSC = ${LIBOSCDIR}/libOSC.a ! # strange bug requires this... ! CFLAGS= @CFLAGS@ @INCLUDES@ # INCLUDES= @INCLUDES@

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 April 2004