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.10 2005/12/05 22:25:31 nhumfrey Exp $ * $Id: lo.h 80 2007-03-09 18:26:36Z nhumfrey $
*/ */
#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 152 skipping to change at line 152
const char *lo_address_errstr(lo_address a); const char *lo_address_errstr(lo_address a);
/** /**
* \brief Create a new server thread to handle incoming OSC * \brief Create a new server thread to handle incoming OSC
* messages. * messages.
* *
* Server threads take care of the message reception and dispatch by * Server threads take care of the message reception and dispatch by
* transparently creating a systme thread to handle incoming messages. * transparently creating a systme thread to handle incoming messages.
* Use this if you do not want to handle the threading yourself. * Use this if you do not want to handle the threading yourself.
* *
* \param port If NULL is passed then an unused UDP port will be chosen by the * \param port If NULL is passed then an unused port will be chosen by the
* system, its number may be retreived with lo_server_thread_get_port() * system, its number may be retreived with lo_server_thread_get_port()
* so it can be passed to clients. Otherwise a decimal port number, service * so it can be passed to clients. Otherwise a decimal port number, service
* name or UNIX domain socket path may be passed. * name or UNIX domain socket path may be passed.
* \param err_h A function that will be called in the event of an error bei ng * \param err_h A function that will be called in the event of an error bei ng
* raised. The function prototype is defined in lo_types.h * raised. The function prototype is defined in lo_types.h
*/ */
lo_server_thread lo_server_thread_new(const char *port, lo_err_handler err_ h); lo_server_thread lo_server_thread_new(const char *port, lo_err_handler err_ h);
/** /**
* \brief Create a new server thread to handle incoming OSC
* messages, specifying protocol.
*
* Server threads take care of the message reception and dispatch by
* transparently creating a systme thread to handle incoming messages.
* Use this if you do not want to handle the threading yourself.
*
* \param port If NULL is passed then an unused port will be chosen by the
* system, its number may be retreived with lo_server_thread_get_port()
* so it can be passed to clients. Otherwise a decimal port number, service
* name or UNIX domain socket path may be passed.
* \param proto The protocol to use, should be one of LO_UDP, LO_TCP or LO_
UNIX.
* \param err_h A function that will be called in the event of an error bei
ng
* raised. The function prototype is defined in lo_types.h
*/
lo_server_thread lo_server_thread_new_with_proto(const char *port, int prot
o,
lo_err_handler err_h);
/**
* \brief Free memory taken by a server thread * \brief Free memory taken by a server thread
* *
* Frees the memory, and, if currently running will stop the associated thr ead. * Frees the memory, and, if currently running will stop the associated thr ead.
*/ */
void lo_server_thread_free(lo_server_thread st); void lo_server_thread_free(lo_server_thread st);
/** /**
* \brief Add an OSC method to the specifed server thread. * \brief Add an OSC method to the specifed server thread.
* *
* \param st The server thread the method is to be added to. * \param st The server thread the method is to be added to.
skipping to change at line 241 skipping to change at line 260
* to be dispatched by the thread */ * to be dispatched by the thread */
int lo_server_thread_events_pending(lo_server_thread st); int lo_server_thread_events_pending(lo_server_thread st);
/** /**
* \brief Create a new OSC blob type. * \brief Create a new OSC blob type.
* *
* \param size The ammount of space to allocate in the blob structure. * \param size The ammount of space to allocate in the blob structure.
* \param data The data that will be used to initialise the blob, should be * \param data The data that will be used to initialise the blob, should be
* size bytes long. * size bytes long.
*/ */
lo_blob lo_blob_new(int32_t size, void *data); lo_blob lo_blob_new(int32_t size, const void *data);
/** /**
* \brief Free the memory taken by a blob * \brief Free the memory taken by a blob
*/ */
void lo_blob_free(lo_blob b); void lo_blob_free(lo_blob b);
/** /**
* \brief Return the ammount of valid data in a lo blob object. * \brief Return the ammount of valid data in a lo blob object.
* *
* If you want to know the storage size, use lo_arg_size(). * If you want to know the storage size, use lo_arg_size().
 End of changes. 4 change blocks. 
3 lines changed or deleted 25 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.4 2005/04/25 21:46:47 xovo Exp $ * $Id: lo_endian.h.in 40 2005-04-25 21:46:47Z xovo $
*/ */
#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 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 lo_errors.h   lo_errors.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_errors.h,v 1.2 2004/11/17 17:34:45 theno23 Exp $ * $Id: lo_errors.h 23 2004-11-17 17:34:46Z theno23 $
*/ */
#ifndef LO_ERRORS_H #ifndef LO_ERRORS_H
#define LO_ERRORS_H #define LO_ERRORS_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define LO_ENOPATH 9901 #define LO_ENOPATH 9901
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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.15 2005/12/29 20:08:26 nhumfrey Exp $ * $Id: lo_lowlevel.h 70 2006-03-29 20:45:57Z nhumfrey $
*/ */
#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 240 skipping to change at line 240
/** /**
* \brief Return the port/service name of a lo_address object * \brief Return the port/service name of a lo_address object
* *
* Returned value most not be modified or free'd. Value will be a service n ame * Returned value most not be modified or free'd. Value will be a service n ame
* or ASCII representation of the port number. * or ASCII representation of the port number.
*/ */
const char *lo_address_get_port(lo_address a); const char *lo_address_get_port(lo_address a);
/** /**
* \brief Return the protocol of a lo_address object
*
* Returned value will be one of LO_UDP, LO_TCP or LO_UNIX.
*/
int lo_address_get_protocol(lo_address a);
/**
* \brief Return a URL representing an OSC address * \brief Return a URL representing an OSC address
* *
* Returned value must be free'd. * Returned value must be free'd.
*/ */
char *lo_address_get_url(lo_address a); char *lo_address_get_url(lo_address a);
/** /**
* \brief Create a new bundle object. * \brief Create a new bundle object.
* *
* OSC Bundles ecapsulate one or more OSC messages and may include a timest amp * OSC Bundles ecapsulate one or more OSC messages and may include a timest amp
skipping to change at line 460 skipping to change at line 467
/** /**
* \brief Return the port number that the server has bound to. * \brief Return the port number that the server has bound to.
* *
* Useful when NULL is passed for the port number and you wish to know how to * Useful when NULL is passed for the port number and you wish to know how to
* address the server. * address the server.
*/ */
int lo_server_get_port(lo_server s); int lo_server_get_port(lo_server s);
/** /**
* \brief Return the protocol that the server is using.
*
* Returned value will be one of LO_UDP, LO_TCP or LO_UNIX.
*/
int lo_server_get_protocol(lo_server s);
/**
* \brief Return an OSC URL that can be used to contact the server. * \brief Return an OSC URL that can be used to contact the server.
* *
* The return value should bee free()'d when it is no longer needed. * The return value should bee free()'d when it is no longer needed.
*/ */
char *lo_server_get_url(lo_server s); char *lo_server_get_url(lo_server s);
/** /**
* \brief Return true if there are scheduled events (eg. from bundles) * \brief Return true if there are scheduled events (eg. from bundles)
* waiting to be dispatched by the server * waiting to be dispatched by the server
*/ */
 End of changes. 3 change blocks. 
