Update of /cvsroot/pure-data/externals/grill/dyn_py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27863
Modified Files: dyn_py.cpp dyn_py.vcproj gpl.txt license.txt Log Message: corrected license files more robust argument handling use of flext and pyext features (e.g. symbol type) added license stuff
Index: dyn_py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn_py/dyn_py.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dyn_py.vcproj 27 Oct 2004 19:20:57 -0000 1.1 --- dyn_py.vcproj 23 Feb 2005 04:58:26 -0000 1.2 *************** *** 20,28 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="C:\Programme\prog\Python23\include;../dyn;"f:\prog\pd\pd-cvs\src"" ! PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" MinimalRebuild="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" --- 20,28 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="C:\Programme\prog\Python24\include;../dyn;"c:\data\prog\pd\pd-cvs\src";\data\prog\packs\pthreads;..\flext\source;..\py\source" ! PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" *************** *** 34,41 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="python23_d.lib pycxx.lib" ! OutputFile="../../debug/dyn_d.pyd" LinkIncremental="2" ! AdditionalLibraryDirectories=""f:\prog\packs\Python-2.3.4\PCbuild";F:\prog\packs\pycxx_5_2_2\DLL\Debug" GenerateDebugInformation="TRUE" SubSystem="2" --- 34,41 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pycxx.lib pd.lib pthreadVC.lib" ! OutputFile="c:\data\prog\pymodules/dyn_d.pyd" LinkIncremental="2" ! AdditionalLibraryDirectories=""c:\data\prog\packs\Python-2.4\PCbuild";c:\data\prog\packs\pycxx\DLL\Debug;"c:\data\prog\pd\pd-cvs\bin"" GenerateDebugInformation="TRUE" SubSystem="2" *************** *** 93,97 **** Name="VCLinkerTool" AdditionalDependencies="python23.lib pycxx.lib pd.lib" ! OutputFile="../../release/dyn.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" --- 93,97 ---- Name="VCLinkerTool" AdditionalDependencies="python23.lib pycxx.lib pd.lib" ! OutputFile="c:\data\prog\pymodules/dyn.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE"
Index: gpl.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn_py/gpl.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gpl.txt 27 Oct 2004 19:20:57 -0000 1.1 --- gpl.txt 23 Feb 2005 04:58:26 -0000 1.2 *************** *** 1,346 **** ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! ! Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 COPYING, 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 ! ! ! 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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,346 ---- ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! ! Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 COPYING, 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 ! ! ! 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. !
Index: license.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn_py/license.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** license.txt 28 Oct 2004 04:07:16 -0000 1.2 --- license.txt 23 Feb 2005 04:58:26 -0000 1.3 *************** *** 1,19 **** ! dyn_py - pyext module for dyn ! Copyright (c) Thomas Grill (gr@grrrr.org) ! ! 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! In the official dyn_py distribution, the GNU General Public License is ! in the file gpl.txt --- 1,19 ---- ! dyn_py - pyext module for dyn ! Copyright (c) Thomas Grill (gr@grrrr.org) ! ! 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! In the official dyn_py distribution, the GNU General Public License is ! in the file gpl.txt
Index: dyn_py.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dyn_py/dyn_py.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dyn_py.cpp 27 Oct 2004 19:20:57 -0000 1.1 --- dyn_py.cpp 23 Feb 2005 04:58:26 -0000 1.2 *************** *** 2,11 **** dyn_py - Python interface to the dyn library
! Copyright (c)2004 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */
! #include <Python.h>
#ifdef _MSC_VER --- 2,15 ---- dyn_py - Python interface to the dyn library
! Copyright (c)2004-2005 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */
! #define DYNPY_VERSION_MAJOR 0 ! #define DYNPY_VERSION_MINOR 2 ! ! #define DYNPY_VERSION (DYNPY_VERSION_MAJOR*100+DYNPY_VERSION_MINOR) !
#ifdef _MSC_VER *************** *** 17,21 ****
#include <dyn.h> ! #include <ctype.h>
using namespace Py; --- 21,25 ----
#include <dyn.h> ! #include <pysymbol.h>
using namespace Py; *************** *** 27,52 ****
- static t_symbol *sym_list = gensym("list"); - static t_symbol *sym_float = gensym("float"); - static t_symbol *sym_symbol = gensym("symbol"); - - /*! Convert a Python tuple to PD atoms ! \not we don't need to check for $-arguments here... symbols will do */ ! static int tuple2atoms(const Tuple &s,int offs,t_symbol *&hdr,t_atom *lst,int sz,bool listonly = false) { ! hdr = listonly?sym_list:NULL; int i = 0,len = s.length(); for(int it = offs; it < len && i < sz; ++it) { const Object &o = s[it]; if(o.isNumeric()) { ! if(!hdr) hdr = sym_list; ! SETFLOAT(lst+i,(float)Float(o)); ++i; } else if(o.isString()) { ! t_symbol *s = gensym((char *)o.as_string().c_str()); if(!hdr) hdr = s; ! else { SETSYMBOL(lst+i,s); ++i; } } else { --- 31,61 ----
/*! Convert a Python tuple to PD atoms ! \note we don't need to check for $-arguments here... symbols will do */ ! static int tuple2atoms(const Tuple &s,int offs,const t_symbol *&hdr,t_atom *lst,int sz,bool listonly = false) { ! hdr = listonly?flext::sym_list:NULL; int i = 0,len = s.length(); for(int it = offs; it < len && i < sz; ++it) { const Object &o = s[it]; if(o.isNumeric()) { ! if(!hdr) hdr = flext::sym_list; ! float f = (float)Float(o); ! int fi = (int)f; ! if(fi == f) ! flext::SetInt(lst[i++],fi); ! else ! flext::SetFloat(lst[i++],f); ! } ! else if(pySymbol_Check(o.ptr())) { ! const t_symbol *s = pySymbol_AS_SYMBOL(o.ptr()); ! if(!hdr) hdr = s; ! else flext::SetSymbol(lst[i++],s); } else if(o.isString()) { ! const t_symbol *s = flext::MakeSymbol(o.as_string().c_str()); if(!hdr) hdr = s; ! else flext::SetSymbol(lst[i++],s); } else { *************** *** 56,62 **** }
! if(hdr == sym_list && i == 1) { ! if(lst->a_type == A_FLOAT) hdr = sym_float; ! else if(lst->a_type == A_SYMBOL) hdr = sym_symbol; }
--- 65,72 ---- }
! if(hdr == flext::sym_list && i == 1) { ! if(flext::IsFloat(*lst)) hdr = flext::sym_float; ! else if(flext::IsInt(*lst)) hdr = flext::sym_int; ! else if(flext::IsSymbol(*lst)) hdr = flext::sym_symbol; }
*************** *** 66,79 **** static Tuple atoms2tuple(const t_symbol *sym,int argc,const t_atom *argv) { ! bool hd = sym != sym_list && sym != sym_float; Tuple args(argc+hd?1:0); int o = 0; ! if(hd) args[o++] = String(sym->s_name); for(int i = 0; i < argc; ++i,++o) { ! switch(argv[i].a_type) { ! case A_FLOAT: args[o] = Float(argv[i].a_w.w_float); break; ! case A_SYMBOL: args[o] = String(argv[i].a_w.w_symbol->s_name); break; ! default: args[o] = Nothing(); break; ! } } return args; --- 76,92 ---- static Tuple atoms2tuple(const t_symbol *sym,int argc,const t_atom *argv) { ! bool hd = sym != flext::sym_list && sym != flext::sym_float; Tuple args(argc+hd?1:0); int o = 0; ! if(hd) args[o++] = String(flext::GetString(sym)); for(int i = 0; i < argc; ++i,++o) { ! if(flext::IsFloat(argv[i])) ! args[o] = Float(flext::GetFloat(argv[i])); ! else if(flext::IsInt(argv[i])) ! args[o] = Int(flext::GetInt(argv[i])); ! else if(flext::IsSymbol(argv[i])) ! args[o] = asObject(pySymbol_FromSymbol(flext::GetSymbol(argv[i]))); ! else ! args[o] = Nothing(); } return args; *************** *** 96,101 **** }
! #ifdef _DEBUG ! post("dyn callback - signal %i, object %x",signal,ident); #endif } --- 109,114 ---- }
! #ifdef FLEXT_DEBUG ! // flext::post("dyn callback - signal %i, object %x",signal,ident); #endif } *************** *** 115,124 **** behaviors().doc("documentation for dyn::Ident" );
- add_varargs_method("Free", &dynIdent::f_free, "Free the dyn object"); - add_varargs_method("Patcher", &dynIdent::f_patcher, "Create a new sub patcher"); add_varargs_method("Object", &dynIdent::f_object, "Create a new dyn object"); add_varargs_method("Message", &dynIdent::f_message, "Create a new dyn message object");
add_varargs_method("Inlets", &dynIdent::f_inlets, "Get inlet count of a dyn object"); add_varargs_method("Outlets", &dynIdent::f_outlets, "Get outlet count of a dyn object"); --- 128,137 ---- behaviors().doc("documentation for dyn::Ident" );
add_varargs_method("Patcher", &dynIdent::f_patcher, "Create a new sub patcher"); add_varargs_method("Object", &dynIdent::f_object, "Create a new dyn object"); add_varargs_method("Message", &dynIdent::f_message, "Create a new dyn message object");
+ add_varargs_method("Free", &dynIdent::f_free, "Free the dyn object"); + add_varargs_method("Inlets", &dynIdent::f_inlets, "Get inlet count of a dyn object"); add_varargs_method("Outlets", &dynIdent::f_outlets, "Get outlet count of a dyn object"); *************** *** 127,134 **** add_varargs_method("OutletType", &dynIdent::f_outlettype, "Get type of an outlet");
! add_varargs_method("Connect", &dynIdent::f_connect, "Connect two dyn objects");
add_varargs_method("Send", &dynIdent::f_send, "Send a message to a dyn object"); ! add_varargs_method("Listen", &dynIdent::f_listen, "Listen to messages of a dyn object"); }
--- 140,147 ---- add_varargs_method("OutletType", &dynIdent::f_outlettype, "Get type of an outlet");
! add_varargs_method("Connect", &dynIdent::f_connect, "Create a connection between two dyn objects");
add_varargs_method("Send", &dynIdent::f_send, "Send a message to a dyn object"); ! add_varargs_method("Listen", &dynIdent::f_listen, "Create a listener to messages of a dyn object"); }
*************** *** 215,219 **** err = dyn_SendStr(DYN_SCHED_AUTO,ident,Int(a[0]),msg.c_str()); } ! else if(a.length() >= 2) { t_atom lst[256],*argv = lst; t_symbol *sym; --- 228,232 ---- err = dyn_SendStr(DYN_SCHED_AUTO,ident,Int(a[0]),msg.c_str()); } ! else if(a.length() >= 1) { t_atom lst[256],*argv = lst; t_symbol *sym; *************** *** 250,255 **** static void listener(dyn_id id,dyn_id oid,int outlet,const t_symbol *sym,int argc,const t_atom *argv,void *data) { ! #ifdef _DEBUG ! post("dyn listener - object %x, outlet %i, sym %s",oid,outlet,sym->s_name); #endif
--- 263,268 ---- static void listener(dyn_id id,dyn_id oid,int outlet,const t_symbol *sym,int argc,const t_atom *argv,void *data) { ! #ifdef FLEXT_DEBUG ! // flext::post("dyn listener - object %x, outlet %i, sym %s",oid,outlet,sym->s_name); #endif
*************** *** 279,294 ****
class dynModule ! : public ExtensionModule<dynModule> { public: dynModule() ! : ExtensionModule<dynModule>( "dyn" ) { dynIdent::init_type();
- add_varargs_method("Version", &dynModule::f_version, "Return version number"); add_varargs_method("Patcher", &dynModule::f_patcher, "Create a new dyn patcher"); add_varargs_method("Object", &dynModule::f_object, "Create a new dyn object"); add_varargs_method("Message", &dynModule::f_message, "Create a new dyn message object");
// must be last --- 292,311 ----
class dynModule ! : public flext ! , public ExtensionModule<dynModule> { public: dynModule() ! : ExtensionModule<dynModule>("dyn") { + flext::Setup(); + dynIdent::init_type();
add_varargs_method("Patcher", &dynModule::f_patcher, "Create a new dyn patcher"); add_varargs_method("Object", &dynModule::f_object, "Create a new dyn object"); add_varargs_method("Message", &dynModule::f_message, "Create a new dyn message object"); + add_varargs_method("Version", &dynModule::f_version, "Return version number"); + add_varargs_method("DynVersion", &dynModule::f_dynversion, "Return dyn version number");
// must be last *************** *** 298,306 **** protected:
! Object f_version(const Tuple &a) { return Int(DYN_VERSION); }
Object f_patcher(const Tuple &a) { return dynpatcher(a); } Object f_object(const Tuple &a) { return dynobject(a); } --- 315,328 ---- protected:
! Object f_dynversion(const Tuple &a) { return Int(DYN_VERSION); }
+ Object f_version(const Tuple &a) + { + return Int(DYNPY_VERSION); + } + Object f_patcher(const Tuple &a) { return dynpatcher(a); } Object f_object(const Tuple &a) { return dynobject(a); }