added files from OSC-Kit 1.0 in order to get updated free license; added GPL to my modifications

svn path=/trunk/externals/OSCx/; revision=1556

10 files changed, 902 insertions, 481 deletions

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

-Copyright (c) 1998.  The Regents of the University of California (Regents).

-All Rights Reserved.

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for educational, research, and not-for-profit purposes, without

-fee and without a signed licensing agreement, is hereby granted, provided that

-the above copyright notice, this paragraph and the following two paragraphs

-appear in all copies, modifications, and distributions.  Contact The Office of

-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,

-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.

-

-Written by Matt Wright, The Center for New Music and Audio Technologies,

-University of California, Berkeley.

-

-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,

-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,

-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF

-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT

-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING

-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".

-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,

-     ENHANCEMENTS, OR MODIFICATIONS.

-

-The OpenSound Control WWW page is 

-    http://www.cnmat.berkeley.edu/OpenSoundControl

-*/

-

-/*

-

- OSC_timeTag.c: library for manipulating OSC time tags

- Matt Wright, 5/29/97

-

- Version 0.2 (9/11/98): cleaned up so no explicit type names in the .c file.

-

-*/

-

-#include "OSC-timetag.h"

-

-

-#ifdef HAS8BYTEINT

-#define TWO_TO_THE_32_FLOAT 4294967296.0f

-

-OSCTimeTag OSCTT_Immediately(void) {

-    return (OSCTimeTag) 1;

-}

-

-OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) {

-    return (OSCTimeTag) 0xffffffffffffffff;

-}

-

-OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {

-    int64 offset = (int64) (secondsOffset * TWO_TO_THE_32_FLOAT);

-

-/*    printf("* OSCTT_PlusSeconds %llx plus %f seconds (i.e., %lld offset) is %llx\n", original,

-	      secondsOffset, offset, original + offset);  */

-

-    return original + offset;

-}

-

-int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) {

-#if 0

-    printf("***** OSCTT_Compare(%llx, %llx): %d\n", left, right,

-	   (left<right) ? -1 : ((left == right) ? 0 : 1));

-#endif

-    if (left < right) {

-        return -1;

-    } else if (left == right) {

-        return 0;

-    } else {

-        return 1;

-    }

-}

-

-#ifdef __sgi

-#include <sys/time.h>

-

-#define SECONDS_FROM_1900_to_1970 2208988800 /* 17 leap years */

-#define TWO_TO_THE_32_OVER_ONE_MILLION 4295

-

-

-OSCTimeTag OSCTT_CurrentTime(void) {

-    uint64 result;

-    uint32 usecOffset;

-    struct timeval tv;

-    struct timezone tz;

-

-    BSDgettimeofday(&tv, &tz);

-

-    /* First get the seconds right */

-    result = (unsigned) SECONDS_FROM_1900_to_1970 + 

-	     (unsigned) tv.tv_sec - 

-	     (unsigned) 60 * tz.tz_minuteswest +

-             (unsigned) (tz.tz_dsttime ? 3600 : 0);

-

-#if 0

-    /* No timezone, no DST version ... */

-    result = (unsigned) SECONDS_FROM_1900_to_1970 + 

-	     (unsigned) tv.tv_sec;

-#endif

-

-

-    /* make seconds the high-order 32 bits */

-    result = result << 32;

-	

-    /* Now get the fractional part. */

-    usecOffset = (unsigned) tv.tv_usec * (unsigned) TWO_TO_THE_32_OVER_ONE_MILLION;

-    /* printf("** %ld microsec is offset %x\n", tv.tv_usec, usecOffset); */

-

-    result += usecOffset;

-

-/*    printf("* OSCTT_CurrentTime is %llx\n", result); */

-    return result;

-}

-

-#else /* __sgi */

-

-/* Instead of asking your operating system what time it is, it might be

-   clever to find out the current time at the instant your application 

-   starts audio processing, and then keep track of the number of samples

-   output to know how much time has passed. */

-

-/* Loser version for systems that have no ability to tell the current time: */

-OSCTimeTag OSCTT_CurrentTime(void) {

-    return (OSCTimeTag) 1;

-}

-

-#endif /* __sgi */

