# HG changeset patch
# User bastiena
# Date 1335530303 -7200
# Node ID 45c889eae324b4e07c25173e8c7059c4bbe98c28
# Parent fcf435874395f43e799d52162a08225566d6bf17
Front IDILL :
Creation of the main parts of the 2 first Modes :
MOSAIC : prezoom/preunzoom, zoom/unzoom.
local mosaic developpement aborted and postponed for the late developpement parts.
VIDEO : moving to a neighbour snapshot.
diff -r fcf435874395 -r 45c889eae324 .hgignore
--- a/.hgignore Thu Apr 19 11:53:06 2012 +0200
+++ b/.hgignore Fri Apr 27 14:38:23 2012 +0200
@@ -51,6 +51,8 @@
front_idill/extern/fajran-npTuioClient/TestClient/Release/
front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj.user
front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj.filters
+front_idill/src/snapshots-little/
+front_idill/src/snapshots/
syntax: regexp
middleware/extern/.*/(bin|obj)
middleware/src/bin/Debug/*
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/.gitignore
--- a/front_idill/extern/fajran-npTuioClient/.gitignore Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-*.o
-*.swp
-nptuio.so
-Debug/
-Release/
-npTuioClient.ncb
-npTuioClient.suo
-npTuioClient.vcproj.*
-npTuioClient.xcodeproj/*.mode1
-npTuioClient.xcodeproj/*.pbxuser
-build/
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/English.lproj/InfoPlist.strings
--- a/front_idill/extern/fajran-npTuioClient/English.lproj/InfoPlist.strings Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "npTuioClient";
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/Info.plist
--- a/front_idill/extern/fajran-npTuioClient/Info.plist Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- npTuioClient
- CFBundleIconFile
-
- CFBundleIdentifier
- id.web.fajran.tuio
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- BRPL
- CFBundleShortVersionString
- 1.0.1
- CFBundleSignature
- ????
- CFBundleVersion
- 0.2
- CSResourcesFileMapped
-
- WebPluginDescription
- Tuio Client browser plugin
- WebPluginMIMETypes
-
- application/x-tuio
-
- WebPluginExtensions
-
- tuio
-
- WebPluginTypeDescription
- Tuio Client browser plugin
-
-
- WebPluginName
- npTuioClient
-
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/LICENSE.txt
--- a/front_idill/extern/fajran-npTuioClient/LICENSE.txt Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,676 +0,0 @@
-
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. 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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. 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.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- 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.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- 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
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- 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 3 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, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU 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 Lesser General
-Public License instead of this License. But first, please read
-.
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/Makefile
--- a/front_idill/extern/fajran-npTuioClient/Makefile Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-
-SRC= \
- ./TuioClient/oscpack/ip/IpEndpointName.cpp \
- ./TuioClient/oscpack/ip/posix/UdpSocket.cpp \
- ./TuioClient/oscpack/ip/posix/NetworkingUtils.cpp \
- ./TuioClient/oscpack/osc/OscPrintReceivedElements.cpp \
- ./TuioClient/oscpack/osc/OscReceivedElements.cpp \
- ./TuioClient/oscpack/osc/OscTypes.cpp \
- ./TuioClient/oscpack/osc/OscOutboundPacketStream.cpp \
- ./TuioClient/TuioClient.cpp \
- ./src/npn_gate.cpp \
- ./src/npp_gate.cpp \
- ./src/client.cpp \
- ./src/np_entry.cpp \
- ./src/plugin.cpp
-
-CC=g++
-BIN=npTuioClient.so
-
-CFLAGS=-Os -fPIC -I TuioClient/ -I TuioClient/oscpack/ -I npapi/ -I src/ -DOSC_HOST_LITTLE_ENDIAN
-LDFLAGS=-lpthread
-
-all : ${BIN}
-
-clean :
- rm ${BIN}
-
-${BIN} : ${SRC}
- ${CC} -o $@ -shared ${CFLAGS} ${LDFLAGS} $+
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/README.md
--- a/front_idill/extern/fajran-npTuioClient/README.md Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-npTuioClient
-============
-
-npTuioClient is a TUIO Client implemented as an NPAPI-based browser
-plugin. It uses [reacTIVision's](http://reactivision.sourceforge.net/)
-TUIO Client as a base.
-
-The plugin constantly calls a javascript function `tuio_callback`
-whenever a new touch event arrives. Having this function called, you
-can start using javascript to manipulate HTML, Canvas, SVG, etc in
-order to create a multi-touch application!
-
-Check the included examples to see how to use this plugin. Check also
-[TUIOjs](http://github.com/fajran/tuiojs/tree/master) to see more
-examples.
-
-The plugin has been tested and works on
-
-* Windows XP: Firefox 3.0.10, Google Chrome 2.0.172.33, and Safari 4.0.
-* Linux (Ubuntu 8.04): Firefox 3.0.11
-* Mac OS X 10.4.11: Firefox 3.5rc3 and Safari 4.0
-
-It doesn't work on Opera 9.64 on Windows XP nor Internet Explorer.
-
-To make the plugin works on Internet Explorer, the plugin has to be
-ported (or wrapped) to an ActiveX-based plugin first. This is needed
-since Internet Explorer doesn't support NPAPI-based plugin.
-
-Download
---------
-
-* [Windows](http://cloud.github.com/downloads/fajran/npTuioClient/npTuioClient-0.2-win.zip)
-* [Linux](http://cloud.github.com/downloads/fajran/npTuioClient/npTuioClient-0.2-linux.tar.gz) (Ubuntu 8.04 i386)
-* [Mac OS X](http://cloud.github.com/downloads/fajran/npTuioClient/npTuioClient-0.2-mac.zip)
-
-Compilation
------------
-
-### Windows
-
-Open the Visual C++ project/solution file and build. I use Visual C++
-2008 Express Edition.
-
-### Linux
-
-Go to the project directory and type `make`.
-
-### Mac OS X
-
-Open the Xcode project and build. I use Xcode 2.5 under Mac OS X 10.4.11.
-
-Installation
-------------
-
-### Windows
-
-Put the plugin file `npTuioClient.dll` under Firefox'/Mozilla's
-`plugin` directory. Mine is `C:\Program Files\Mozilla
-Firefox\Plugins`.
-
-If you are using Google Chrome, put the plugin under
-`C:\Users\\AppData\Local\Google\Chrome\Application\Plugins`. Create the
-directory if necessary.
-
-### Linux
-
-Put the plugin file `npTuioClient.so` under `~/.mozilla/plugins`.
-
-### Mac OS X
-
-Put the plugin bundle `npTuioClient.plugin` under `~/Library/Internet Plug-Ins/`.
-
-Usage
------
-
-Install the plugin, open one of the example files on your browser and
-start using your multi-touch display!
-
-You can open multiple tabs or windows as long as they belong to the
-same browser instance. The plugin can't be used from multiple browsers
-at a time. This is because the TUIO Client library can only be started
-once at a time.
-
-Issues
-------
-
-* Firefox on Mac OS X crashes when the plugin is unloaded (all pages
- that use the plugin are closed). This doesn't happen on Safari 4.0.
-
- TODO: check plugin's shutfown and bundle unloading.
-
-* Firefox on Linux can't cleanly close the TUIO connection. So, the
- browser has to be restarted if the plugin want to be loaded again.
-
- TODO: check TUIO Client's stop function.
-
-
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TestClient/Test.cpp
--- a/front_idill/extern/fajran-npTuioClient/TestClient/Test.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to debug this project.
-*/
-
-#include
-#include
-#include
-#include
-
-using namespace std;
-
-int main(int argc, char ** argv)
-{
- /* get handle to dll */
- HINSTANCE hGetProcIDDLL = LoadLibrary((LPCWSTR)"npTuioClient.dll");
-
- /* get pointer to the function in the dll*/
- FARPROC lpfnGetProcessID = GetProcAddress(HMODULE (hGetProcIDDLL),"tuio_start");
- FARPROC lpfnGetProcessID2 = GetProcAddress(HMODULE (hGetProcIDDLL),"tuio_stop");
-
- /*
- Define the Function in the DLL for reuse. This is just prototyping the dll's function.
- A mock of it. Use "stdcall" for maximum compatibility.
- */
- typedef int (__stdcall * pICFUNC)(void);
-
- pICFUNC t;
- t = pICFUNC(lpfnGetProcessID);
-
- /* The actual call to the function contained in the dll */
- t();
-
- /* Release the Dll */
- FreeLibrary(hGetProcIDDLL);
-
- system("PAUSE");
- return 0;
-}
\ No newline at end of file
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj
--- a/front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {FF6BDC4B-76DF-4C4F-8C83-FA442C38D5C2}
- Win32Proj
- TestClient
-
-
-
- Application
- true
- Unicode
-
-
- Application
- false
- true
- Unicode
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- false
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
- true
- true
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,643 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#include "TuioClient.h"
-
-#ifndef WIN32
-static void* ThreadFunc( void* obj )
-#else
-static DWORD WINAPI ThreadFunc( LPVOID obj )
-#endif
-{
- static_cast(obj)->socket->Run();
- return 0;
-};
-
-using namespace std;
-
-TuioClient::TuioClient() {
- TuioClient(3333);
-}
-
-TuioClient::TuioClient(int port) {
- try {
- socket = new UdpListeningReceiveSocket(IpEndpointName( IpEndpointName::ANY_ADDRESS, port ), this );
- } catch (std::exception &e) {
- std::cout << "could not bind to UDP port " << port << std::endl;
- socket = NULL;
- }
-
- if (socket!=NULL) {
- if (!socket->IsBound()) {
- delete socket;
- socket = NULL;
- } else std::cout << "listening to TUIO messages on UDP port " << port << std::endl;
- }
-
- locked = false;
- running = false;
- currentFrame = lastFrame = maxFingerID = maxStringID = -1;
-}
-
-TuioClient::~TuioClient() {
- delete socket;
-}
-
-void TuioClient::ProcessBundle( const ReceivedBundle& b, const IpEndpointName& remoteEndpoint) {
- for( ReceivedBundle::const_iterator i = b.ElementsBegin(); i != b.ElementsEnd(); ++i ){
- if( i->IsBundle() )
- ProcessBundle( ReceivedBundle(*i), remoteEndpoint);
- else
- ProcessMessage( ReceivedMessage(*i), remoteEndpoint);
- }
-}
-
-void TuioClient::ProcessMessage( const ReceivedMessage& msg, const IpEndpointName& remoteEndpoint)
-{
- try
- {
- ReceivedMessageArgumentStream args = msg.ArgumentStream();
- ReceivedMessage::const_iterator arg = msg.ArgumentsBegin();
-
- if( strcmp( msg.AddressPattern(), "/tuio/2Dobj" ) == 0 )
- {
- const char* cmd;
- args >> cmd;
-
- if( strcmp( cmd, "set" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id, f_id;
- float xpos, ypos, angle, xspeed, yspeed, rspeed, maccel, raccel;
-
- args >> s_id >> f_id >> xpos >> ypos >> angle >> xspeed >> yspeed >> rspeed >> maccel >> raccel >> EndMessage;
-
- std::list::iterator tobj;
- for (tobj=objectList.begin(); tobj!= objectList.end(); tobj++)
- if((*tobj)->getSessionID()==(long)s_id) break;
-
- if (tobj == objectList.end())
- {
-
- TuioObject *addObject = new TuioObject((long)s_id,(int)f_id,xpos,ypos,angle);
- objectList.push_back(addObject);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->addTuioObject(addObject);
-
- }
- else if ( ((*tobj)->getX()!=xpos) || ((*tobj)->getY()!=ypos) || ((*tobj)->getAngle()!=angle) || ((*tobj)->getXSpeed()!=xspeed) || ((*tobj)->getYSpeed()!=yspeed) || ((*tobj)->getRotationSpeed()!=rspeed) || ((*tobj)->getMotionAccel()!=maccel) || ((*tobj)->getRotationAccel()!=raccel) )
- {
- (*tobj)->update(xpos,ypos,angle,xspeed,yspeed,rspeed,maccel,raccel);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->updateTuioObject((*tobj));
- }
- }
- else if( strcmp( cmd, "alive" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- while(!args.Eos())
- {
- args >> s_id;
- objectBuffer.push_back((long)s_id);
- std::list::iterator iter;
- iter = find(aliveObjectList.begin(), aliveObjectList.end(), (long)s_id);
- if (iter != aliveObjectList.end()) aliveObjectList.erase(iter);
- }
- args >> EndMessage;
-
- std::list::iterator alive_iter;
- for (alive_iter=aliveObjectList.begin(); alive_iter != aliveObjectList.end(); alive_iter++)
- {
- std::list::iterator tobj;
- for (tobj=objectList.begin(); tobj!=objectList.end(); tobj++)
- {
- TuioObject *deleteObject = (*tobj);
- if(deleteObject->getSessionID()==*alive_iter)
- {
- deleteObject->remove();
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->removeTuioObject(deleteObject);
- objectList.erase(tobj);
- delete deleteObject;
- break;
- }
- }
- }
- aliveObjectList = objectBuffer;
- objectBuffer.clear();
- }
- else if( strcmp( cmd, "fseq" ) == 0 )
- {
- if(currentFrame>0) lastFrame = currentFrame;
- args >> currentFrame >> EndMessage;
-
- if ((currentFrame>=lastFrame) || (currentFrame<0))
- {
- long currentTime = lastTime;
- if (currentFrame>lastFrame)
- {
- currentTime = getCurrentTime()-startTime;
- lastTime = currentTime;
- }
-
- for (std::list::iterator refreshObject=objectList.begin(); refreshObject!=objectList.end(); refreshObject++)
- if ((*refreshObject)->getUpdateTime()==TUIO_UNDEFINED) (*refreshObject)->setUpdateTime(currentTime);
-
- for (std::list::iterator listener=listenerList.begin(); listener!=listenerList.end(); listener++)
- (*listener)->refresh(currentTime);
- }
- }
- }
- else if( strcmp( msg.AddressPattern(), "/tuio/3Dcur" ) == 0 )
- {
- const char* cmd;
- args >> cmd;
-
- if( strcmp( cmd, "set" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- float xpos, ypos, zpos, xspeed, yspeed, maccel;
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- args >> s_id >> xpos >> ypos >> zpos >> xspeed >> yspeed >> maccel >> EndMessage;
- std::list::iterator tcur;
- for (tcur=cursorList.begin(); tcur != cursorList.end(); tcur++)
- if((*tcur)->getSessionID()==(long)s_id) break;
-
- if (tcur == cursorList.end())
- {
- int f_id = (int)cursorList.size();
- if ((int)(cursorList.size())<=maxFingerID)
- {
- std::list::iterator closestCursor = freeCursorList.begin();
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- for(std::list::iterator testCursor = freeCursorList.begin();testCursor!= freeCursorList.end(); testCursor++)
- {
- if((*testCursor)->getDistance(xpos,ypos,zpos)<(*closestCursor)->getDistance(xpos,ypos,zpos)) closestCursor = testCursor;
- }
- f_id = (*closestCursor)->getFingerID();
- freeCursorList.erase(closestCursor);
- delete *closestCursor;
- }
- else maxFingerID = f_id;
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- TuioCursor *addCursor = new TuioCursor((long)s_id,f_id,xpos,ypos,zpos);
- cursorList.push_back(addCursor);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->addTuioCursor(addCursor);
-
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- }
- else if ( ((*tcur)->getX()!=xpos) || ((*tcur)->getY()!=ypos) || ((*tcur)->getZ()!=zpos) || ((*tcur)->getXSpeed()!=xspeed) || ((*tcur)->getYSpeed()!=yspeed) || ((*tcur)->getMotionAccel()!=maccel) )
- {
- (*tcur)->update(xpos,ypos,zpos,xspeed,yspeed,maccel);
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->updateTuioCursor((*tcur));
- }
- }
- else if( strcmp( cmd, "alive" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- while(!args.Eos())
- {
- args >> s_id;
- cursorBuffer.push_back((long)s_id);
- std::list::iterator iter;
- iter = find(aliveCursorList.begin(), aliveCursorList.end(), (long)s_id);
- if (iter != aliveCursorList.end()) aliveCursorList.erase(iter);
- }
- args >> EndMessage;
- std::list::iterator alive_iter;
- for (alive_iter=aliveCursorList.begin(); alive_iter != aliveCursorList.end(); alive_iter++)
- {
- std::list::iterator tcur;
- for (tcur=cursorList.begin(); tcur != cursorList.end(); tcur++)
- {
- TuioCursor *deleteCursor = (*tcur);
- if(deleteCursor->getSessionID()==*alive_iter)
- {
- cursorList.erase(tcur);
- deleteCursor->remove();
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->removeTuioCursor(deleteCursor);
-
- if (deleteCursor->getFingerID()==maxFingerID)
- {
- maxFingerID = -1;
- delete deleteCursor;
-
- if (cursorList.size()>0)
- {
- std::list::iterator clist;
- for (clist=cursorList.begin(); clist != cursorList.end(); clist++)
- {
- int f_id = (*clist)->getFingerID();
- if (f_id>maxFingerID) maxFingerID=f_id;
- }
- std::list::iterator flist;
- for (flist=freeCursorList.begin(); flist != freeCursorList.end(); flist++)
- {
- TuioCursor *freeCursor = (*flist);
- if (freeCursor->getFingerID()>maxFingerID) delete freeCursor;
- else freeCursorBuffer.push_back(freeCursor);
- }
- freeCursorList = freeCursorBuffer;
- freeCursorBuffer.clear();
- }
- }
- else if (deleteCursor->getFingerID()0) lastFrame = currentFrame;
- args >> currentFrame >> EndMessage;
-
- if ((currentFrame>=lastFrame) || (currentFrame<0))
- {
- long currentTime = lastTime;
- if (currentFrame>lastFrame)
- {
- currentTime = getCurrentTime()-startTime;
- lastTime = currentTime;
- }
- for (std::list::iterator refreshCursor=cursorList.begin(); refreshCursor!=cursorList.end(); refreshCursor++)
- if ((*refreshCursor)->getUpdateTime()==TUIO_UNDEFINED) (*refreshCursor)->setUpdateTime(currentTime);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->refresh(currentTime);
- }
- }
- }
- else if( strcmp( msg.AddressPattern(), "/tuio/_siP" ) == 0 )
- {
- const char* cmd;
- args >> cmd;
-
- if( strcmp( cmd, "set" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- const char* code;
- args >> s_id >> code >> EndMessage;
- std::list::iterator tstr;
- for (tstr=stringList.begin(); tstr != stringList.end(); tstr++)
- if((*tstr)->getSessionID()==(long)s_id) break;
-
- if (tstr == stringList.end())
- {
- int s_id = (int)stringList.size();//
- if ((int)(stringList.size())<=maxStringID)//
- {//
- std::list::iterator closestString = freeStringList.begin();//
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
-
- //for(std::list::iterator testString = freeStringList.begin();testString!= freeStringList.end(); testString++)
- //{
- //if((*testString)->getDistance(xpos,ypos,zpos)<(*closestCursor)->getDistance(xpos,ypos,zpos)) closestCursor = testCursor;
- //}
- s_id = (*closestString)->getStringID();//
- freeStringList.erase(closestString);//
- delete *closestString;//
- }//
- else maxStringID = s_id;//
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- TuioString *addString = new TuioString((long)s_id,-1,code);
- stringList.push_back(addString);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->addTuioString(addString);
-
- //Modifié par alexandre.bastien@iri.centrepompidou.fr
- }
- else if ( ((*tstr)->getCode()!=code) )
- {
- (*tstr)->update(code);
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->updateTuioString((*tstr));
- }
- }
- else if( strcmp( cmd, "alive" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- while(!args.Eos())
- {
- args >> s_id;
- stringBuffer.push_back((long)s_id);
- std::list::iterator iter;
- iter = find(aliveStringList.begin(), aliveStringList.end(), (long)s_id);
- if (iter != aliveStringList.end()) aliveStringList.erase(iter);
- }
- args >> EndMessage;
- std::list::iterator alive_iter;
- for (alive_iter=aliveStringList.begin(); alive_iter != aliveStringList.end(); alive_iter++)
- {
- std::list::iterator tstr;
- for (tstr=stringList.begin(); tstr != stringList.end(); tstr++)
- {
- TuioString *deleteString = (*tstr);
- if(deleteString->getSessionID()==*alive_iter)
- {
- stringList.erase(tstr);
- deleteString->remove();
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->removeTuioString(deleteString);
-
- if (deleteString->getStringID()==maxStringID)//
- {//
- maxStringID = -1;//
- delete deleteString;
-
- if (stringList.size()>0)
- {
- std::list::iterator clist;//
- for (clist=stringList.begin(); clist != stringList.end(); clist++)//
- {//
- int s_id = (*clist)->getStringID();//
- if (s_id>maxStringID) maxStringID=s_id;//
- }//
- std::list::iterator flist;
- for (flist=freeStringList.begin(); flist != freeStringList.end(); flist++)
- {
- TuioString *freeString = (*flist);
- if (freeString->getStringID()>maxStringID) delete freeString;//
- else freeStringBuffer.push_back(freeString);//
- freeStringBuffer.push_back(freeString);
- }
- freeStringList = freeStringBuffer;
- freeStringBuffer.clear();
- }
- }//
- else if (deleteString->getStringID()0) lastFrame = currentFrame;
- args >> currentFrame >> EndMessage;
-
- if ((currentFrame>=lastFrame) || (currentFrame<0))
- {
- long currentTime = lastTime;
- if (currentFrame>lastFrame)
- {
- currentTime = getCurrentTime()-startTime;
- lastTime = currentTime;
- }
- for (std::list::iterator refreshString=stringList.begin(); refreshString!=stringList.end(); refreshString++)
- if ((*refreshString)->getUpdateTime()==TUIO_UNDEFINED) (*refreshString)->setUpdateTime(currentTime);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->refresh(currentTime);
- }
- }
- }
- //Ajouté par alexandre.bastien@iri.centrepompidou.fr
- /*else if( strcmp( msg.AddressPattern(), "/tuio/_siP" ) == 0 )
- {
- const char* cmd;
- args >> cmd;
-
- if( strcmp( cmd, "set" ) == 0 )
- {
- if ((currentFrame0)) return;
- int32 s_id;
- const char* code;
- args >> s_id >> code >> EndMessage;
- std::list::iterator tstr;
- for (tstr=stringList.begin(); tstr != stringList.end(); tstr++)
- if((*tstr)->getSessionID()==(long)s_id) break;
-
- if (tstr == stringList.end())
- {
- TuioString *addString = new TuioString((long)s_id,code);
- stringList.push_back(addString);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->addTuioString(addString);
-
-
- }
- else if ( ((*tstr)->getCode()!=code) )
- {
- (*tstr)->update(code);
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->updateTuioString((*tstr));
- }
- }
- else if( strcmp( cmd, "alive" ) == 0 )
- {
- if ((currentFrame0)) return;
-
- int32 s_id;
- while(!args.Eos())
- {
- args >> s_id;
- stringBuffer.push_back((long)s_id);
- std::list::iterator iter;
- iter = find(aliveStringList.begin(), aliveStringList.end(), (long)s_id);
- if (iter != aliveStringList.end()) aliveStringList.erase(iter);
- }
- args >> EndMessage;
-
- std::list::iterator alive_iter;
- for (alive_iter=aliveStringList.begin(); alive_iter != aliveStringList.end(); alive_iter++)
- {
- std::list::iterator tstr;
- for (tstr=stringList.begin(); tstr != stringList.end(); tstr++)
- {
- TuioString *deleteString = (*tstr);
- if(deleteString->getSessionID()==*alive_iter)
- {
- stringList.erase(tstr);
- deleteString->remove();
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->removeTuioString(deleteString);
-
- if (stringList.size()>0)
- {
- std::list::iterator flist;
- for (flist=freeStringList.begin(); flist != freeStringList.end(); flist++)
- {
- TuioString *freeString = (*flist);
- }
- freeStringList = freeStringBuffer;
- freeStringBuffer.clear();
- }
- }
- break;
- }
- }
- aliveStringList = stringBuffer;
- stringBuffer.clear();
- }
- else if( strcmp( cmd, "fseq" ) == 0 )
- {
- if(currentFrame>0) lastFrame = currentFrame;
- args >> currentFrame >> EndMessage;
-
- if ((currentFrame>=lastFrame) || (currentFrame<0))
- {
- long currentTime = lastTime;
- if (currentFrame>lastFrame)
- {
- currentTime = getCurrentTime()-startTime;
- lastTime = currentTime;
- }
-
- for (std::list::iterator refreshString=stringList.begin(); refreshString!=stringList.end(); refreshString++)
- if ((*refreshString)->getUpdateTime()==TUIO_UNDEFINED) (*refreshString)->setUpdateTime(currentTime);
-
- for (std::list::iterator listener=listenerList.begin(); listener != listenerList.end(); listener++)
- (*listener)->refresh(currentTime);
- }
- }
- }*/
- }
- catch( Exception& e )
- {
- std::cout << "error while parsing message: "<< msg.AddressPattern() << ": " << e.what() << "\n";
- }
-}
-
-void TuioClient::ProcessPacket( const char *data, int size, const IpEndpointName& remoteEndpoint ) {
- if (listenerList.size()==0) return;
- ReceivedPacket p( data, size );
- if(p.IsBundle()) ProcessBundle( ReceivedBundle(p), remoteEndpoint);
- else ProcessMessage( ReceivedMessage(p), remoteEndpoint);
-}
-
-void TuioClient::start(bool lk) {
-
- if (socket==NULL) return;
-
- locked = lk;
- if (!locked) {
- #ifndef WIN32
- pthread_create(&thread , NULL, ThreadFunc, this);
- #else
- DWORD threadId;
- thread = CreateThread( 0, 0, ThreadFunc, this, 0, &threadId );
- #endif
- } else socket->Run();
-
- startTime = getCurrentTime();
- lastTime = 0;
-
- running = true;
-}
-
-void TuioClient::stop() {
-
- if (socket==NULL) return;
- socket->Break();
-
- if (!locked) {
- #ifdef WIN32
- if( thread ) CloseHandle( thread );
- #endif
- thread = 0;
- locked = false;
- }
- running = false;
-}
-
-void TuioClient::addTuioListener(TuioListener *listener) {
- listenerList.push_back(listener);
-}
-
-void TuioClient::removeTuioListener(TuioListener *listener) {
- std::list::iterator result = find(listenerList.begin(),listenerList.end(),listener);
- if (result!=listenerList.end()) listenerList.remove(listener);
-}
-
-TuioObject* TuioClient::getTuioObject(long s_id) {
- for (std::list::iterator iter=objectList.begin(); iter != objectList.end(); iter++)
- if((*iter)->getSessionID()==s_id) return (*iter);
-
- return NULL;
-}
-
-TuioCursor* TuioClient::getTuioCursor(long s_id) {
- for (std::list::iterator iter=cursorList.begin(); iter != cursorList.end(); iter++)
- if((*iter)->getSessionID()==s_id) return (*iter);
-
- return NULL;
-}
-
-TuioString* TuioClient::getTuioString(long s_id) {
- for (std::list::iterator iter=stringList.begin(); iter != stringList.end(); iter++)
- if((*iter)->getSessionID()==s_id) return (*iter);
-
- return NULL;
-}
-
-std::list TuioClient::getTuioObjects() {
- return objectList;
-}
-
-std::list TuioClient::getTuioCursors() {
- return cursorList;
-}
-
-std::list TuioClient::getTuioStrings() {
- return stringList;
-}
-
-long TuioClient::getCurrentTime() {
-
- #ifdef WIN32
- long timestamp = GetTickCount();
- #else
- struct timeval tv;
- struct timezone tz;
- gettimeofday(&tv,&tz);
- long timestamp = (tv.tv_sec*1000)+(tv.tv_usec/1000);
- #endif
-
- return timestamp;
-}
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioClient.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#ifndef INCLUDED_TUIOCLIENT_H
-#define INCLUDED_TUIOCLIENT_H
-
-#ifndef WIN32
-#include
-#include
-#else
-#include
-#endif
-
-#include
-#include
-#include
-
-#include "osc/OscReceivedElements.h"
-#include "osc/OscPrintReceivedElements.h"
-
-#include "ip/UdpSocket.h"
-#include "ip/PacketListener.h"
-
-#include "TuioListener.h"
-#include "TuioObject.h"
-#include "TuioCursor.h"
-#include "TuioString.h"
-
-using namespace osc;
-
-class TuioClient : public PacketListener {
-
- public:
- TuioClient();
- TuioClient(int p);
- ~TuioClient();
-
- void start(bool lk=false);
- void stop();
- bool isRunning() { return running; }
-
-
- TuioObject* getTuioObject(long s_id);
- TuioCursor* getTuioCursor(long s_id);
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioString* getTuioString(long s_id);
- std::list getTuioObjects();
- std::list getTuioCursors();
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- std::list getTuioStrings();
-
- void addTuioListener(TuioListener *listener);
- void removeTuioListener(TuioListener *listener);
-
- void ProcessPacket( const char *data, int size, const IpEndpointName& remoteEndpoint );
-
- UdpListeningReceiveSocket *socket;
-
- protected:
- void ProcessBundle( const ReceivedBundle& b, const IpEndpointName& remoteEndpoint);
- void ProcessMessage( const ReceivedMessage& m, const IpEndpointName& remoteEndpoint);
-
- private:
- std::list listenerList;
-
- std::list objectList;
- std::list aliveObjectList, objectBuffer;
- std::list cursorList;
- std::list aliveCursorList, cursorBuffer;
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- std::list stringList;
- std::list aliveStringList, stringBuffer;
-
- int32 currentFrame, lastFrame;
-
- long startTime;
- long lastTime;
- long getCurrentTime();
-
- std::list freeCursorList, freeCursorBuffer;
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- std::list freeStringList, freeStringBuffer;
- int maxFingerID, maxStringID;
-
- #ifndef WIN32
- pthread_t thread;
- #else
- HANDLE thread;
- #endif
-
- bool locked;
- bool running;
-};
-
-#endif /* INCLUDED_TUIOCLIENT_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioContainer.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioContainer.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#ifndef INCLUDED_TUIOCONTAINER_H
-#define INCLUDED_TUIOCONTAINER_H
-
-#include
-#include
-#include "TuioPoint.h"
-#include
-
-#define TUIO_ADDED 0
-#define TUIO_UPDATED 1
-#define TUIO_REMOVED 2
-
-class TuioContainer: public TuioPoint {
-
- protected:
- long session_id;
- float xpos, ypos, zpos;
- float x_speed, y_speed;
- float motion_speed, motion_accel;
- std::list path;
-
- int state;
-
- public:
- TuioContainer (long s_id, float xpos, float ypos):TuioPoint(xpos,ypos) {
- this->session_id = s_id;
- this->x_speed = 0.0f;
- this->y_speed = 0.0f;
- this->motion_speed = 0.0f;
- this->motion_accel = 0.0f;
- TuioPoint p(xpos,ypos);
- path.push_back(p);
-
- state = TUIO_ADDED;
- };
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioContainer (long s_id, float xpos, float ypos, float zpos):TuioPoint(xpos,ypos,zpos) {
- this->session_id = s_id;
- this->x_speed = 0.0f;
- this->y_speed = 0.0f;
- this->motion_speed = 0.0f;
- this->motion_accel = 0.0f;
- TuioPoint p(xpos,ypos,zpos);
- path.push_back(p);
-
- state = TUIO_ADDED;
- };
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioContainer (TuioContainer *tuioContainer):TuioPoint(tuioContainer) {
- this->session_id = tuioContainer->getSessionID();
- this->x_speed = 0.0f;
- this->y_speed = 0.0f;
- this->motion_speed = 0.0f;
- this->motion_accel = 0.0f;
- TuioPoint p(xpos,ypos,zpos);
- path.push_back(p);
-
- state = TUIO_ADDED;
- };
-
- virtual ~TuioContainer(){};
-
- virtual void update (float xpos, float ypos,float xspeed, float yspeed,float maccel) {
- TuioPoint::update(xpos, ypos);
- this->x_speed = xspeed;
- this->y_speed = yspeed;
- this->motion_speed = (float)sqrt(xspeed*xspeed+yspeed*yspeed);
- this->motion_accel = maccel;
- TuioPoint p(xpos,ypos);
- path.push_back(p);
-
- state = TUIO_UPDATED;
- };
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- virtual void update (float xpos, float ypos, float zpos, float xspeed, float yspeed,float maccel) {
- TuioPoint::update(xpos, ypos, zpos);
- this->x_speed = xspeed;
- this->y_speed = yspeed;
- this->motion_speed = (float)sqrt(xspeed*xspeed+yspeed*yspeed);
- this->motion_accel = maccel;
- TuioPoint p(xpos,ypos,zpos);
- path.push_back(p);
-
- state = TUIO_UPDATED;
- };
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- virtual void update (TuioContainer *tuioContainer) {
- TuioPoint::update(tuioContainer);
- this->x_speed = tuioContainer->getXSpeed();
- this->y_speed = tuioContainer->getYSpeed();
- this->motion_speed = tuioContainer->getMotionSpeed();
- this->motion_accel = tuioContainer->getMotionAccel();
- TuioPoint p(xpos,ypos,zpos);
- path.push_back(p);
-
- state = TUIO_UPDATED;
- };
-
- virtual long getSessionID() { return session_id; };
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- virtual TuioPoint getPosition() {
- TuioPoint p(xpos,ypos,zpos);
- return p;
- };
-
- virtual std::list getPath() {
- return path;
- };
-
- virtual void remove() {
- state = TUIO_REMOVED;
- timestamp = TUIO_UNDEFINED;
- }
-
- virtual float getXSpeed() { return x_speed; };
- virtual float getYSpeed() { return y_speed; };
- virtual float getMotionSpeed() { return motion_speed; };
- virtual float getMotionAccel() { return motion_accel; };
-
- virtual int getState() { return state; };
- virtual void setUpdateTime(long timestamp) {
- this->timestamp = timestamp;
- TuioPoint *lastPoint = &path.back();
- if (lastPoint!=NULL) lastPoint->setUpdateTime(timestamp);
- };
-
-};
-
-#endif
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioCursor.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioCursor.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#ifndef INCLUDED_TUIOCURSOR_H
-#define INCLUDED_TUIOCURSOR_H
-
-#include
-#include
-#include "TuioContainer.h"
-
-class TuioCursor: public TuioContainer {
-
- protected:
- int finger_id;
- std::list path;
-
- public:
- TuioCursor (long s_id, int f_id, float xpos, float ypos):TuioContainer(s_id,xpos,ypos) {
- this->finger_id = f_id;
- };
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioCursor (long s_id, int f_id, float xpos, float ypos, float zpos):TuioContainer(s_id,xpos,ypos,zpos) {
- this->finger_id = f_id;
- };
-
- TuioCursor (TuioCursor *tuioCursor):TuioContainer(tuioCursor) {
- this->finger_id = tuioCursor->getFingerID();
- };
-
- ~TuioCursor(){};
-
- int getFingerID() { return finger_id; };
-};
-
-#endif
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioListener.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioListener.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#ifndef INCLUDED_TUIOLISTENER_H
-#define INCLUDED_TUIOLISTENER_H
-
-#include "TuioObject.h"
-#include "TuioCursor.h"
-#include "TuioString.h"
-
-class TuioListener {
-
- public:
- virtual ~TuioListener(){};
-
- virtual void addTuioObject(TuioObject *tuioObject)=0;
- virtual void updateTuioObject(TuioObject *tuioObject)=0;
- virtual void removeTuioObject(TuioObject *tuioObject)=0;
-
- virtual void addTuioCursor(TuioCursor *tuioCursor)=0;
- virtual void updateTuioCursor(TuioCursor *tuioCursor)=0;
- virtual void removeTuioCursor(TuioCursor *tuioCursor)=0;
-
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- virtual void addTuioString(TuioString *tuioString)=0;
- virtual void updateTuioString(TuioString *tuioString)=0;
- virtual void removeTuioString(TuioString *tuioString)=0;
-
- virtual void refresh(long timestamp)=0;
-};
-
-#endif /* INCLUDED_TUIOLISTENER_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioObject.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioObject.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-#ifndef INCLUDED_TUIOOBJECT_H
-#define INCLUDED_TUIOOBJECT_H
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#include
-#include
-#include "TuioContainer.h"
-
-class TuioObject: public TuioContainer {
-
- protected:
- long session_id;
- int fiducial_id;
- float xpos, ypos, angle;
- float x_speed, y_speed, motion_speed, motion_accel;
- float rotation_speed, rotation_accel;
- std::list path;
-
- public:
- TuioObject (long s_id, int f_id, float xpos, float ypos, float angle):TuioContainer(s_id, xpos, ypos) {
- this->fiducial_id = f_id;
- this->angle = angle;
- this->rotation_speed = 0.0f;
- this->rotation_accel = 0.0f;
- };
-
- TuioObject (TuioObject *tuioObject):TuioContainer(tuioObject) {
- this->fiducial_id = tuioObject->getFiducialID();
- this->angle = angle;
- this->rotation_speed = 0.0f;
- this->rotation_accel = 0.0f;
- };
-
- ~TuioObject() {};
-
- void update (float xpos, float ypos, float angle, float xspeed, float yspeed, float rspeed, float maccel, float raccel) {
- TuioContainer::update(xpos,ypos,xspeed,yspeed,maccel);
- this->angle = angle;
- this->rotation_speed = rspeed;
- this->rotation_accel = raccel;
- };
-
- void update (TuioObject *tuioObject) {
- TuioContainer::update(tuioObject);
- this->angle = tuioObject->getAngle();
- this->rotation_speed = tuioObject->getRotationSpeed();
- this->rotation_accel = tuioObject->getRotationAccel();
- };
-
- int getFiducialID() { return fiducial_id; };
-
- float getAngle() { return angle; }
- float getAngleDegrees() { return (float)(angle/M_PI*180); }
-
- float getRotationSpeed() { return rotation_speed; };
- float getRotationAccel() { return rotation_accel; };
-
-};
-
-#endif
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioPoint.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioPoint.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- TUIO C++ Library - part of the reacTIVision project
- http://reactivision.sourceforge.net/
-
- Copyright (c) 2005-2008 Martin Kaltenbrunner
-
- 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
-*/
-
-#ifndef INCLUDED_TUIOPOINT_H
-#define INCLUDED_TUIOPOINT_H
-
-#define TUIO_UNDEFINED -1
-
-class TuioPoint {
-
- protected:
- float xpos, ypos, zpos;
- long timestamp;
-
- public:
- TuioPoint (float xpos, float ypos) {
- this->xpos = xpos;
- this->ypos = ypos;
- timestamp = TUIO_UNDEFINED;
- };
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioPoint (float xpos, float ypos, float zpos) {
- this->xpos = xpos;
- this->ypos = ypos;
- this->zpos = zpos;
- timestamp = TUIO_UNDEFINED;
- };
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- TuioPoint (TuioPoint *tuioPoint) {
- this->xpos = tuioPoint->getX();
- this->ypos = tuioPoint->getY();
- this->zpos = tuioPoint->getZ();
- timestamp = TUIO_UNDEFINED;
- };
-
- ~TuioPoint(){};
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- void update (TuioPoint *tuioPoint) {
- this->xpos = tuioPoint->getX();
- this->ypos = tuioPoint->getY();
- this->zpos = tuioPoint->getZ();
- timestamp = TUIO_UNDEFINED;
- };
-
- void update (float xpos, float ypos) {
- this->xpos = xpos;
- this->ypos = ypos;
- timestamp = TUIO_UNDEFINED;
- };
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- void update (float xpos, float ypos, float zpos) {
- this->xpos = xpos;
- this->ypos = ypos;
- this->zpos = zpos;
- timestamp = TUIO_UNDEFINED;
- };
-
- float getX() { return xpos; };
- float getY() { return ypos; };
- /*
- * Ajouté par alexandre.bastien@iri.centrepompidou.fr
- */
- float getZ() { return zpos; };
-
- float getDistance(float x, float y) {
- float dx = xpos-x;
- float dy = ypos-y;
- return sqrtf(dx*dx+dy*dy);
- }
-
- /*
- * Surchargé par alexandre.bastien@iri.centrepompidou.fr
- */
- float getDistance(float x, float y, float z) {
- float dx = xpos-x;
- float dy = ypos-y;
- float dz = zpos-z;
- return sqrtf(dx*dx+dy*dy+dz*dz);
- }
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- float getDistance(TuioPoint *tuioPoint) {
- float dx = xpos-tuioPoint->getX();
- float dy = ypos-tuioPoint->getY();
- float dz = zpos-tuioPoint->getZ();
- return sqrtf(dx*dx+dy*dy+dz*dz);
- }
-
- /*
- * Modifié par alexandre.bastien@iri.centrepompidou.fr
- */
- /*float getDistance3D(TuioPoint *tuioPoint) {
- float dx = xpos-tuioPoint->getX();
- float dy = ypos-tuioPoint->getY();
- float dz = zpos-tuioPoint->getZ();
- return sqrtf(dx*dx+dy*dy+dz*dz);
- }*/
-
- float getAngle(TuioPoint *tuioPoint) {
-
- float side = tuioPoint->getX()-xpos;
- float height = tuioPoint->getY()-ypos;
- float distance = tuioPoint->getDistance(xpos,ypos);
-
- float angle = (float)(asin(side/distance)+M_PI/2);
- if (height<0) angle = 2.0f*(float)M_PI-angle;
-
- return angle;
- }
-
- float getAngleDegrees(TuioPoint *tuioPoint) {
- return ((getAngle(tuioPoint)/(float)M_PI)*180.0f);
- }
-
- float getScreenX(int w) { return xpos*w; };
- float getScreenY(int h) { return ypos*h; };
-
- long getUpdateTime() { return timestamp; };
- void setUpdateTime(long timestamp) { this->timestamp = timestamp; };
-
-};
-
-#endif
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/TuioString.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/TuioString.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- Modified by alexandre.bastien@iri.centrepompidou.fr to manage TUIO strings.
-*/
-
-#ifndef INCLUDED_TUIOSTRING_H
-#define INCLUDED_TUIOSTRING_H
-
-class TuioString {
-
- protected:
- int session_id;
- int string_id;
- const char* code;
- long timestamp;
- int state;
-
- public:
- TuioString (int s_id, int string_id, const char* _code) {
- this->session_id = s_id;
- this->string_id = string_id;
- this->code = _code;
- timestamp = TUIO_UNDEFINED;
- state = TUIO_ADDED;
- };
-
- TuioString (TuioString *tuioString) {
- this->session_id = tuioString->getSessionID();
- this->string_id = tuioString->getStringID();
- this->code = tuioString->getCode();
- timestamp = TUIO_UNDEFINED;
- state = TUIO_ADDED;
- };
-
- ~TuioString(){};
-
- int getSessionID() { return session_id; };
- int getStringID() { return string_id; };
- const char* getCode() { return code; };
-
-
- void update(const char* _code)
- {
- this->code = _code;
- timestamp = TUIO_UNDEFINED;
- state = TUIO_UPDATED;
- }
-
- void remove() {
- state = TUIO_REMOVED;
- timestamp = TUIO_UNDEFINED;
- }
-
- long getUpdateTime() { return timestamp; };
- void setUpdateTime(long timestamp) { this->timestamp = timestamp; };
-};
-
-#endif
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/changes
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/changes Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-September 28, 2005
-------------------
-
-Compared to the previous official snapshot (November 2004) the
-current version of oscpack includes a re-written set of network
-classes and some changes to the syntax of the networking code. It no
-longer uses threads, which means that you don't need to use sleep()
-if you are writing a simple single-threaded server, or you need to
-spawn your own threads in a more complex application.
-
-The list below summarises the changes if you are porting code from
-the previous release.
-
- - there are no longer any threads in oscpack. if you need to
- set up an asynchronous listener you can create your own thread
- and call Run on an instance of SocketReceiveMultiplexer or
- UdpListeningReceiveSocket (see ip/UdpSocket.h) yourself.
-
- - host byte order is now used for network (IP) addresses
-
- - functions which used to take two parameters
- now take an instance of IpEndpointName (see
- ip/IpEndpointName.h) this class has a number of convenient
- constructors for converting numbers and strings to internet
- addresses. For example there is one which takes a string and
- another that take the dotted address components as separate
- parameters.
-
- - The UdpTransmitPort class, formerly in UdpTransmitPort.h, is
- now called UdpTransmitSocket, which is simply a convenience
- class derived from UdpSocket (see ip/UdpSocket.h). Where you
- used to use the constructor UdpTransmitPort( address, port) now
- you can use UdpTransmitSocket( IpEndpointName( address, port )
- ) or you can any of the other possible ctors to IpEndpointName
- () (see above). The Send() method is unchanged.
-
- - The packet listener base class is now located in
- ip/PacketListener.h instead of PacketListenerPort.h. The
- ProcessPacket method now has an additional parameter indicating
- the remote endpoint
-
- - The preferred way to set up listeners is with
- SocketReceiveMultiplexer (in ip/UdpSocket.h), this also allows
- attaching periodic timers. For simple applications which only
- listen to a single socket with no timers you can use
- UdpListeningReceiveSocket (also in UdpSocket.h) See
- osc/OscReceiveTest.cpp or osc/OscDump.cpp for examples of this.
- This is more or less equivalent to the UdpPacketListenerPort
- object in the old oscpack versions except that you need to
- explicitly call Run() before it will start receiving packets
- and it runs in the same thread, not a separate thread so Run()
- won't usually return.
-
- - Explicit calls to InitializeNetworking() and
- TerminateNetworking() are no longer required for simple
- applications (more complex windows applications should
- instantiate NetworkInitializer in main() or WinMain (see
- ip/NetworkingUtils.h/.cpp)
-
- - The OscPacketListener base class (OscPacketListener.h) was
- added to make traversing OSC packets easier, it handles bundle
- traversal automatically so you only need to process messages in
- your derived classes.
-
- - On Windows be sure to link with ws2_32.lib or you will see
- a linker error about WSAEventSelect not being found. Also you
- will need to link with winmm.lib for timeGetTime()
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/IpEndpointName.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/IpEndpointName.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "IpEndpointName.h"
-
-#include
-
-#include "NetworkingUtils.h"
-
-
-unsigned long IpEndpointName::GetHostByName( const char *s )
-{
- return ::GetHostByName(s);
-}
-
-
-void IpEndpointName::AddressAsString( char *s ) const
-{
- if( address == ANY_ADDRESS ){
- sprintf( s, "" );
- }else{
- sprintf( s, "%d.%d.%d.%d",
- (int)((address >> 24) & 0xFF),
- (int)((address >> 16) & 0xFF),
- (int)((address >> 8) & 0xFF),
- (int)(address & 0xFF) );
- }
-}
-
-
-void IpEndpointName::AddressAndPortAsString( char *s ) const
-{
- if( port == ANY_PORT ){
- if( address == ANY_ADDRESS ){
- sprintf( s, ":" );
- }else{
- sprintf( s, "%d.%d.%d.%d:",
- (int)((address >> 24) & 0xFF),
- (int)((address >> 16) & 0xFF),
- (int)((address >> 8) & 0xFF),
- (int)(address & 0xFF) );
- }
- }else{
- if( address == ANY_ADDRESS ){
- sprintf( s, ":%d", port );
- }else{
- sprintf( s, "%d.%d.%d.%d:%d",
- (int)((address >> 24) & 0xFF),
- (int)((address >> 16) & 0xFF),
- (int)((address >> 8) & 0xFF),
- (int)(address & 0xFF),
- (int)port );
- }
- }
-}
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/IpEndpointName.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/IpEndpointName.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_IPENDPOINTNAME_H
-#define INCLUDED_IPENDPOINTNAME_H
-
-
-class IpEndpointName{
- static unsigned long GetHostByName( const char *s );
-public:
- static const unsigned long ANY_ADDRESS = 0xFFFFFFFF;
- static const int ANY_PORT = -1;
-
- IpEndpointName()
- : address( ANY_ADDRESS ), port( ANY_PORT ) {}
- IpEndpointName( int port_ )
- : address( ANY_ADDRESS ), port( port_ ) {}
- IpEndpointName( unsigned long ipAddress_, int port_ )
- : address( ipAddress_ ), port( port_ ) {}
- IpEndpointName( const char *addressName, int port_=ANY_PORT )
- : address( GetHostByName( addressName ) )
- , port( port_ ) {}
- IpEndpointName( int addressA, int addressB, int addressC, int addressD, int port_=ANY_PORT )
- : address( ( (addressA << 24) | (addressB << 16) | (addressC << 8) | addressD ) )
- , port( port_ ) {}
-
- // address and port are maintained in host byte order here
- unsigned long address;
- int port;
-
- enum { ADDRESS_STRING_LENGTH=17 };
- void AddressAsString( char *s ) const;
-
- enum { ADDRESS_AND_PORT_STRING_LENGTH=23};
- void AddressAndPortAsString( char *s ) const;
-};
-
-inline bool operator==( const IpEndpointName& lhs, const IpEndpointName& rhs )
-{
- return (lhs.address == rhs.address && lhs.port == rhs.port );
-}
-
-inline bool operator!=( const IpEndpointName& lhs, const IpEndpointName& rhs )
-{
- return !(lhs == rhs);
-}
-
-#endif /* INCLUDED_IPENDPOINTNAME_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/NetworkingUtils.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/NetworkingUtils.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_NETWORKINGUTILS_H
-#define INCLUDED_NETWORKINGUTILS_H
-
-
-// in general NetworkInitializer is only used internally, but if you're
-// application creates multiple sockets from different threads at runtime you
-// should instantiate one of these in main just to make sure the networking
-// layer is initialized.
-class NetworkInitializer{
-public:
- NetworkInitializer();
- ~NetworkInitializer();
-};
-
-
-// return ip address of host name in host byte order
-unsigned long GetHostByName( const char *name );
-
-
-#endif /* INCLUDED_NETWORKINGUTILS_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/PacketListener.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/PacketListener.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_PACKETLISTENER_H
-#define INCLUDED_PACKETLISTENER_H
-
-
-class IpEndpointName;
-
-class PacketListener{
-public:
- virtual ~PacketListener() {}
- virtual void ProcessPacket( const char *data, int size,
- const IpEndpointName& remoteEndpoint ) = 0;
-};
-
-#endif /* INCLUDED_PACKETLISTENER_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/TimerListener.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/TimerListener.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_TIMERLISTENER_H
-#define INCLUDED_TIMERLISTENER_H
-
-
-class TimerListener{
-public:
- virtual ~TimerListener() {}
- virtual void TimerExpired() = 0;
-};
-
-#endif /* INCLUDED_TIMERLISTENER_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/UdpSocket.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/UdpSocket.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_UDPSOCKET_H
-#define INCLUDED_UDPSOCKET_H
-
-#ifndef INCLUDED_NETWORKINGUTILITIES_H
-#include "NetworkingUtils.h"
-#endif /* INCLUDED_NETWORKINGUTILITIES_H */
-
-#ifndef INCLUDED_IPENDPOINTNAME_H
-#include "IpEndpointName.h"
-#endif /* INCLUDED_IPENDPOINTNAME_H */
-
-
-class PacketListener;
-class TimerListener;
-
-class UdpSocket;
-
-class SocketReceiveMultiplexer{
- class Implementation;
- Implementation *impl_;
-
- friend class UdpSocket;
-
-public:
- SocketReceiveMultiplexer();
- ~SocketReceiveMultiplexer();
-
- // only call the attach/detach methods _before_ calling Run
-
- // only one listener per socket, each socket at most once
- void AttachSocketListener( UdpSocket *socket, PacketListener *listener );
- void DetachSocketListener( UdpSocket *socket, PacketListener *listener );
-
- void AttachPeriodicTimerListener( int periodMilliseconds, TimerListener *listener );
- void AttachPeriodicTimerListener(
- int initialDelayMilliseconds, int periodMilliseconds, TimerListener *listener );
- void DetachPeriodicTimerListener( TimerListener *listener );
-
- void Run(); // loop and block processing messages indefinitely
- void RunUntilSigInt();
- void Break(); // call this from a listener to exit once the listener returns
- void AsynchronousBreak(); // call this from another thread or signal handler to exit the Run() state
-};
-
-
-class UdpSocket{
- class Implementation;
- Implementation *impl_;
-
- friend class SocketReceiveMultiplexer::Implementation;
-
-public:
-
- // ctor throws std::runtime_error if there's a problem
- // initializing the socket.
- UdpSocket();
- virtual ~UdpSocket();
-
- // the socket is created in an unbound, unconnected state
- // such a socket can only be used to send to an arbitrary
- // address using SendTo(). To use Send() you need to first
- // connect to a remote endpoint using Connect(). To use
- // ReceiveFrom you need to first bind to a local endpoint
- // using Bind().
-
- // retrieve the local endpoint name when sending to 'to'
- IpEndpointName LocalEndpointFor( const IpEndpointName& remoteEndpoint ) const;
-
- // Connect to a remote endpoint which is used as the target
- // for calls to Send()
- void Connect( const IpEndpointName& remoteEndpoint );
- void Send( const char *data, int size );
- void SendTo( const IpEndpointName& remoteEndpoint, const char *data, int size );
-
-
- // Bind a local endpoint to receive incoming data. Endpoint
- // can be 'any' for the system to choose an endpoint
- void Bind( const IpEndpointName& localEndpoint );
- bool IsBound() const;
-
- int ReceiveFrom( IpEndpointName& remoteEndpoint, char *data, int size );
-};
-
-
-// convenience classes for transmitting and receiving
-// they just call Connect and/or Bind in the ctor.
-// note that you can still use a receive socket
-// for transmitting etc
-
-class UdpTransmitSocket : public UdpSocket{
-public:
- UdpTransmitSocket( const IpEndpointName& remoteEndpoint )
- { Connect( remoteEndpoint ); }
-};
-
-
-class UdpReceiveSocket : public UdpSocket{
-public:
- UdpReceiveSocket( const IpEndpointName& localEndpoint )
- { Bind( localEndpoint ); }
-};
-
-
-// UdpListeningReceiveSocket provides a simple way to bind one listener
-// to a single socket without having to manually set up a SocketReceiveMultiplexer
-
-class UdpListeningReceiveSocket : public UdpSocket{
- SocketReceiveMultiplexer mux_;
- PacketListener *listener_;
-public:
- UdpListeningReceiveSocket( const IpEndpointName& localEndpoint, PacketListener *listener )
- : listener_( listener )
- {
- Bind( localEndpoint );
- mux_.AttachSocketListener( this, listener_ );
- }
-
- ~UdpListeningReceiveSocket()
- { mux_.DetachSocketListener( this, listener_ ); }
-
- // see SocketReceiveMultiplexer above for the behaviour of these methods...
- void Run() { mux_.Run(); }
- void RunUntilSigInt() { mux_.RunUntilSigInt(); }
- void Break() { mux_.Break(); }
- void AsynchronousBreak() { mux_.AsynchronousBreak(); }
-};
-
-
-#endif /* INCLUDED_UDPSOCKET_H */
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/posix/NetworkingUtils.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/posix/NetworkingUtils.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "ip/NetworkingUtils.h"
-
-#include
-#include
-#include
-#include
-#include
-
-
-
-NetworkInitializer::NetworkInitializer() {}
-
-NetworkInitializer::~NetworkInitializer() {}
-
-
-unsigned long GetHostByName( const char *name )
-{
- unsigned long result = 0;
-
- struct hostent *h = gethostbyname( name );
- if( h ){
- struct in_addr a;
- memcpy( &a, h->h_addr_list[0], h->h_length );
- result = ntohl(a.s_addr);
- }
-
- return result;
-}
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/posix/UdpSocket.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/posix/UdpSocket.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,549 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "ip/UdpSocket.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include // for memset
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include // for sockaddr_in
-
-#include "ip/PacketListener.h"
-#include "ip/TimerListener.h"
-
-
-#if defined(__APPLE__) && !defined(_SOCKLEN_T)
-// pre system 10.3 didn have socklen_t
-typedef ssize_t socklen_t;
-#endif
-
-
-static void SockaddrFromIpEndpointName( struct sockaddr_in& sockAddr, const IpEndpointName& endpoint )
-{
- memset( (char *)&sockAddr, 0, sizeof(sockAddr ) );
- sockAddr.sin_family = AF_INET;
-
- sockAddr.sin_addr.s_addr =
- (endpoint.address == IpEndpointName::ANY_ADDRESS)
- ? INADDR_ANY
- : htonl( endpoint.address );
-
- sockAddr.sin_port =
- (endpoint.port == IpEndpointName::ANY_PORT)
- ? 0
- : htons( endpoint.port );
-}
-
-
-static IpEndpointName IpEndpointNameFromSockaddr( const struct sockaddr_in& sockAddr )
-{
- return IpEndpointName(
- (sockAddr.sin_addr.s_addr == INADDR_ANY)
- ? IpEndpointName::ANY_ADDRESS
- : ntohl( sockAddr.sin_addr.s_addr ),
- (sockAddr.sin_port == 0)
- ? IpEndpointName::ANY_PORT
- : ntohs( sockAddr.sin_port )
- );
-}
-
-
-class UdpSocket::Implementation{
- bool isBound_;
- bool isConnected_;
-
- int socket_;
- struct sockaddr_in connectedAddr_;
- struct sockaddr_in sendToAddr_;
-
-public:
-
- Implementation()
- : isBound_( false )
- , isConnected_( false )
- , socket_( -1 )
- {
- if( (socket_ = socket( AF_INET, SOCK_DGRAM, 0 )) == -1 ){
- throw std::runtime_error("unable to create udp socket\n");
- }
-
- memset( &sendToAddr_, 0, sizeof(sendToAddr_) );
- sendToAddr_.sin_family = AF_INET;
- }
-
- ~Implementation()
- {
- if (socket_ != -1) close(socket_);
- }
-
- IpEndpointName LocalEndpointFor( const IpEndpointName& remoteEndpoint ) const
- {
- assert( isBound_ );
-
- // first connect the socket to the remote server
-
- struct sockaddr_in connectSockAddr;
- SockaddrFromIpEndpointName( connectSockAddr, remoteEndpoint );
-
- if (connect(socket_, (struct sockaddr *)&connectSockAddr, sizeof(connectSockAddr)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- // get the address
-
- struct sockaddr_in sockAddr;
- memset( (char *)&sockAddr, 0, sizeof(sockAddr ) );
- socklen_t length = sizeof(sockAddr);
- if (getsockname(socket_, (struct sockaddr *)&sockAddr, &length) < 0) {
- throw std::runtime_error("unable to getsockname\n");
- }
-
- if( isConnected_ ){
- // reconnect to the connected address
-
- if (connect(socket_, (struct sockaddr *)&connectedAddr_, sizeof(connectedAddr_)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- }else{
- // unconnect from the remote address
-
- struct sockaddr_in unconnectSockAddr;
- memset( (char *)&unconnectSockAddr, 0, sizeof(unconnectSockAddr ) );
- unconnectSockAddr.sin_family = AF_UNSPEC;
- // address fields are zero
- int connectResult = connect(socket_, (struct sockaddr *)&unconnectSockAddr, sizeof(unconnectSockAddr));
- if ( connectResult < 0 && errno != EAFNOSUPPORT ) {
- throw std::runtime_error("unable to un-connect udp socket\n");
- }
- }
-
- return IpEndpointNameFromSockaddr( sockAddr );
- }
-
- void Connect( const IpEndpointName& remoteEndpoint )
- {
- SockaddrFromIpEndpointName( connectedAddr_, remoteEndpoint );
-
- if (connect(socket_, (struct sockaddr *)&connectedAddr_, sizeof(connectedAddr_)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- isConnected_ = true;
- }
-
- void Send( const char *data, int size )
- {
- assert( isConnected_ );
-
- send( socket_, data, size, 0 );
- }
-
- void SendTo( const IpEndpointName& remoteEndpoint, const char *data, int size )
- {
- sendToAddr_.sin_addr.s_addr = htonl( remoteEndpoint.address );
- sendToAddr_.sin_port = htons( remoteEndpoint.port );
-
- sendto( socket_, data, size, 0, (sockaddr*)&sendToAddr_, sizeof(sendToAddr_) );
- }
-
- void Bind( const IpEndpointName& localEndpoint )
- {
- struct sockaddr_in bindSockAddr;
- SockaddrFromIpEndpointName( bindSockAddr, localEndpoint );
-
- if (bind(socket_, (struct sockaddr *)&bindSockAddr, sizeof(bindSockAddr)) < 0) {
- throw std::runtime_error("unable to bind udp socket\n");
- }
-
- isBound_ = true;
- }
-
- bool IsBound() const { return isBound_; }
-
- int ReceiveFrom( IpEndpointName& remoteEndpoint, char *data, int size )
- {
- assert( isBound_ );
-
- struct sockaddr_in fromAddr;
- socklen_t fromAddrLen = sizeof(fromAddr);
-
- int result = recvfrom(socket_, data, size, 0,
- (struct sockaddr *) &fromAddr, (socklen_t*)&fromAddrLen);
- if( result < 0 )
- return 0;
-
- remoteEndpoint.address = ntohl(fromAddr.sin_addr.s_addr);
- remoteEndpoint.port = ntohs(fromAddr.sin_port);
-
- return result;
- }
-
- int Socket() { return socket_; }
-};
-
-UdpSocket::UdpSocket()
-{
- impl_ = new Implementation();
-}
-
-UdpSocket::~UdpSocket()
-{
- delete impl_;
-}
-
-IpEndpointName UdpSocket::LocalEndpointFor( const IpEndpointName& remoteEndpoint ) const
-{
- return impl_->LocalEndpointFor( remoteEndpoint );
-}
-
-void UdpSocket::Connect( const IpEndpointName& remoteEndpoint )
-{
- impl_->Connect( remoteEndpoint );
-}
-
-void UdpSocket::Send( const char *data, int size )
-{
- impl_->Send( data, size );
-}
-
-void UdpSocket::SendTo( const IpEndpointName& remoteEndpoint, const char *data, int size )
-{
- impl_->SendTo( remoteEndpoint, data, size );
-}
-
-void UdpSocket::Bind( const IpEndpointName& localEndpoint )
-{
- impl_->Bind( localEndpoint );
-}
-
-bool UdpSocket::IsBound() const
-{
- return impl_->IsBound();
-}
-
-int UdpSocket::ReceiveFrom( IpEndpointName& remoteEndpoint, char *data, int size )
-{
- return impl_->ReceiveFrom( remoteEndpoint, data, size );
-}
-
-
-struct AttachedTimerListener{
- AttachedTimerListener( int id, int p, TimerListener *tl )
- : initialDelayMs( id )
- , periodMs( p )
- , listener( tl ) {}
- int initialDelayMs;
- int periodMs;
- TimerListener *listener;
-};
-
-
-static bool CompareScheduledTimerCalls(
- const std::pair< double, AttachedTimerListener > & lhs, const std::pair< double, AttachedTimerListener > & rhs )
-{
- return lhs.first < rhs.first;
-}
-
-
-SocketReceiveMultiplexer *multiplexerInstanceToAbortWithSigInt_ = 0;
-
-extern "C" /*static*/ void InterruptSignalHandler( int );
-/*static*/ void InterruptSignalHandler( int )
-{
- multiplexerInstanceToAbortWithSigInt_->AsynchronousBreak();
- signal( SIGINT, SIG_DFL );
-}
-
-
-class SocketReceiveMultiplexer::Implementation{
- std::vector< std::pair< PacketListener*, UdpSocket* > > socketListeners_;
- std::vector< AttachedTimerListener > timerListeners_;
-
- volatile bool break_;
- int breakPipe_[2]; // [0] is the reader descriptor and [1] the writer
-
- double GetCurrentTimeMs() const
- {
- struct timeval t;
-
- gettimeofday( &t, 0 );
-
- return ((double)t.tv_sec*1000.) + ((double)t.tv_usec / 1000.);
- }
-
-public:
- Implementation()
- {
- if( pipe(breakPipe_) != 0 )
- throw std::runtime_error( "creation of asynchronous break pipes failed\n" );
- }
-
- ~Implementation()
- {
- close( breakPipe_[0] );
- close( breakPipe_[1] );
- }
-
- void AttachSocketListener( UdpSocket *socket, PacketListener *listener )
- {
- assert( std::find( socketListeners_.begin(), socketListeners_.end(), std::make_pair(listener, socket) ) == socketListeners_.end() );
- // we don't check that the same socket has been added multiple times, even though this is an error
- socketListeners_.push_back( std::make_pair( listener, socket ) );
- }
-
- void DetachSocketListener( UdpSocket *socket, PacketListener *listener )
- {
- std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i =
- std::find( socketListeners_.begin(), socketListeners_.end(), std::make_pair(listener, socket) );
- assert( i != socketListeners_.end() );
-
- socketListeners_.erase( i );
- }
-
- void AttachPeriodicTimerListener( int periodMilliseconds, TimerListener *listener )
- {
- timerListeners_.push_back( AttachedTimerListener( periodMilliseconds, periodMilliseconds, listener ) );
- }
-
- void AttachPeriodicTimerListener( int initialDelayMilliseconds, int periodMilliseconds, TimerListener *listener )
- {
- timerListeners_.push_back( AttachedTimerListener( initialDelayMilliseconds, periodMilliseconds, listener ) );
- }
-
- void DetachPeriodicTimerListener( TimerListener *listener )
- {
- std::vector< AttachedTimerListener >::iterator i = timerListeners_.begin();
- while( i != timerListeners_.end() ){
- if( i->listener == listener )
- break;
- ++i;
- }
-
- assert( i != timerListeners_.end() );
-
- timerListeners_.erase( i );
- }
-
- void Run()
- {
- break_ = false;
-
- // configure the master fd_set for select()
-
- fd_set masterfds, tempfds;
- FD_ZERO( &masterfds );
- FD_ZERO( &tempfds );
-
- // in addition to listening to the inbound sockets we
- // also listen to the asynchronous break pipe, so that AsynchronousBreak()
- // can break us out of select() from another thread.
- FD_SET( breakPipe_[0], &masterfds );
- int fdmax = breakPipe_[0];
-
- for( std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i = socketListeners_.begin();
- i != socketListeners_.end(); ++i ){
-
- if( fdmax < i->second->impl_->Socket() )
- fdmax = i->second->impl_->Socket();
- FD_SET( i->second->impl_->Socket(), &masterfds );
- }
-
-
- // configure the timer queue
- double currentTimeMs = GetCurrentTimeMs();
-
- // expiry time ms, listener
- std::vector< std::pair< double, AttachedTimerListener > > timerQueue_;
- for( std::vector< AttachedTimerListener >::iterator i = timerListeners_.begin();
- i != timerListeners_.end(); ++i )
- timerQueue_.push_back( std::make_pair( currentTimeMs + i->initialDelayMs, *i ) );
- std::sort( timerQueue_.begin(), timerQueue_.end(), CompareScheduledTimerCalls );
-
- const int MAX_BUFFER_SIZE = 4098;
- char *data = new char[ MAX_BUFFER_SIZE ];
- IpEndpointName remoteEndpoint;
-
- struct timeval timeout;
-
- while( !break_ ){
- tempfds = masterfds;
-
- struct timeval *timeoutPtr = 0;
- if( !timerQueue_.empty() ){
- double timeoutMs = timerQueue_.front().first - GetCurrentTimeMs();
- if( timeoutMs < 0 )
- timeoutMs = 0;
-
- // 1000000 microseconds in a second
- timeout.tv_sec = (long)(timeoutMs * .001);
- timeout.tv_usec = (long)((timeoutMs - (timeout.tv_sec * 1000)) * 1000);
- timeoutPtr = &timeout;
- }
-
- if( select( fdmax + 1, &tempfds, 0, 0, timeoutPtr ) < 0 && errno != EINTR ){
- if (!break_) throw std::runtime_error("select failed\n");
- else break;
- }
-
- if ( FD_ISSET( breakPipe_[0], &tempfds ) ){
- // clear pending data from the asynchronous break pipe
- char c;
- ssize_t ret;
- ret = read( breakPipe_[0], &c, 1 );
- }
-
- if( break_ )
- break;
-
- for( std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i = socketListeners_.begin();
- i != socketListeners_.end(); ++i ){
-
- if( FD_ISSET( i->second->impl_->Socket(), &tempfds ) ){
-
- int size = i->second->ReceiveFrom( remoteEndpoint, data, MAX_BUFFER_SIZE );
- if( size > 0 ){
- i->first->ProcessPacket( data, size, remoteEndpoint );
- if( break_ )
- break;
- }
- }
- }
-
- // execute any expired timers
- currentTimeMs = GetCurrentTimeMs();
- bool resort = false;
- for( std::vector< std::pair< double, AttachedTimerListener > >::iterator i = timerQueue_.begin();
- i != timerQueue_.end() && i->first <= currentTimeMs; ++i ){
-
- i->second.listener->TimerExpired();
- if( break_ )
- break;
-
- i->first += i->second.periodMs;
- resort = true;
- }
- if( resort )
- std::sort( timerQueue_.begin(), timerQueue_.end(), CompareScheduledTimerCalls );
- }
-
- delete [] data;
- }
-
- void Break()
- {
- break_ = true;
- }
-
- void AsynchronousBreak()
- {
- break_ = true;
-
- // Send a termination message to the asynchronous break pipe, so select() will return
- ssize_t ret;
- ret = write( breakPipe_[1], "!", 1 );
- }
-};
-
-
-
-SocketReceiveMultiplexer::SocketReceiveMultiplexer()
-{
- impl_ = new Implementation();
-}
-
-SocketReceiveMultiplexer::~SocketReceiveMultiplexer()
-{
- delete impl_;
-}
-
-void SocketReceiveMultiplexer::AttachSocketListener( UdpSocket *socket, PacketListener *listener )
-{
- impl_->AttachSocketListener( socket, listener );
-}
-
-void SocketReceiveMultiplexer::DetachSocketListener( UdpSocket *socket, PacketListener *listener )
-{
- impl_->DetachSocketListener( socket, listener );
-}
-
-void SocketReceiveMultiplexer::AttachPeriodicTimerListener( int periodMilliseconds, TimerListener *listener )
-{
- impl_->AttachPeriodicTimerListener( periodMilliseconds, listener );
-}
-
-void SocketReceiveMultiplexer::AttachPeriodicTimerListener( int initialDelayMilliseconds, int periodMilliseconds, TimerListener *listener )
-{
- impl_->AttachPeriodicTimerListener( initialDelayMilliseconds, periodMilliseconds, listener );
-}
-
-void SocketReceiveMultiplexer::DetachPeriodicTimerListener( TimerListener *listener )
-{
- impl_->DetachPeriodicTimerListener( listener );
-}
-
-void SocketReceiveMultiplexer::Run()
-{
- impl_->Run();
-}
-
-void SocketReceiveMultiplexer::RunUntilSigInt()
-{
- assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); /* at present we support only one multiplexer instance running until sig int */
- multiplexerInstanceToAbortWithSigInt_ = this;
- signal( SIGINT, InterruptSignalHandler );
- impl_->Run();
- signal( SIGINT, SIG_DFL );
- multiplexerInstanceToAbortWithSigInt_ = 0;
-}
-
-void SocketReceiveMultiplexer::Break()
-{
- impl_->Break();
-}
-
-void SocketReceiveMultiplexer::AsynchronousBreak()
-{
- impl_->AsynchronousBreak();
-}
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/win32/NetworkingUtils.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/win32/NetworkingUtils.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "ip/NetworkingUtils.h"
-
-#include // this must come first to prevent errors with MSVC7
-#include
-#include
-#include
-
-
-static LONG initCount_ = 0;
-static bool winsockInitialized_ = false;
-
-NetworkInitializer::NetworkInitializer()
-{
- if( InterlockedIncrement( &initCount_ ) == 1 ){
- // there is a race condition here if one thread tries to access
- // the library while another is still initializing it.
- // i can't think of an easy way to fix it so i'm telling you here
- // incase you need to init the library from two threads at once.
- // this is why the header file advises to instantiate one of these
- // in main() so that the initialization happens globally
-
- // initialize winsock
- WSAData wsaData;
- int nCode = WSAStartup(MAKEWORD(1, 1), &wsaData);
- if( nCode != 0 ){
- //std::cout << "WSAStartup() failed with error code " << nCode << "\n";
- }else{
- winsockInitialized_ = true;
- }
- }
-}
-
-
-NetworkInitializer::~NetworkInitializer()
-{
- if( InterlockedDecrement( &initCount_ ) == 0 ){
- if( winsockInitialized_ ){
- WSACleanup();
- winsockInitialized_ = false;
- }
- }
-}
-
-
-unsigned long GetHostByName( const char *name )
-{
- NetworkInitializer networkInitializer;
-
- unsigned long result = 0;
-
- struct hostent *h = gethostbyname( name );
- if( h ){
- struct in_addr a;
- memcpy( &a, h->h_addr_list[0], h->h_length );
- result = ntohl(a.s_addr);
- }
-
- return result;
-}
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/win32/UdpSocket.cpp
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/ip/win32/UdpSocket.cpp Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,521 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#include "ip/UdpSocket.h"
-
-#include // this must come first to prevent errors with MSVC7
-#include
-#include // for timeGetTime()
-
-#include
-#include
-#include
-#include
-#include
-
-#include "ip/NetworkingUtils.h"
-#include "ip/PacketListener.h"
-#include "ip/TimerListener.h"
-
-
-typedef int socklen_t;
-
-
-static void SockaddrFromIpEndpointName( struct sockaddr_in& sockAddr, const IpEndpointName& endpoint )
-{
- memset( (char *)&sockAddr, 0, sizeof(sockAddr ) );
- sockAddr.sin_family = AF_INET;
-
- sockAddr.sin_addr.s_addr =
- (endpoint.address == IpEndpointName::ANY_ADDRESS)
- ? INADDR_ANY
- : htonl( endpoint.address );
-
- sockAddr.sin_port =
- (endpoint.port == IpEndpointName::ANY_PORT)
- ? (short)0
- : htons( (short)endpoint.port );
-}
-
-
-static IpEndpointName IpEndpointNameFromSockaddr( const struct sockaddr_in& sockAddr )
-{
- return IpEndpointName(
- (sockAddr.sin_addr.s_addr == INADDR_ANY)
- ? IpEndpointName::ANY_ADDRESS
- : ntohl( sockAddr.sin_addr.s_addr ),
- (sockAddr.sin_port == 0)
- ? IpEndpointName::ANY_PORT
- : ntohs( sockAddr.sin_port )
- );
-}
-
-
-class UdpSocket::Implementation{
- NetworkInitializer networkInitializer_;
-
- bool isBound_;
- bool isConnected_;
-
- SOCKET socket_;
- struct sockaddr_in connectedAddr_;
- struct sockaddr_in sendToAddr_;
-
-public:
-
- Implementation()
- : isBound_( false )
- , isConnected_( false )
- , socket_( INVALID_SOCKET )
- {
- if( (socket_ = socket( AF_INET, SOCK_DGRAM, 0 )) == INVALID_SOCKET ){
- throw std::runtime_error("unable to create udp socket\n");
- }
-
- memset( &sendToAddr_, 0, sizeof(sendToAddr_) );
- sendToAddr_.sin_family = AF_INET;
- }
-
- ~Implementation()
- {
- if (socket_ != INVALID_SOCKET) closesocket(socket_);
- }
-
- IpEndpointName LocalEndpointFor( const IpEndpointName& remoteEndpoint ) const
- {
- assert( isBound_ );
-
- // first connect the socket to the remote server
-
- struct sockaddr_in connectSockAddr;
- SockaddrFromIpEndpointName( connectSockAddr, remoteEndpoint );
-
- if (connect(socket_, (struct sockaddr *)&connectSockAddr, sizeof(connectSockAddr)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- // get the address
-
- struct sockaddr_in sockAddr;
- memset( (char *)&sockAddr, 0, sizeof(sockAddr ) );
- socklen_t length = sizeof(sockAddr);
- if (getsockname(socket_, (struct sockaddr *)&sockAddr, &length) < 0) {
- throw std::runtime_error("unable to getsockname\n");
- }
-
- if( isConnected_ ){
- // reconnect to the connected address
-
- if (connect(socket_, (struct sockaddr *)&connectedAddr_, sizeof(connectedAddr_)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- }else{
- // unconnect from the remote address
-
- struct sockaddr_in unconnectSockAddr;
- SockaddrFromIpEndpointName( unconnectSockAddr, IpEndpointName() );
-
- if( connect(socket_, (struct sockaddr *)&unconnectSockAddr, sizeof(unconnectSockAddr)) < 0
- && WSAGetLastError() != WSAEADDRNOTAVAIL ){
- throw std::runtime_error("unable to un-connect udp socket\n");
- }
- }
-
- return IpEndpointNameFromSockaddr( sockAddr );
- }
-
- void Connect( const IpEndpointName& remoteEndpoint )
- {
- SockaddrFromIpEndpointName( connectedAddr_, remoteEndpoint );
-
- if (connect(socket_, (struct sockaddr *)&connectedAddr_, sizeof(connectedAddr_)) < 0) {
- throw std::runtime_error("unable to connect udp socket\n");
- }
-
- isConnected_ = true;
- }
-
- void Send( const char *data, int size )
- {
- assert( isConnected_ );
-
- send( socket_, data, size, 0 );
- }
-
- void SendTo( const IpEndpointName& remoteEndpoint, const char *data, int size )
- {
- sendToAddr_.sin_addr.s_addr = htonl( remoteEndpoint.address );
- sendToAddr_.sin_port = htons( (short)remoteEndpoint.port );
-
- sendto( socket_, data, size, 0, (sockaddr*)&sendToAddr_, sizeof(sendToAddr_) );
- }
-
- void Bind( const IpEndpointName& localEndpoint )
- {
- struct sockaddr_in bindSockAddr;
- SockaddrFromIpEndpointName( bindSockAddr, localEndpoint );
-
- if (bind(socket_, (struct sockaddr *)&bindSockAddr, sizeof(bindSockAddr)) < 0) {
- throw std::runtime_error("unable to bind udp socket\n");
- }
-
- isBound_ = true;
- }
-
- bool IsBound() const { return isBound_; }
-
- int ReceiveFrom( IpEndpointName& remoteEndpoint, char *data, int size )
- {
- assert( isBound_ );
-
- struct sockaddr_in fromAddr;
- socklen_t fromAddrLen = sizeof(fromAddr);
-
- int result = recvfrom(socket_, data, size, 0,
- (struct sockaddr *) &fromAddr, (socklen_t*)&fromAddrLen);
- if( result < 0 )
- return 0;
-
- remoteEndpoint.address = ntohl(fromAddr.sin_addr.s_addr);
- remoteEndpoint.port = ntohs(fromAddr.sin_port);
-
- return result;
- }
-
- SOCKET& Socket() { return socket_; }
-};
-
-UdpSocket::UdpSocket()
-{
- impl_ = new Implementation();
-}
-
-UdpSocket::~UdpSocket()
-{
- delete impl_;
-}
-
-IpEndpointName UdpSocket::LocalEndpointFor( const IpEndpointName& remoteEndpoint ) const
-{
- return impl_->LocalEndpointFor( remoteEndpoint );
-}
-
-void UdpSocket::Connect( const IpEndpointName& remoteEndpoint )
-{
- impl_->Connect( remoteEndpoint );
-}
-
-void UdpSocket::Send( const char *data, int size )
-{
- impl_->Send( data, size );
-}
-
-void UdpSocket::SendTo( const IpEndpointName& remoteEndpoint, const char *data, int size )
-{
- impl_->SendTo( remoteEndpoint, data, size );
-}
-
-void UdpSocket::Bind( const IpEndpointName& localEndpoint )
-{
- impl_->Bind( localEndpoint );
-}
-
-bool UdpSocket::IsBound() const
-{
- return impl_->IsBound();
-}
-
-int UdpSocket::ReceiveFrom( IpEndpointName& remoteEndpoint, char *data, int size )
-{
- return impl_->ReceiveFrom( remoteEndpoint, data, size );
-}
-
-
-struct AttachedTimerListener{
- AttachedTimerListener( int id, int p, TimerListener *tl )
- : initialDelayMs( id )
- , periodMs( p )
- , listener( tl ) {}
- int initialDelayMs;
- int periodMs;
- TimerListener *listener;
-};
-
-
-static bool CompareScheduledTimerCalls(
- const std::pair< double, AttachedTimerListener > & lhs, const std::pair< double, AttachedTimerListener > & rhs )
-{
- return lhs.first < rhs.first;
-}
-
-
-SocketReceiveMultiplexer *multiplexerInstanceToAbortWithSigInt_ = 0;
-
-extern "C" /*static*/ void InterruptSignalHandler( int );
-/*static*/ void InterruptSignalHandler( int )
-{
- multiplexerInstanceToAbortWithSigInt_->AsynchronousBreak();
- signal( SIGINT, SIG_DFL );
-}
-
-
-class SocketReceiveMultiplexer::Implementation{
- NetworkInitializer networkInitializer_;
-
- std::vector< std::pair< PacketListener*, UdpSocket* > > socketListeners_;
- std::vector< AttachedTimerListener > timerListeners_;
-
- volatile bool break_;
- HANDLE breakEvent_;
-
- double GetCurrentTimeMs() const
- {
- return timeGetTime(); // FIXME: bad choice if you want to run for more than 40 days
- }
-
-public:
- Implementation()
- {
- breakEvent_ = CreateEvent( NULL, FALSE, FALSE, NULL );
- }
-
- ~Implementation()
- {
- CloseHandle( breakEvent_ );
- }
-
- void AttachSocketListener( UdpSocket *socket, PacketListener *listener )
- {
- assert( std::find( socketListeners_.begin(), socketListeners_.end(), std::make_pair(listener, socket) ) == socketListeners_.end() );
- // we don't check that the same socket has been added multiple times, even though this is an error
- socketListeners_.push_back( std::make_pair( listener, socket ) );
- }
-
- void DetachSocketListener( UdpSocket *socket, PacketListener *listener )
- {
- std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i =
- std::find( socketListeners_.begin(), socketListeners_.end(), std::make_pair(listener, socket) );
- assert( i != socketListeners_.end() );
-
- socketListeners_.erase( i );
- }
-
- void AttachPeriodicTimerListener( int periodMilliseconds, TimerListener *listener )
- {
- timerListeners_.push_back( AttachedTimerListener( periodMilliseconds, periodMilliseconds, listener ) );
- }
-
- void AttachPeriodicTimerListener( int initialDelayMilliseconds, int periodMilliseconds, TimerListener *listener )
- {
- timerListeners_.push_back( AttachedTimerListener( initialDelayMilliseconds, periodMilliseconds, listener ) );
- }
-
- void DetachPeriodicTimerListener( TimerListener *listener )
- {
- std::vector< AttachedTimerListener >::iterator i = timerListeners_.begin();
- while( i != timerListeners_.end() ){
- if( i->listener == listener )
- break;
- ++i;
- }
-
- assert( i != timerListeners_.end() );
-
- timerListeners_.erase( i );
- }
-
- void Run()
- {
- break_ = false;
-
- // prepare the window events which we use to wake up on incoming data
- // we use this instead of select() primarily to support the AsyncBreak()
- // mechanism.
-
- std::vector events( socketListeners_.size() + 1, 0 );
- int j=0;
- for( std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i = socketListeners_.begin();
- i != socketListeners_.end(); ++i, ++j ){
-
- HANDLE event = CreateEvent( NULL, FALSE, FALSE, NULL );
- WSAEventSelect( i->second->impl_->Socket(), event, FD_READ ); // note that this makes the socket non-blocking which is why we can safely call RecieveFrom() on all sockets below
- events[j] = event;
- }
-
-
- events[ socketListeners_.size() ] = breakEvent_; // last event in the collection is the break event
-
-
- // configure the timer queue
- double currentTimeMs = GetCurrentTimeMs();
-
- // expiry time ms, listener
- std::vector< std::pair< double, AttachedTimerListener > > timerQueue_;
- for( std::vector< AttachedTimerListener >::iterator i = timerListeners_.begin();
- i != timerListeners_.end(); ++i )
- timerQueue_.push_back( std::make_pair( currentTimeMs + i->initialDelayMs, *i ) );
- std::sort( timerQueue_.begin(), timerQueue_.end(), CompareScheduledTimerCalls );
-
- const int MAX_BUFFER_SIZE = 4098;
- char *data = new char[ MAX_BUFFER_SIZE ];
- IpEndpointName remoteEndpoint;
-
- while( !break_ ){
-
- double currentTimeMs = GetCurrentTimeMs();
-
- DWORD waitTime = INFINITE;
- if( !timerQueue_.empty() ){
-
- waitTime = (DWORD)( timerQueue_.front().first >= currentTimeMs
- ? timerQueue_.front().first - currentTimeMs
- : 0 );
- }
-
- DWORD waitResult = WaitForMultipleObjects( (DWORD)socketListeners_.size() + 1, &events[0], FALSE, waitTime );
- if( break_ )
- break;
-
- if( waitResult != WAIT_TIMEOUT ){
- for( int i = waitResult - WAIT_OBJECT_0; i < (int)socketListeners_.size(); ++i ){
- int size = socketListeners_[i].second->ReceiveFrom( remoteEndpoint, data, MAX_BUFFER_SIZE );
- if( size > 0 ){
- socketListeners_[i].first->ProcessPacket( data, size, remoteEndpoint );
- if( break_ )
- break;
- }
- }
- }
-
- // execute any expired timers
- currentTimeMs = GetCurrentTimeMs();
- bool resort = false;
- for( std::vector< std::pair< double, AttachedTimerListener > >::iterator i = timerQueue_.begin();
- i != timerQueue_.end() && i->first <= currentTimeMs; ++i ){
-
- i->second.listener->TimerExpired();
- if( break_ )
- break;
-
- i->first += i->second.periodMs;
- resort = true;
- }
- if( resort )
- std::sort( timerQueue_.begin(), timerQueue_.end(), CompareScheduledTimerCalls );
- }
-
- delete [] data;
-
- // free events
- j = 0;
- for( std::vector< std::pair< PacketListener*, UdpSocket* > >::iterator i = socketListeners_.begin();
- i != socketListeners_.end(); ++i, ++j ){
-
- WSAEventSelect( i->second->impl_->Socket(), events[j], 0 ); // remove association between socket and event
- CloseHandle( events[j] );
- unsigned long enableNonblocking = 0;
- ioctlsocket( i->second->impl_->Socket(), FIONBIO, &enableNonblocking ); // make the socket blocking again
- }
- }
-
- void Break()
- {
- break_ = true;
- }
-
- void AsynchronousBreak()
- {
- break_ = true;
- SetEvent( breakEvent_ );
- }
-};
-
-
-
-SocketReceiveMultiplexer::SocketReceiveMultiplexer()
-{
- impl_ = new Implementation();
-}
-
-SocketReceiveMultiplexer::~SocketReceiveMultiplexer()
-{
- delete impl_;
-}
-
-void SocketReceiveMultiplexer::AttachSocketListener( UdpSocket *socket, PacketListener *listener )
-{
- impl_->AttachSocketListener( socket, listener );
-}
-
-void SocketReceiveMultiplexer::DetachSocketListener( UdpSocket *socket, PacketListener *listener )
-{
- impl_->DetachSocketListener( socket, listener );
-}
-
-void SocketReceiveMultiplexer::AttachPeriodicTimerListener( int periodMilliseconds, TimerListener *listener )
-{
- impl_->AttachPeriodicTimerListener( periodMilliseconds, listener );
-}
-
-void SocketReceiveMultiplexer::AttachPeriodicTimerListener( int initialDelayMilliseconds, int periodMilliseconds, TimerListener *listener )
-{
- impl_->AttachPeriodicTimerListener( initialDelayMilliseconds, periodMilliseconds, listener );
-}
-
-void SocketReceiveMultiplexer::DetachPeriodicTimerListener( TimerListener *listener )
-{
- impl_->DetachPeriodicTimerListener( listener );
-}
-
-void SocketReceiveMultiplexer::Run()
-{
- impl_->Run();
-}
-
-void SocketReceiveMultiplexer::RunUntilSigInt()
-{
- assert( multiplexerInstanceToAbortWithSigInt_ == 0 ); /* at present we support only one multiplexer instance running until sig int */
- multiplexerInstanceToAbortWithSigInt_ = this;
- signal( SIGINT, InterruptSignalHandler );
- impl_->Run();
- signal( SIGINT, SIG_DFL );
- multiplexerInstanceToAbortWithSigInt_ = 0;
-}
-
-void SocketReceiveMultiplexer::Break()
-{
- impl_->Break();
-}
-
-void SocketReceiveMultiplexer::AsynchronousBreak()
-{
- impl_->AsynchronousBreak();
-}
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/license
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/license Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-oscpack -- Open Sound Control packet manipulation library
-http://www.audiomulch.com/~rossb/code/oscpack
-
-Copyright (c) 2004 Ross Bencina
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Any person wishing to distribute modifications to the Software is
-requested to send the modifications to the original developer so that
-they can be incorporated into the canonical version.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff -r fcf435874395 -r 45c889eae324 front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/osc/MessageMappingOscPacketListener.h
--- a/front_idill/extern/fajran-npTuioClient/TuioClient/oscpack/osc/MessageMappingOscPacketListener.h Thu Apr 19 11:53:06 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- oscpack -- Open Sound Control packet manipulation library
- http://www.audiomulch.com/~rossb/oscpack
-
- Copyright (c) 2004-2005 Ross Bencina
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- Any person wishing to distribute modifications to the Software is
- requested to send the modifications to the original developer so that
- they can be incorporated into the canonical version.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-#ifndef INCLUDED_MESSAGEMAPPINGOSCPACKETLISTENER_H
-#define INCLUDED_MESSAGEMAPPINGOSCPACKETLISTENER_H
-
-#include
-#include