jslist.h   jslist.h 
skipping to change at line 29 skipping to change at line 29
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA . Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA .
*/ */
#ifndef __jack_jslist_h__ #ifndef __jack_jslist_h__
#define __jack_jslist_h__ #define __jack_jslist_h__
#include <stdlib.h> #include <stdlib.h>
#include <jack/systemdeps.h> #include <jack/systemdeps.h>
#ifdef sun
#define __inline__
#endif
typedef struct _JSList JSList; typedef struct _JSList JSList;
typedef int (*JCompareFunc) (void* a, void* b); typedef int (*JCompareFunc) (void* a, void* b);
struct _JSList struct _JSList
{ {
void *data; void *data;
JSList *next; JSList *next;
}; };
static __inline__ static __inline__
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 ringbuffer.h   ringbuffer.h 
skipping to change at line 196 skipping to change at line 196
/** /**
* Reset the read and write pointers, making an empty buffer. * Reset the read and write pointers, making an empty buffer.
* *
* This is not thread safe. * This is not thread safe.
* *
* @param rb a pointer to the ringbuffer structure. * @param rb a pointer to the ringbuffer structure.
*/ */
void jack_ringbuffer_reset(jack_ringbuffer_t *rb); void jack_ringbuffer_reset(jack_ringbuffer_t *rb);
/** /**
* Reset the internal "available" size, and read and write pointers, making
an empty buffer.
*
* This is not thread safe.
*
* @param rb a pointer to the ringbuffer structure.
* @param sz the new size, that must be less than allocated size.
*/
void jack_ringbuffer_reset_size (jack_ringbuffer_t * rb, size_t sz);
/**
* Write data into the ringbuffer. * Write data into the ringbuffer.
* *
* @param rb a pointer to the ringbuffer structure. * @param rb a pointer to the ringbuffer structure.
* @param src a pointer to the data to be written to the ringbuffer. * @param src a pointer to the data to be written to the ringbuffer.
* @param cnt the number of bytes to write. * @param cnt the number of bytes to write.
* *
* @return the number of bytes write, which may range from 0 to cnt * @return the number of bytes write, which may range from 0 to cnt
*/ */
size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src, size_t jack_ringbuffer_write(jack_ringbuffer_t *rb, const char *src,
size_t cnt); size_t cnt);
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 systemdeps.h   systemdeps.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __jack_systemdeps_h__ #ifndef __jack_systemdeps_h__
#define __jack_systemdeps_h__ #define __jack_systemdeps_h__
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#ifdef __MINGW32__ #ifdef _MSC_VER /* Microsoft compiler */
#include <stdint.h> #define __inline__ inline
#include <sys/types.h> #ifndef int8_t
#else typedef char int8_t;
#define __inline__ inline typedef unsigned char uint8_t;
//#define vsnprintf _vsnprintf typedef short int16_t;
//#define snprintf _snprintf typedef unsigned short uint16_t;
typedef char int8_t; typedef long int32_t;
typedef unsigned char uint8_t; typedef unsigned long uint32_t;
typedef short int16_t; typedef LONGLONG int64_t;
typedef unsigned short uint16_t; typedef ULONGLONG uint64_t;
typedef long int32_t; #endif
typedef unsigned long uint32_t; #ifndef pthread_t
typedef LONGLONG int64_t; typedef HANDLE pthread_t;
typedef ULONGLONG uint64_t; #endif
#elif __MINGW32__ /* MINGW */
#include <stdint.h>
#include <sys/types.h>
#ifndef pthread_t
typedef HANDLE pthread_t;
#endif
#else /* other compilers ...*/
#include <inttypes.h>
#include <pthread.h>
#include <sys/types.h>
#endif #endif
typedef HANDLE pthread_t;
typedef int64_t _jack_time_t;
#endif // WIN32 */
#if defined(__APPLE__) || defined(__linux__) #endif /* WIN32 */
#include <inttypes.h>
#include <pthread.h>
#include <sys/types.h>
typedef uint64_t _jack_time_t;
#endif // __APPLE__ || __linux__ */ #if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined
(sun)
#include <inttypes.h>
#include <pthread.h>
#include <sys/types.h>
#endif /* __APPLE__ || __linux__ || __sun__ || sun */
#endif #endif
 End of changes. 4 change blocks. 
26 lines changed or deleted 32 lines changed or added


 thread.h   thread.h 
skipping to change at line 120 skipping to change at line 120
/** /**
* Cancel the thread then waits for the thread handler to terminate. * Cancel the thread then waits for the thread handler to terminate.
* *
* @param thread POSIX thread ID. * @param thread POSIX thread ID.
* *
* @returns 0, if successful; otherwise an error number. * @returns 0, if successful; otherwise an error number.
*/ */
int jack_client_kill_thread(jack_client_t* client, pthread_t thread); int jack_client_kill_thread(jack_client_t* client, pthread_t thread);
#ifndef WIN32
typedef int (*jack_thread_creator_t)(pthread_t*,
const pthread_attr_t*,
void* (*function)(void*),
void* arg);
/**
* This function can be used in very very specialized cases
* where it is necessary that client threads created by JACK
* are created by something other than pthread_create(). After
* it is used, any threads that JACK needs for the client will
* will be created by calling the function passed to this
* function.
*
* No normal application/client should consider calling this.
* The specific case for which it was created involves running
* win32/x86 plugins under Wine on Linux, where it is necessary
* that all threads that might call win32 functions are known
* to Wine.
*
* @param creator a function that creates a new thread
*
*/
void jack_set_thread_creator (jack_thread_creator_t creator);
#endif
/* @} */ /* @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __jack_thread_h__ */ #endif /* __jack_thread_h__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 27 lines changed or added


 types.h   types.h 
skipping to change at line 42 skipping to change at line 42
/** /**
* Maximum value that can be stored in jack_nframes_t * Maximum value that can be stored in jack_nframes_t
*/ */
#define JACK_MAX_FRAMES (4294967295U) /* This should be UINT32_MAX, but C+ + has a problem with that. */ #define JACK_MAX_FRAMES (4294967295U) /* This should be UINT32_MAX, but C+ + has a problem with that. */
/** /**
* Type used to represent the value of free running * Type used to represent the value of free running
* monotonic clock with units of microseconds. * monotonic clock with units of microseconds.
*/ */
typedef uint64_t jack_time_t;
typedef _jack_time_t jack_time_t;
/** /**
* Maximum size of @a load_init string passed to an internal client * Maximum size of @a load_init string passed to an internal client
* jack_initialize() function via jack_internal_client_load(). * jack_initialize() function via jack_internal_client_load().
*/ */
#define JACK_LOAD_INIT_LIMIT 1024 #define JACK_LOAD_INIT_LIMIT 1024
/** /**
* jack_intclient_t is an opaque type representing a loaded internal * jack_intclient_t is an opaque type representing a loaded internal
* client. You may only access it using the API provided in @ref * client. You may only access it using the API provided in @ref
 End of changes. 1 change blocks. 
2 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/