-

-

-#else /* Not HAS8BYTEINT */

-

-OSCTimeTag OSCTT_CurrentTime(void) {

-    OSCTimeTag result;

-    result.seconds = 0;

-    result.fraction = 1;

-    return result;

-}

-

-OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) {

-    OSCTimeTag result;

-    result.seconds = 0xffffffff;

-    result.fraction = 0xffffffff;

-    return result;

-}

-

-OSCTimeTag OSCTT_Immediately(void) {

-    OSCTimeTag result;

-    result.seconds = 0;

-    result.fraction = 1;

-    return result;

-}

-

-OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {

-    OSCTimeTag result;

-    result.seconds = 0;

-    result.fraction = 1;

-    return result;

-}

-

-int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) {

-    /* Untested! */

-    int highResult = left.seconds - right.seconds;

-

-    if (highResult != 0) return highResult;

-

-    return left.fraction - right.fraction;

-}

-

-

-#endif /* HAS8BYTEINT */

-

+/*
+Copyright © 1998. The Regents of the University of California (Regents). 
+All Rights Reserved.
+
+Written by Matt Wright, The Center for New Music and Audio Technologies,
+University of California, Berkeley.
+
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+The OpenSound Control WWW page is 
+    http://www.cnmat.berkeley.edu/OpenSoundControl
+*/
+
+
+/*
+
+ OSC_timeTag.c: library for manipulating OSC time tags
+ Matt Wright, 5/29/97
+
+ Version 0.2 (9/11/98): cleaned up so no explicit type names in the .c file.
+
+*/
+
+#include "OSC-timetag.h"
+
+
+#ifdef HAS8BYTEINT
+#define TWO_TO_THE_32_FLOAT 4294967296.0f
+
+OSCTimeTag OSCTT_Immediately(void) {
+    return (OSCTimeTag) 1;
+}
+
+OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) {
+    return (OSCTimeTag) 0xffffffffffffffff;
+}
+
+OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {
+    int8 offset = (int8) (secondsOffset * TWO_TO_THE_32_FLOAT);
+
+/*    printf("* OSCTT_PlusSeconds %llx plus %f seconds (i.e., %lld offset) is %llx\n", original,
+	      secondsOffset, offset, original + offset);  */
+
+    return original + offset;
+}
+
+int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) {
+#if 0
+    printf("***** OSCTT_Compare(%llx, %llx): %d\n", left, right,
+	   (left<right) ? -1 : ((left == right) ? 0 : 1));
+#endif
+    if (left < right) {
+        return -1;
+    } else if (left == right) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+#ifdef __sgi
+#include <sys/time.h>
+
+#define SECONDS_FROM_1900_to_1970 2208988800 /* 17 leap years */
+#define TWO_TO_THE_32_OVER_ONE_MILLION 4295
+
+
+OSCTimeTag OSCTT_CurrentTime(void) {
+    uint8 result;
+    uint4 usecOffset;
+    struct timeval tv;
+    struct timezone tz;
+
+    BSDgettimeofday(&tv, &tz);
+
+    /* First get the seconds right */
+    result = (unsigned) SECONDS_FROM_1900_to_1970 + 
+	     (unsigned) tv.tv_sec - 
+	     (unsigned) 60 * tz.tz_minuteswest +
+             (unsigned) (tz.tz_dsttime ? 3600 : 0);
+
+#if 0
+    /* No timezone, no DST version ... */
+    result = (unsigned) SECONDS_FROM_1900_to_1970 + 
+	     (unsigned) tv.tv_sec;
+#endif
+
+
+    /* make seconds the high-order 32 bits */
+    result = result << 32;
+	
+    /* Now get the fractional part. */
+    usecOffset = (unsigned) tv.tv_usec * (unsigned) TWO_TO_THE_32_OVER_ONE_MILLION;
+    /* printf("** %ld microsec is offset %x\n", tv.tv_usec, usecOffset); */
+
+    result += usecOffset;
+
+/*    printf("* OSCTT_CurrentTime is %llx\n", result); */
+    return result;
+}
+
+#else /* __sgi */
+
+/* Instead of asking your operating system what time it is, it might be
+   clever to find out the current time at the instant your application 
+   starts audio processing, and then keep track of the number of samples
+   output to know how much time has passed. */
+
+/* Loser version for systems that have no ability to tell the current time: */
+OSCTimeTag OSCTT_CurrentTime(void) {
+    return (OSCTimeTag) 1;
+}
+
+#endif /* __sgi */
+
+
+#else /* Not HAS8BYTEINT */
+
+OSCTimeTag OSCTT_CurrentTime(void) {
+    OSCTimeTag result;
+    result.seconds = 0;
+    result.fraction = 1;
+    return result;
+}
+
+OSCTimeTag OSCTT_BiggestPossibleTimeTag(void) {
+    OSCTimeTag result;
+    result.seconds = 0xffffffff;
+    result.fraction = 0xffffffff;
+    return result;
+}
+
+OSCTimeTag OSCTT_Immediately(void) {
+    OSCTimeTag result;
+    result.seconds = 0;
+    result.fraction = 1;
+    return result;
+}
+
+OSCTimeTag OSCTT_PlusSeconds(OSCTimeTag original, float secondsOffset) {
+    OSCTimeTag result;
+    result.seconds = 0;
+    result.fraction = 1;
+    return result;
+}
+
+int OSCTT_Compare(OSCTimeTag left, OSCTimeTag right) {
+    /* Untested! */
+    int highResult = left.seconds - right.seconds;
+
+    if (highResult != 0) return highResult;
+
+    return left.fraction - right.fraction;
+}
+
+
+#endif /* HAS8BYTEINT */
+
diff --git a/libOSC/OSC-timetag.h b/libOSC/OSC-timetag.h
index 3ce693a..7e6cbe6 100644
--- a/libOSC/OSC-timetag.h
+++ b/libOSC/OSC-timetag.h
@@ -1,45 +1,43 @@
 /*
-Copyright (c) 1998.  The Regents of the University of California (Regents).
+Copyright © 1998. The Regents of the University of California (Regents). 
 All Rights Reserved.
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for educational, research, and not-for-profit purposes, without
-fee and without a signed licensing agreement, is hereby granted, provided that
-the above copyright notice, this paragraph and the following two paragraphs
-appear in all copies, modifications, and distributions.  Contact The Office of
-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,
-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.
-
 Written by Matt Wright, The Center for New Music and Audio Technologies,
 University of California, Berkeley.
 
-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING
-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".
-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
-     ENHANCEMENTS, OR MODIFICATIONS.
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 The OpenSound Control WWW page is 
     http://www.cnmat.berkeley.edu/OpenSoundControl
 */
 
+
 /*
  OSC_timeTag.h: library for manipulating OSC time tags
  Matt Wright, 5/29/97
 
  Time tags in OSC have the same format as in NTP: 64 bit fixed point, with the
  top 32 bits giving number of seconds sinve midnight 1/1/1900 and the bottom
- 32 bits giving fractional parts of a second.  We represent this by a 64-bit
+ 32 bits giving fractional parts of a second.  We represent this by an 8-byte
  unsigned long if possible, or else a struct. 
 
- NB: On many architectures with 64-bit ints, it's illegal (like maybe a bus error)
- to dereference a pointer to a 64-bit int that's not 64-bit aligned.  
+ NB: On many architectures with 8-byte ints, it's illegal (like maybe a bus error)
+ to dereference a pointer to an 8 byte int that's not 8-byte aligned.  
 */
 
 #ifndef OSC_TIMETAG
@@ -48,23 +46,23 @@ The OpenSound Control WWW page is
 #ifdef __sgi
     #define HAS8BYTEINT
     /* You may have to change this typedef if there's some other
-       way to specify 64 bit ints on your system */
-    typedef long long int64;
-    typedef unsigned long long uint64;
-    typedef unsigned long uint32;
+       way to specify 8 byte ints on your system */
+    typedef long long int8;
+    typedef unsigned long long uint8;
+    typedef unsigned long uint4;
 #else
     /* You may have to redefine this typedef if ints on your system 
-       aren't 32 bits. */
-    typedef unsigned int uint32;
+       aren't 4 bytes. */
+    typedef unsigned int uint4;
 #endif
 
 
 #ifdef HAS8BYTEINT
-    typedef uint64 OSCTimeTag;
+    typedef uint8 OSCTimeTag;
 #else
     typedef struct {
-	uint32 seconds;
-	uint32 fraction;
+	uint4 seconds;
+	uint4 fraction;
     } OSCTimeTag;
 #endif
 
diff --git a/send+dump/sendOSC.c b/send+dump/sendOSC.c
index f445f92..7a58986 100644
--- a/send+dump/sendOSC.c
+++ b/send+dump/sendOSC.c
@@ -314,7 +314,7 @@ OSCTimeTag ParseTimeTag(char *s) {
 	       and this machine is little-endian, so sscanf
 	       wrote each half of the time tag in the wrong half
 	       of the struct. */
-	    uint32 temp;
+	    uint4 temp;
 	    temp = tt.seconds;
 	    tt.seconds = tt.fraction ;
 	    tt.fraction = temp;
diff --git a/src/Makefile.in b/src/Makefile.in
index 03e256e..2b52150 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2004 Hans-Christoph Steiner
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 
 EXT=o
 LIBS = -lm -lc
@@ -9,7 +26,7 @@ LDFLAGS = @LDFLAGS@
 
 prefix=$(DESTDIR)/usr
 
-SOURCES = OSC-pattern-match.c  OSC.c  dumpOSC.c htmsocket.c  OSCroute.c  sendOSC.c
+SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c OSC-system-dependent.c
 TARGETS = $(SOURCES:.c=.o)
 EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix@
 
@@ -17,16 +34,16 @@ EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix
 
 all: $(EXTS)
 
-sendOSC.@pd_suffix@: sendOSC.o htmsocket.o
-	cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
-
 dumpOSC.@pd_suffix@: dumpOSC.o
 	cc $(LDFLAGS) -o dumpOSC.@pd_suffix@ $? -lc -lm
 
-OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o
+sendOSC.@pd_suffix@: sendOSC.o htmsocket.o OSC-system-dependent.o
+	cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
+
+OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o OSC-system-dependent.o
 	cc $(LDFLAGS) -o OSCroute.@pd_suffix@ $? -lc -lm
 
-OSC.@pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o
+OSC.@pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o OSC-system-dependent.o
 	cc $(LDFLAGS) -o OSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
 
 $(TARGETS): %.o : %.c
diff --git a/src/OSC-common.h b/src/OSC-common.h
index 8eb6576..80ee70b 100644
--- a/src/OSC-common.h
+++ b/src/OSC-common.h
@@ -1,35 +1,33 @@
 /*
-Copyright (c) 1998.  The Regents of the University of California (Regents).
+Copyright © 1998. The Regents of the University of California (Regents). 
 All Rights Reserved.
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for educational, research, and not-for-profit purposes, without
-fee and without a signed licensing agreement, is hereby granted, provided that
-the above copyright notice, this paragraph and the following two paragraphs
-appear in all copies, modifications, and distributions.  Contact The Office of
-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,
-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.
-
 Written by Matt Wright, The Center for New Music and Audio Technologies,
 University of California, Berkeley.
 
-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING
-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".
-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
-     ENHANCEMENTS, OR MODIFICATIONS.
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 The OpenSound Control WWW page is 
     http://www.cnmat.berkeley.edu/OpenSoundControl
 */
 
 
+
 /* OSC-common.h
    Simple stuff to #include everywhere in the OSC package
 
diff --git a/src/OSC-pattern-match.c b/src/OSC-pattern-match.c
index 7b04042..847ebb3 100644
--- a/src/OSC-pattern-match.c
+++ b/src/OSC-pattern-match.c
@@ -1,207 +1,192 @@
-/*

-Copyright (c) 1998.  The Regents of the University of California (Regents).

-All Rights Reserved.

-

-Permission to use, copy, modify, and distribute this software and its

-documentation for educational, research, and not-for-profit purposes, without

-fee and without a signed licensing agreement, is hereby granted, provided that

-the above copyright notice, this paragraph and the following two paragraphs

-appear in all copies, modifications, and distributions.  Contact The Office of

-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,

-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.

-

-Written by Matt Wright, The Center for New Music and Audio Technologies,

-University of California, Berkeley.

-

-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,

-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,

-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF

-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT

-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING

-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".

-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,

-     ENHANCEMENTS, OR MODIFICATIONS.

-

-The OpenSound Control WWW page is 

-    http://www.cnmat.berkeley.edu/OpenSoundControl

-*/

-

-

-/*

-    OSC-pattern-match.c

-    Matt Wright, 3/16/98

-    Adapted from oscpattern.c, by Matt Wright and Amar Chaudhury

- */

-#ifdef UNIX

-  #include <stdio.h>

-#endif

-

-// #ifdef __APPLE__

-// #include <stdio.h>

-// #endif

-

-#include "OSC-common.h"

-#include "OSC-pattern-match.h"

-

-static const char *theWholePattern;	/* Just for warning messages */

-

-static Boolean MatchBrackets (const char *pattern, const char *test);

-static Boolean MatchList (const char *pattern, const char *test);

-

-Boolean PatternMatch (const char *  pattern, const char * test) {

-

-  // printf("OSC-pattern-match.c: pattern: %s, test: %s\n", pattern, test);

-

-  theWholePattern = pattern;

-

-  // post("pattern: %s, test: %s", pattern, test);

-  

-  if(test[0] == '*') {

-    return TRUE;

-  }

-

-  if (pattern == 0 || pattern[0] == 0) {

-    return test[0] == 0;

-  } 

-  

-  if (test[0] == 0) {

-    if (pattern[0] == '*')

-      return PatternMatch (pattern+1,test);

-    else

-      return FALSE;

-  }

-

-  switch (pattern[0]) {

-    case 0      : return test[0] == 0;

-    case '?'    : return PatternMatch (pattern + 1, test + 1);

-    case '*'    : 

-      if (PatternMatch (pattern+1, test)) {

-        return TRUE;

-      } else {

-	return PatternMatch (pattern, test+1);

-      }

-    case ']'    :

-    case '}'    :

-      printf("Spurious %c in pattern \".../%s/...\"",pattern[0], theWholePattern);

-      return FALSE;

-    case '['    :

-      return MatchBrackets (pattern,test);

-    case '{'    :

-      return MatchList (pattern,test);

-    case '\\'   :  

-      if (pattern[1] == 0) {

-	return test[0] == 0;

-      } else if (pattern[1] == test[0]) {

-	return PatternMatch (pattern+2,test+1);

-      } else {

-	return FALSE;

-      }

-    default     :

-      if (pattern[0] == test[0]) {

-	return PatternMatch (pattern+1,test+1);

-      } else {

-	return FALSE;

-      }

-  }

-}

-

-

-/* we know that pattern[0] == '[' and test[0] != 0 */

-

-static Boolean MatchBrackets (const char *pattern, const char *test) {

-  Boolean result;

-  Boolean negated = FALSE;

-  const char *p = pattern;

-

-  if (pattern[1] == 0) {

-    printf("Unterminated [ in pattern \".../%s/...\"", theWholePattern);

-    return FALSE;

-  }

-

-  if (pattern[1] == '!') {

-    negated = TRUE;

-    p++;

-  }

-

-  while (*p != ']') {

-    if (*p == 0) {

-      printf("Unterminated [ in pattern \".../%s/...\"", theWholePattern);

-      return FALSE;

-    }

-    if (p[1] == '-' && p[2] != 0) {

-      if (test[0] >= p[0] && test[0] <= p[2]) {

-	result = !negated;

-	goto advance;

-      }

-    }

-    if (p[0] == test[0]) {

-      result = !negated;

-      goto advance;

-    }

-    p++;

-  }

-

-  result = negated;

-

-advance:

-

-  if (!result)

-    return FALSE;

-

-  while (*p != ']') {

-    if (*p == 0) {

-      printf("Unterminated [ in pattern \".../%s/...\"", theWholePattern);

-      return FALSE;

-    }

-    p++;

-  }

-

-  return PatternMatch (p+1,test+1);

-}

-

-static Boolean MatchList (const char *pattern, const char *test) {

-

- const char *restOfPattern, *tp = test;

-

-

- for(restOfPattern = pattern; *restOfPattern != '}'; restOfPattern++) {

-   if (*restOfPattern == 0) {

-     printf("Unterminated { in pattern \".../%s/...\"", theWholePattern);

-     return FALSE;

-   }

- }

-

- restOfPattern++; /* skip close curly brace */

-

-

- pattern++; /* skip open curly brace */

-

- while (1) {

-   

-   if (*pattern == ',') {

-     if (PatternMatch (restOfPattern, tp)) {

-       return TRUE;

-     } else {

-       tp = test;

-       ++pattern;

-     }

-   } else if (*pattern == '}') {

-     return PatternMatch (restOfPattern, tp);

-   } else if (*pattern == *tp) {

-     ++pattern;

-     ++tp;

-   } else {

-     tp = test;

-     while (*pattern != ',' && *pattern != '}') {

-       pattern++;

-     }

-     if (*pattern == ',') {

-       pattern++;

-     }

-   }

- }

-

-}

+/*
+Copyright © 1998. The Regents of the University of California (Regents). 
+All Rights Reserved.
+
+Written by Matt Wright, The Center for New Music and Audio Technologies,
+University of California, Berkeley.
+
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+The OpenSound Control WWW page is 
+    http://www.cnmat.berkeley.edu/OpenSoundControl
+*/
+
+
+
+/*
+    OSC-pattern-match.c
+    Matt Wright, 3/16/98
+    Adapted from oscpattern.c, by Matt Wright and Amar Chaudhury
+ */
+
+#include "OSC-common.h"
+#include "OSC-pattern-match.h"
+
+static const char *theWholePattern;	/* Just for warning messages */
+
+static Boolean MatchBrackets (const char *pattern, const char *test);
+static Boolean MatchList (const char *pattern, const char *test);
+
+Boolean PatternMatch (const char *  pattern, const char * test) {
+  theWholePattern = pattern;
+  
+  if (pattern == 0 || pattern[0] == 0) {
+    return test[0] == 0;
+  } 
+  
+  if (test[0] == 0) {
+    if (pattern[0] == '*')
+      return PatternMatch (pattern+1,test);
+    else
+      return FALSE;
+  }
+
+  switch (pattern[0]) {
+    case 0      : return test[0] == 0;
+    case '?'    : return PatternMatch (pattern + 1, test + 1);
+    case '*'    : 
+      if (PatternMatch (pattern+1, test)) {
+        return TRUE;
+      } else {
+	return PatternMatch (pattern, test+1);
+      }
+    case ']'    :
+    case '}'    :
+      OSCWarning("Spurious %c in pattern \".../%s/...\"",pattern[0], theWholePattern);
+      return FALSE;
+    case '['    :
+      return MatchBrackets (pattern,test);
+    case '{'    :
+      return MatchList (pattern,test);
+    case '\\'   :  
+      if (pattern[1] == 0) {
+	return test[0] == 0;
+      } else if (pattern[1] == test[0]) {
+	return PatternMatch (pattern+2,test+1);
+      } else {
+	return FALSE;
+      }
+    default     :
+      if (pattern[0] == test[0]) {
+	return PatternMatch (pattern+1,test+1);
+      } else {
+	return FALSE;
+      }
+  }
+}
+
+
+/* we know that pattern[0] == '[' and test[0] != 0 */
+
+static Boolean MatchBrackets (const char *pattern, const char *test) {
+  Boolean result;
+  Boolean negated = FALSE;
+  const char *p = pattern;
+
+  if (pattern[1] == 0) {
+    OSCWarning("Unterminated [ in pattern \".../%s/...\"", theWholePattern);
+    return FALSE;
+  }
+
+  if (pattern[1] == '!') {
+    negated = TRUE;
+    p++;
+  }
+
+  while (*p != ']') {
+    if (*p == 0) {
+      OSCWarning("Unterminated [ in pattern \".../%s/...\"", theWholePattern);
+      return FALSE;
+    }
+    if (p[1] == '-' && p[2] != 0) {
+      if (test[0] >= p[0] && test[0] <= p[2]) {
+	result = !negated;
+	goto advance;
+      }
+    }
+    if (p[0] == test[0]) {
+      result = !negated;
+      goto advance;
+    }
+    p++;
+  }
+
+  result = negated;
+
+advance:
+
+  if (!result)
+    return FALSE;
+
+  while (*p != ']') {
+    if (*p == 0) {
+      OSCWarning("Unterminated [ in pattern \".../%s/...\"", theWholePattern);
+      return FALSE;
+    }
+    p++;
+  }
+
+  return PatternMatch (p+1,test+1);
+}
+
+static Boolean MatchList (const char *pattern, const char *test) {
+
+ const char *restOfPattern, *tp = test;
+
+
+ for(restOfPattern = pattern; *restOfPattern != '}'; restOfPattern++) {
+   if (*restOfPattern == 0) {
+     OSCWarning("Unterminated { in pattern \".../%s/...\"", theWholePattern);
+     return FALSE;
+   }
+ }
+
+ restOfPattern++; /* skip close curly brace */
+
+
+ pattern++; /* skip open curly brace */
+
+ while (1) {
+   
+   if (*pattern == ',') {
+     if (PatternMatch (restOfPattern, tp)) {
+       return TRUE;
+     } else {
+       tp = test;
+       ++pattern;
+     }
+   } else if (*pattern == '}') {
+     return PatternMatch (restOfPattern, tp);
+   } else if (*pattern == *tp) {
+     ++pattern;
+     ++tp;
+   } else {
+     tp = test;
+     while (*pattern != ',' && *pattern != '}') {
+       pattern++;
+     }
+     if (*pattern == ',') {
+       pattern++;
+     }
+   }
+ }
+
+}
+
+
+
diff --git a/src/OSC-pattern-match.h b/src/OSC-pattern-match.h
index a5d7306..653b54d 100644
--- a/src/OSC-pattern-match.h
+++ b/src/OSC-pattern-match.h
@@ -1,35 +1,35 @@
 /*
-Copyright (c) 1998.  The Regents of the University of California (Regents).
+Copyright © 1998. The Regents of the University of California (Regents). 
 All Rights Reserved.
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for educational, research, and not-for-profit purposes, without
-fee and without a signed licensing agreement, is hereby granted, provided that
-the above copyright notice, this paragraph and the following two paragraphs
-appear in all copies, modifications, and distributions.  Contact The Office of
-Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,
-CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.
-
 Written by Matt Wright, The Center for New Music and Audio Technologies,
 University of California, Berkeley.
 
-     IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-     SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-     ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-     REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-     REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-     FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING
-     DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".
-     REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
-     ENHANCEMENTS, OR MODIFICATIONS.
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+The OpenSound Control WWW page is 
+    http://www.cnmat.berkeley.edu/OpenSoundControl
+*/
 
-    The OpenSound Control WWW page is http://www.cnmat.berkeley.edu/OpenSoundControl
 
+/*
     OSC-pattern-match.h
 */
 
-//Boolean PatternMatch (const char *pattern, const char *test);
 Boolean PatternMatch (const char *pattern, const char *test);
 
diff --git a/src/OSC-system-dependent.c b/src/OSC-system-dependent.c
new file mode 100644
index 0000000..010b9b5
--- /dev/null
+++ b/src/OSC-system-dependent.c
@@ -0,0 +1,81 @@
+/*
+Copyright © 1998. The Regents of the University of California (Regents). 
+All Rights Reserved.
+
+Written by Matt Wright, The Center for New Music and Audio Technologies,
+University of California, Berkeley.
+
+Permission to use, copy, modify, distribute, and distribute modified versions
+of this software and its documentation without fee and without a signed
+licensing agreement, is hereby granted, provided that the above copyright
+notice, this paragraph and the following two paragraphs appear in all copies,
+modifications, and distributions.
+
+IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
+HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
+MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+The OpenSound Control WWW page is 
+    http://www.cnmat.berkeley.edu/OpenSoundControl
+*/
+
+
+
+/* OSC-system-dependent.c
+
+   Matt Wright, 3/13/98
+
+   File of procedures OSC has to call that are not part of the OSC package
+   and that you, the developer adding OSC addressability to an application,
+   must write in a way that makes sense in the context of your system.
+
+   You should also look at OSC-timetag.c and see if there's a better way
+   to handle time tags on your system.
+
+*/
+
+#include "OSC-common.h"
+
+/* Printing stuff: for now, use stderr.  Some cleverer stuff we could do:
+
+    - Make a silent mode where these don't do anything.
+    - Return error messages via OSC to some client
+*/
+
+#include <stdarg.h>
+#include <stdio.h>
+
+void fatal_error(char *s, ...) {
+    va_list ap;
+    fprintf(stderr, "Fatal error: ");
+    va_start(ap, s);
+    vfprintf(stderr, s, ap);
+    fprintf(stderr, "\n");
+    va_end(ap);
+    exit(-321);
+}
+
+void OSCProblem(char *s, ...) {
+    va_list ap;
+    fprintf(stderr, "OSC Problem: ");
+    va_start(ap, s);
+    vfprintf(stderr, s, ap);
+    fprintf(stderr, "\n");
+    va_end(ap);
+}
+
+void OSCWarning(char *s, ...) {
+    va_list ap;
+    fprintf(stderr, "OSC Warning: ");
+    va_start(ap, s);
+    vfprintf(stderr, s, ap);
+    fprintf(stderr, "\n");
+    va_end(ap);
+}
diff --git a/src/sendOSC.c b/src/sendOSC.c
index 5dc8f59..f4c1d8e 100644
--- a/src/sendOSC.c
+++ b/src/sendOSC.c
@@ -60,30 +60,26 @@ University of California, Berkeley.
 compiling:

         cc -o sendOSC sendOSC.c htmsocket.c OpenSoundControl.c OSC_timeTag.c

 */

+#include "m_pd.h"

+

+#include "OSC-common.h"

+#include "OSC-client.h"

+#include "htmsocket.h"

+

+#include <string.h>

+#include <sys/types.h>

+#include <stdlib.h>

 

 #ifdef WIN32

-	#include "m_pd.h"

-	#include "OSC-client.h"

-	#include "htmsocket.h"

-	#include "OSC-common.h"

 	#include <winsock2.h>	

 	#include <io.h>    

 	#include <errno.h>

 	#include <fcntl.h>

 	#include <sys/stat.h>

-	#include <stdlib.h>

-	#include <string.h>

-	#include <sys/types.h>

 #else

-	#include "m_pd.h"

 	//#include "x_osc.h"

-	#include "OSC-client.h"

-	#include "htmsocket.h"

 

 	#include <stdio.h>

-	#include <stdlib.h>

-	#include <string.h>

-	#include <sys/types.h>

 	#include <sys/socket.h>

 	#include <netinet/in.h>

 	#include <netdb.h>

@@ -111,7 +107,8 @@ typedArg ParseToken(char *token);
 int WriteMessage(OSCbuf *buf, char *messageName, int numArgs, typedArg *args);

 void SendBuffer(void *htmsocket, OSCbuf *buf);

 void SendData(void *htmsocket, int size, char *data);

-void fatal_error(char *s);

+/* defined in OSC-system-dependent.c now */

+/* void fatal_error(char *s); */

 void send_complain(char *s, ...);

 

 //static void *htmsocket;

@@ -581,7 +578,7 @@ OSCTimeTag ParseTimeTag(char *s) {
 	       and this machine is little-endian, so sscanf

 	       wrote each half of the time tag in the wrong half

 	       of the struct. */

-	    uint32 temp;

+	    uint4 temp;

 	    temp = tt.seconds;

 	    tt.seconds = tt.fraction ;

 	    tt.fraction = temp;

@@ -837,11 +834,12 @@ void SendData(void *htmsocket, int size, char *data) {
   }

 }

 

-void fatal_error(char *s) {

-    fprintf(stderr, "FATAL ERROR: %s\n", s);

-    post("fatal error, not exiting ...");

-    //exit(4);

-}

+/* defined in OSC-system-dependent.c now */

+/* void fatal_error(char *s) { */

+/*     fprintf(stderr, "FATAL ERROR: %s\n", s); */

+/*     post("fatal error, not exiting ..."); */

+/*     //exit(4); */

+/* } */

 

 #include <stdarg.h>

 void send_complain(char *s, ...) {