[PD-cvs] externals/OSCx/src OSC-system-dependent.c,NONE,1.1 Makefile.in,1.5,1.6 OSC-common.h,1.2,1.3 OSC-pattern-match.c,1.3,1.4 OSC-pattern-match.h,1.2,1.3 sendOSC.c,1.2,1.3
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Wed Apr 7 06:15:08 CEST 2004
Update of /cvsroot/pure-data/externals/OSCx/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27559/src
Modified Files:
Makefile.in OSC-common.h OSC-pattern-match.c
OSC-pattern-match.h sendOSC.c
Added Files:
OSC-system-dependent.c
Log Message:
added files from OSC-Kit 1.0 in order to get updated free license; added GPL to my modifications
Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in 5 Apr 2004 04:26:00 -0000 1.5
--- Makefile.in 7 Apr 2004 04:15:06 -0000 1.6
***************
*** 1,2 ****
--- 1,19 ----
+ #
+ # 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
***************
*** 10,14 ****
prefix=$(DESTDIR)/usr
! SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c
TARGETS = $(SOURCES:.c=.o)
EXTS=sendOSC. at pd_suffix@ dumpOSC. at pd_suffix@ OSCroute. at pd_suffix@ OSC. at pd_suffix@
--- 27,31 ----
prefix=$(DESTDIR)/usr
! 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. at pd_suffix@ dumpOSC. at pd_suffix@ OSCroute. at pd_suffix@ OSC. at pd_suffix@
***************
*** 18,31 ****
all: $(EXTS)
- sendOSC. at pd_suffix@: sendOSC.o htmsocket.o
- cc $(LDFLAGS) -o sendOSC. at pd_suffix@ $? -lc -lm $(LIBOSC)
-
dumpOSC. at pd_suffix@: dumpOSC.o
cc $(LDFLAGS) -o dumpOSC. at pd_suffix@ $? -lc -lm
! OSCroute. at pd_suffix@: OSCroute.o OSC-pattern-match.o
cc $(LDFLAGS) -o OSCroute. at pd_suffix@ $? -lc -lm
! OSC. at pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o
cc $(LDFLAGS) -o OSC. at pd_suffix@ $? -lc -lm $(LIBOSC)
--- 35,48 ----
all: $(EXTS)
dumpOSC. at pd_suffix@: dumpOSC.o
cc $(LDFLAGS) -o dumpOSC. at pd_suffix@ $? -lc -lm
! sendOSC. at pd_suffix@: sendOSC.o htmsocket.o OSC-system-dependent.o
! cc $(LDFLAGS) -o sendOSC. at pd_suffix@ $? -lc -lm $(LIBOSC)
!
! OSCroute. at pd_suffix@: OSCroute.o OSC-pattern-match.o OSC-system-dependent.o
cc $(LDFLAGS) -o OSCroute. at pd_suffix@ $? -lc -lm
! OSC. at pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o OSC-system-dependent.o
cc $(LDFLAGS) -o OSC. at pd_suffix@ $? -lc -lm $(LIBOSC)
Index: OSC-pattern-match.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-pattern-match.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OSC-pattern-match.c 4 Apr 2004 22:10:41 -0000 1.3
--- OSC-pattern-match.c 7 Apr 2004 04:15:06 -0000 1.4
***************
*** 1,207 ****
! /*
! 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++;
! }
! }
! }
!
! }
--- 1,192 ----
! /*
! 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++;
! }
! }
! }
!
! }
!
!
!
--- NEW FILE: OSC-system-dependent.c ---
(This appears to be a binary file; contents omitted.)
Index: OSC-pattern-match.h
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-pattern-match.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSC-pattern-match.h 10 Mar 2004 00:01:56 -0000 1.2
--- OSC-pattern-match.h 7 Apr 2004 04:15:06 -0000 1.3
***************
*** 1,35 ****
/*
! 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.h
*/
- //Boolean PatternMatch (const char *pattern, const char *test);
Boolean PatternMatch (const char *pattern, const char *test);
--- 1,35 ----
/*
! 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.h
*/
Boolean PatternMatch (const char *pattern, const char *test);
Index: OSC-common.h
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSC-common.h 10 Mar 2004 00:01:56 -0000 1.2
--- OSC-common.h 7 Apr 2004 04:15:06 -0000 1.3
***************
*** 1,28 ****
/*
! Copyright (c) 1998. The Regents of the University of California (Regents).
All Rights Reserved.
- Permission to use, copy, modify, and distribute this software and its
- documentation for educational, research, and not-for-profit purposes, without
- fee and without a signed licensing agreement, is hereby granted, provided that
- the above copyright notice, this paragraph and the following two paragraphs
- appear in all copies, modifications, and distributions. Contact The Office of
- Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley,
- CA 94720-1620, (510) 643-7201, for commercial licensing opportunities.
-
Written by Matt Wright, The Center for New Music and Audio Technologies,
University of California, Berkeley.
! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING
! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS".
! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
! ENHANCEMENTS, OR MODIFICATIONS.
The OpenSound Control WWW page is
--- 1,25 ----
/*
! Copyright © 1998. The Regents of the University of California (Regents).
All Rights Reserved.
Written by Matt Wright, The Center for New Music and Audio Technologies,
University of California, Berkeley.
! Permission to use, copy, modify, distribute, and distribute modified versions
! of this software and its documentation without fee and without a signed
! licensing agreement, is hereby granted, provided that the above copyright
! notice, this paragraph and the following two paragraphs appear in all copies,
! modifications, and distributions.
! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS
! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!
! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED
! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
The OpenSound Control WWW page is
***************
*** 31,34 ****
--- 28,32 ----
+
/* OSC-common.h
Simple stuff to #include everywhere in the OSC package
Index: sendOSC.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/sendOSC.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sendOSC.c 10 Mar 2004 00:01:56 -0000 1.2
--- sendOSC.c 7 Apr 2004 04:15:06 -0000 1.3
***************
*** 61,70 ****
cc -o sendOSC sendOSC.c htmsocket.c OpenSoundControl.c OSC_timeTag.c
*/
#ifdef WIN32
- #include "m_pd.h"
- #include "OSC-client.h"
- #include "htmsocket.h"
- #include "OSC-common.h"
#include <winsock2.h>
#include <io.h>
--- 61,75 ----
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 <winsock2.h>
#include <io.h>
***************
*** 72,88 ****
#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>
--- 77,84 ----
***************
*** 112,116 ****
void SendBuffer(void *htmsocket, OSCbuf *buf);
void SendData(void *htmsocket, int size, char *data);
! void fatal_error(char *s);
void send_complain(char *s, ...);
--- 108,113 ----
void SendBuffer(void *htmsocket, OSCbuf *buf);
void SendData(void *htmsocket, int size, char *data);
! /* defined in OSC-system-dependent.c now */
! /* void fatal_error(char *s); */
void send_complain(char *s, ...);
***************
*** 582,586 ****
wrote each half of the time tag in the wrong half
of the struct. */
! uint32 temp;
temp = tt.seconds;
tt.seconds = tt.fraction ;
--- 579,583 ----
wrote each half of the time tag in the wrong half
of the struct. */
! uint4 temp;
temp = tt.seconds;
tt.seconds = tt.fraction ;
***************
*** 838,846 ****
}
! void fatal_error(char *s) {
! fprintf(stderr, "FATAL ERROR: %s\n", s);
! post("fatal error, not exiting ...");
! //exit(4);
! }
#include <stdarg.h>
--- 835,844 ----
}
! /* 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>
More information about the Pd-cvs
mailing list