lo.h   lo.h 
skipping to change at line 14 skipping to change at line 14
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* $Id: lo.h,v 1.7 2005/02/28 14:33:19 theno23 Exp $ * $Id: lo.h,v 1.8 2005/08/09 15:06:04 mhabets Exp $
*/ */
#ifndef LO_H #ifndef LO_H
#define LO_H #define LO_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
skipping to change at line 161 skipping to change at line 161
* similar typespecs (e.g. ones with numerical types in the same position) will * similar typespecs (e.g. ones with numerical types in the same position) will
* be coerced to the typespec given here. * be coerced to the typespec given here.
* \param h The method handler callback function that will be called it a * \param h The method handler callback function that will be called it a
* matching message is received * matching message is received
* \param user_data A value that will be passed to the callback function, h , * \param user_data A value that will be passed to the callback function, h ,
* when its invoked matching from this method. * when its invoked matching from this method.
*/ */
lo_method lo_server_thread_add_method(lo_server_thread st, const char *path , lo_method lo_server_thread_add_method(lo_server_thread st, const char *path ,
const char *typespec, lo_method_handler h, const char *typespec, lo_method_handler h,
void *user_data); void *user_data);
/**
* \brief Delete an OSC method from the specifed server thread.
*
* \param st The server thread the method is to be removed from.
* \param path The OSC path of the method to delete. If NULL is passed the
* method will match the generic handler.
* \param typespec The typespec the method accepts.
*/
void lo_server_thread_del_method(lo_server_thread st, const char *path,
const char *typespec);
/** /**
* \brief Start the server thread * \brief Start the server thread
* *
* \param st the server thread to start. * \param st the server thread to start.
*/ */
void lo_server_thread_start(lo_server_thread st); void lo_server_thread_start(lo_server_thread st);
/** /**
* \brief Stop the server thread * \brief Stop the server thread
 End of changes. 2 change blocks. 
1 lines changed or deleted 11 lines changed or added


 lo_endian.h   lo_endian.h 
skipping to change at line 14 skipping to change at line 14
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* $Id: lo_endian.h.in,v 1.3 2004/11/06 14:49:45 trutkin Exp $ * $Id: lo_endian.h.in,v 1.4 2005/04/25 21:46:47 xovo Exp $
*/ */
#ifndef LO_ENDIAN_H #ifndef LO_ENDIAN_H
#define LO_ENDIAN_H #define LO_ENDIAN_H
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <stdint.h>
#ifdef WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <netinet/in.h> #include <netinet/in.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define lo_swap16(x) htons(x) #define lo_swap16(x) htons(x)
#define lo_swap32(x) htonl(x) #define lo_swap32(x) htonl(x)
/* These macros come from the Linux kernel */ /* These macros come from the Linux kernel */
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added


 lo_lowlevel.h   lo_lowlevel.h 