1 lines changed or deleted 15 lines changed or added


 lo_macros.h   lo_macros.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_macros.h,v 1.5 2005/12/05 22:22:09 nhumfrey Exp $ * $Id: lo_macros.h 75 2007-03-08 19:01:44Z nhumfrey $
*/ */
#ifndef LO_MACROS_H #ifndef LO_MACROS_H
#define LO_MACROS_H #define LO_MACROS_H
/* macros that have to be defined after function signatures */ /* macros that have to be defined after function signatures */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* \brief Maximum length of UDP messages in bytes /* \brief Maximum length of UDP messages in bytes
*/ */
#define LO_MAX_MSG_SIZE 32768 #define LO_MAX_MSG_SIZE 32768
/* \brief A set of macros to represent different communications transports /* \brief A set of macros to represent different communications transports
*/ */
#define LO_UDP 0x1 #define LO_DEFAULT 0x0
#define LO_UNIX 0x2 #define LO_UDP 0x1
#define LO_TCP 0x4 #define LO_UNIX 0x2
#define LO_TCP 0x4
/* an internal value, ignored in transmission but check against LO_MARKER i n the /* an internal value, ignored in transmission but check against LO_MARKER i n the
* argument list. Used to do primitive bounds checking */ * argument list. Used to do primitive bounds checking */
#define LO_MARKER_A 0xdeadbeef #define LO_MARKER_A 0xdeadbeef
#define LO_MARKER_B 0xf00baa23 #define LO_MARKER_B 0xf00baa23
#define lo_send(targ, path, types...) \ #define lo_send(targ, path, types...) \
lo_send_internal(targ, __FILE__, __LINE__, path, types, \ lo_send_internal(targ, __FILE__, __LINE__, path, types, \
LO_MARKER_A, LO_MARKER_B) LO_MARKER_A, LO_MARKER_B)
 End of changes. 2 change blocks. 
4 lines changed or deleted 5 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.6 2005/12/13 21:31:04 nhumfrey Exp $ * $Id: lo_osc_types.h 60 2005-12-13 21:31:04Z nhumfrey $
*/ */
#ifndef LO_OSC_TYPES_H #ifndef LO_OSC_TYPES_H
#define LO_OSC_TYPES_H #define LO_OSC_TYPES_H
#include <stdint.h> #include <stdint.h>
/** /**
* \addtogroup liblo * \addtogroup liblo
* @{ * @{
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 lo_throw.h   lo_throw.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_throw.h,v 1.1.1.1 2004/08/07 22:21:02 theno23 Exp $ * $Id: lo_throw.h 2 2004-08-07 22:20:58Z theno23 $
*/ */
#ifndef LO_THROW_H #ifndef LO_THROW_H
#define LO_THROW_H #define LO_THROW_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void lo_throw(lo_server s, int errnum, const char *message, const char *pat h); void lo_throw(lo_server s, int errnum, const char *message, const char *pat h);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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.3 2005/04/25 21:46:47 xovo Exp $ * $Id: lo_types.h 40 2005-04-25 21:46:47Z xovo $
*/ */
#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 #ifdef WIN32
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/