skipping to change at line 14 skipping to change at line 14
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* $Id: lo_lowlevel.h,v 1.10 2005/01/19 07:59:49 theno23 Exp $ * $Id: lo_lowlevel.h,v 1.11 2005/08/09 15:06:04 mhabets Exp $
*/ */
#ifndef LO_LOWLEVEL_H #ifndef LO_LOWLEVEL_H
#define LO_LOWLEVEL_H #define LO_LOWLEVEL_H
#include "lo/lo_osc_types.h" #include "lo/lo_osc_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 399 skipping to change at line 399
* \param h The method handler callback function that will be called it a * \param h The method handler callback function that will be called it a
* matching message is received * matching message is received
* \param user_data A value that will be passed to the callback function, h , * \param user_data A value that will be passed to the callback function, h ,
* when its invoked matching from this method. * when its invoked matching from this method.
*/ */
lo_method lo_server_add_method(lo_server s, const char *path, lo_method lo_server_add_method(lo_server s, const char *path,
const char *typespec, lo_method_handler h, const char *typespec, lo_method_handler h,
void *user_data); void *user_data);
/** /**
* \brief Delete an OSC method from the specifed server.
*
* \param s The server the method is to be removed from.
* \param path The OSC path of the method to delete. If NULL is passed the
* method will match the generic handler.
* \param typespec The typespec the method accepts.
*/
void lo_server_del_method(lo_server s, const char *path,
const char *typespec);
/**
* \brief Return the file descriptor of the server socket. * \brief Return the file descriptor of the server socket.
* *
* If the server protocol supports exposing the server's underlying * If the server protocol supports exposing the server's underlying
* receive mechanism for monitoring with select() or poll(), this function * receive mechanism for monitoring with select() or poll(), this function
* returns the file descriptor needed, otherwise, it returns -1. * returns the file descriptor needed, otherwise, it returns -1.
* *
* WARNING: when using this function beware that not all OSC packets that a re * WARNING: when using this function beware that not all OSC packets that a re
* received are dispatched immediatly. lo_server_events_pending() and * received are dispatched immediatly. lo_server_events_pending() and
* lo_server_next_event_delay() can be used to tell if there are pending * lo_server_next_event_delay() can be used to tell if there are pending
* events and how long before you should attempt to receive them. * events and how long before you should attempt to receive them.
 End of changes. 2 change blocks. 
1 lines changed or deleted 12 lines changed or added


 lo_osc_types.h   lo_osc_types.h 
skipping to change at line 14 skipping to change at line 14
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* $Id: lo_osc_types.h,v 1.2 2004/11/04 10:33:36 theno23 Exp $ * $Id: lo_osc_types.h,v 1.4 2005/07/05 12:56:31 theno23 Exp $
*/ */
#ifndef LO_OSC_TYPES_H #ifndef LO_OSC_TYPES_H
#define LO_OSC_TYPES_H #define LO_OSC_TYPES_H
#include <stdint.h>
/** /**
* \addtogroup liblo * \addtogroup liblo
* @{ * @{
*/ */
/** /**
* \brief A structure to store OSC TimeTag values. * \brief A structure to store OSC TimeTag values.
*/ */
typedef struct { typedef struct {
/** The number of seconds since Jan 1st 1900 in the UTC timezone. */ /** The number of seconds since Jan 1st 1900 in the UTC timezone. */
skipping to change at line 107 skipping to change at line 109
/** 64 bit IEEE-754 double. */ /** 64 bit IEEE-754 double. */
double d; double d;
/** 64 bit IEEE-754 double. */ /** 64 bit IEEE-754 double. */
double f64; double f64;
/** Standard C, NULL terminated string. */ /** Standard C, NULL terminated string. */
char s; char s;
/** Standard C, NULL terminated, string. Used in systems which /** Standard C, NULL terminated, string. Used in systems which
* distinguish strings and symbols. */ * distinguish strings and symbols. */
char S; char S;
/** Standard C, 8 bit, char. */ /** Standard C, 8 bit, char. */
char c; uint32_t c;
/** A 4 byte MIDI packet. */ /** A 4 byte MIDI packet. */
uint8_t m[4]; uint8_t m[4];
/** OSC TimeTag value. */ /** OSC TimeTag value. */
lo_timetag t; lo_timetag t;
} lo_arg; } lo_arg;
#define LO_TT_IMMEDIATE ((lo_timetag){0U,0U}) #define LO_TT_IMMEDIATE ((lo_timetag){0U,0U})
/** @} */ /** @} */
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added


 lo_types.h   lo_types.h 
skipping to change at line 14 skipping to change at line 14
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* $Id: lo_types.h,v 1.2 2004/11/04 10:33:36 theno23 Exp $ * $Id: lo_types.h,v 1.3 2005/04/25 21:46:47 xovo Exp $
*/ */
#ifndef LO_TYPES_H #ifndef LO_TYPES_H
#define LO_TYPES_H #define LO_TYPES_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <netdb.h> #include <netdb.h>
#endif
#include <pthread.h> #include <pthread.h>
#include "lo/lo_osc_types.h" #include "lo/lo_osc_types.h"
/** /**
* \brief A reference to an OSC service. * \brief A reference to an OSC service.
* *
* Created by calls to lo_address_new() or lo_address_new_from_url(). * Created by calls to lo_address_new() or lo_address_new_from_url().
*/ */
typedef void *lo_address; typedef void *lo_address;
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/