attributes.h   attributes.h 
/* /*
* attributes.h * attributes.h
* Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Copyright (C) 2001-2007 xine developers * Copyright (C) 2001-2008 xine developers
* *
* This file was originally part of mpeg2dec, a free MPEG-2 video stream * This file was originally part of mpeg2dec, a free MPEG-2 video stream
* decoder. * decoder.
* *
* mpeg2dec is free software; you can redistribute it and/or modify * mpeg2dec 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.
* *
* mpeg2dec is distributed in the hope that it will be useful, * mpeg2dec is distributed in the hope that it will be useful,
skipping to change at line 75 skipping to change at line 75
#else #else
# define XINE_PROTECTED # define XINE_PROTECTED
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_SENTINEL #ifdef SUPPORT_ATTRIBUTE_SENTINEL
# define XINE_SENTINEL __attribute__((__sentinel__)) # define XINE_SENTINEL __attribute__((__sentinel__))
#else #else
# define XINE_SENTINEL # define XINE_SENTINEL
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_DEPRECATED #if defined(SUPPORT_ATTRIBUTE_DEPRECATED) && !defined(XINE_COMPILE)
# define XINE_DEPRECATED __attribute__((__deprecated__)) # define XINE_DEPRECATED __attribute__((__deprecated__))
#else #else
# define XINE_DEPRECATED # define XINE_DEPRECATED
#endif #endif
#ifndef __attr_unused #ifndef __attr_unused
# ifdef SUPPORT_ATTRIBUTE_UNUSED # ifdef SUPPORT_ATTRIBUTE_UNUSED
# define __attr_unused __attribute__((__unused__)) # define __attr_unused __attribute__((__unused__))
# else # else
# define __attr_unused # define __attr_unused
# endif # endif
#endif #endif
/* Format attributes */ /* Format attributes */
#ifdef SUPPORT_ATTRIBUTE_FORMAT #ifdef SUPPORT_ATTRIBUTE_FORMAT
# define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__, fmt, var))) # define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__, fmt, var)))
# define XINE_FORMAT_SCANF(fmt,var) __attribute__((__format__(__scanf__, fm t, var)))
#else #else
# define XINE_FORMAT_PRINTF(fmt,var) # define XINE_FORMAT_PRINTF(fmt,var)
# define XINE_FORMAT_SCANF(fmt,var)
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG #ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG
# define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt))) # define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt)))
#else #else
# define XINE_FORMAT_PRINTF_ARG(fmt) # define XINE_FORMAT_PRINTF_ARG(fmt)
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_MALLOC #ifdef SUPPORT_ATTRIBUTE_MALLOC
# define XINE_MALLOC __attribute__((__malloc__)) # define XINE_MALLOC __attribute__((__malloc__))
#else #else
 End of changes. 4 change blocks. 
2 lines changed or deleted 4 lines changed or added


 buffer.h   buffer.h 
/* /*
* Copyright (C) 2000-2004 the xine project * Copyright (C) 2000-2008 the xine project
* *
* This file is part of xine, a free video player. * This file is part of xine, a free video player.
* *
* xine is free software; you can redistribute it and/or modify * xine 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.
* *
* xine is distributed in the hope that it will be useful, * xine 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
skipping to change at line 617 skipping to change at line 617
fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE _MALLOC XINE_PROTECTED; fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE _MALLOC XINE_PROTECTED;
fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size ) XINE_MALLOC XINE_PROTECTED; fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size ) XINE_MALLOC XINE_PROTECTED;
/* return BUF_VIDEO_xxx given the fourcc /* return BUF_VIDEO_xxx given the fourcc
* fourcc_int must be read in machine endianness * fourcc_int must be read in machine endianness
* example: fourcc_int = *(uint32_t *)fourcc_char; * example: fourcc_int = *(uint32_t *)fourcc_char;
*/ */
uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ) XINE_PROTECTED; uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ) XINE_PROTECTED;
/* return codec name given BUF_VIDEO_xxx */ /* return codec name given BUF_VIDEO_xxx */
char * _x_buf_video_name( uint32_t buf_type ) XINE_PROTECTED; const char * _x_buf_video_name( uint32_t buf_type ) XINE_PROTECTED;
/* return BUF_AUDIO_xxx given the formattag */ /* return BUF_AUDIO_xxx given the formattag */
uint32_t _x_formattag_to_buf_audio( uint32_t formattag ) XINE_PROTECTED; uint32_t _x_formattag_to_buf_audio( uint32_t formattag ) XINE_PROTECTED;
/* return codec name given BUF_AUDIO_xxx */ /* return codec name given BUF_AUDIO_xxx */
char * _x_buf_audio_name( uint32_t buf_type ) XINE_PROTECTED; const char * _x_buf_audio_name( uint32_t buf_type ) XINE_PROTECTED;
#ifndef SUPPORT_ATTRIBUTE_PACKED #ifndef SUPPORT_ATTRIBUTE_PACKED
/* no attribute packed? let's try with pragma pack as a last resort */ /* no attribute packed? let's try with pragma pack as a last resort */
#pragma pack(2) #pragma pack(2)
#endif #endif
/* this is xine version of BITMAPINFOHEADER /* this is xine version of BITMAPINFOHEADER
* - should be safe to compile on 64bits machines * - should be safe to compile on 64bits machines
* - will always use machine endian format, so demuxers reading * - will always use machine endian format, so demuxers reading
* stuff from win32 formats must use the function below. * stuff from win32 formats must use the function below.
*/ */
skipping to change at line 670 skipping to change at line 670
#ifndef SUPPORT_ATTRIBUTE_PACKED #ifndef SUPPORT_ATTRIBUTE_PACKED
#pragma pack() #pragma pack()
#endif #endif
/* convert xine_bmiheader struct from little endian */ /* convert xine_bmiheader struct from little endian */
void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED; void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED;
/* convert xine_waveformatex struct from little endian */ /* convert xine_waveformatex struct from little endian */
void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
static inline _x_is_fourcc(void *ptr, void *tag) { static __inline int _x_is_fourcc(void *ptr, void *tag) {
return memcmp(ptr, tag, 4) == 0; return memcmp(ptr, tag, 4) == 0;
} }
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 xine.h   xine.h 
skipping to change at line 112 skipping to change at line 112
const char *xine_get_version_string (void) XINE_PROTECTED; const char *xine_get_version_string (void) XINE_PROTECTED;
void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED; void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED;
/* compare given version to libxine version, /* compare given version to libxine version,
return 1 if compatible, 0 otherwise */ return 1 if compatible, 0 otherwise */
int xine_check_version (int major, int minor, int sub) XINE_PROTECTED; int xine_check_version (int major, int minor, int sub) XINE_PROTECTED;
/* static info - which libxine release this header came from */ /* static info - which libxine release this header came from */
#define XINE_MAJOR_VERSION 1 #define XINE_MAJOR_VERSION 1
#define XINE_MINOR_VERSION 1 #define XINE_MINOR_VERSION 1
#define XINE_SUB_VERSION 15 #define XINE_SUB_VERSION 16
#define XINE_VERSION "1.1.15" #define XINE_VERSION "1.1.16.1"
/* /*
* pre-init the xine engine * pre-init the xine engine
* *
* will first malloc and init a xine_t, create an empty config * will first malloc and init a xine_t, create an empty config
* system, then scan through all installed plugins and add them * system, then scan through all installed plugins and add them
* to an internal list for later use. * to an internal list for later use.
* *
* to fully init the xine engine, you have to load config values * to fully init the xine engine, you have to load config values
* (either using your own storage method and calling * (either using your own storage method and calling
skipping to change at line 984 skipping to change at line 984
#define XINE_META_INFO_ARTIST 2 #define XINE_META_INFO_ARTIST 2
#define XINE_META_INFO_GENRE 3 #define XINE_META_INFO_GENRE 3
#define XINE_META_INFO_ALBUM 4 #define XINE_META_INFO_ALBUM 4
#define XINE_META_INFO_YEAR 5 #define XINE_META_INFO_YEAR 5
#define XINE_META_INFO_VIDEOCODEC 6 #define XINE_META_INFO_VIDEOCODEC 6
#define XINE_META_INFO_AUDIOCODEC 7 #define XINE_META_INFO_AUDIOCODEC 7
#define XINE_META_INFO_SYSTEMLAYER 8 #define XINE_META_INFO_SYSTEMLAYER 8
#define XINE_META_INFO_INPUT_PLUGIN 9 #define XINE_META_INFO_INPUT_PLUGIN 9
#define XINE_META_INFO_CDINDEX_DISCID 10 #define XINE_META_INFO_CDINDEX_DISCID 10
#define XINE_META_INFO_TRACK_NUMBER 11 #define XINE_META_INFO_TRACK_NUMBER 11
#define XINE_META_INFO_COMPOSER 12
/********************************************************************* /*********************************************************************
* plugin management / autoplay / mrl browsing * * plugin management / autoplay / mrl browsing *
*********************************************************************/ *********************************************************************/
/* /*
* note: the pointers to strings or string arrays returned * note: the pointers to strings or string arrays returned
* by some of these functions are pointers to statically * by some of these functions are pointers to statically
* alloced internal xine memory chunks. * alloced internal xine memory chunks.
* they're only valid between xine function calls * they're only valid between xine function calls
skipping to change at line 1773 skipping to change at line 1774
#define XINE_EVENT_VDR_AUDIO 332 #define XINE_EVENT_VDR_AUDIO 332
#define XINE_EVENT_VDR_INFO 333 #define XINE_EVENT_VDR_INFO 333
#define XINE_EVENT_VDR_CHANNELPREVIOUS 334 #define XINE_EVENT_VDR_CHANNELPREVIOUS 334
#define XINE_EVENT_VDR_SUBTITLES 335 #define XINE_EVENT_VDR_SUBTITLES 335
/* some space for further keys */ /* some space for further keys */
#define XINE_EVENT_VDR_SETVIDEOWINDOW 350 #define XINE_EVENT_VDR_SETVIDEOWINDOW 350
#define XINE_EVENT_VDR_FRAMESIZECHANGED 351 #define XINE_EVENT_VDR_FRAMESIZECHANGED 351
#define XINE_EVENT_VDR_SELECTAUDIO 352 #define XINE_EVENT_VDR_SELECTAUDIO 352
#define XINE_EVENT_VDR_TRICKSPEEDMODE 353 #define XINE_EVENT_VDR_TRICKSPEEDMODE 353
#define XINE_EVENT_VDR_PLUGINSTARTED 354 #define XINE_EVENT_VDR_PLUGINSTARTED 354
#define XINE_EVENT_VDR_DISCONTINUITY 355
/* events generated from post plugins */ /* events generated from post plugins */
#define XINE_EVENT_POST_TVTIME_FILMMODE_CHANGE 400 #define XINE_EVENT_POST_TVTIME_FILMMODE_CHANGE 400
/* /*
* xine event struct * xine event struct
*/ */
typedef struct { typedef struct {
int type; /* event type (constants see abo ve) */ int type; /* event type (constants see abo ve) */
xine_stream_t *stream; /* stream this event belongs to */ xine_stream_t *stream; /* stream this event belongs to */
skipping to change at line 1900 skipping to change at line 1902
* by events (they are the mrl references enclosed in 1). 1a is played afte r * by events (they are the mrl references enclosed in 1). 1a is played afte r
* receiving the finished event from 1. note: 1b is usually ignored, it sho uld * receiving the finished event from 1. note: 1b is usually ignored, it sho uld
* only be used in case 1a fails to open. * only be used in case 1a fails to open.
* *
* An event listener which accepts XINE_EVENT_MRL_REFERENCE_EXT events * An event listener which accepts XINE_EVENT_MRL_REFERENCE_EXT events
* *must* ignore XINE_EVENT_MRL_REFERENCE events. * *must* ignore XINE_EVENT_MRL_REFERENCE events.
*/ */
typedef struct { typedef struct {
int alternative; /* alternative playlist number, usually 0 */ int alternative; /* alternative playlist number, usually 0 */
char mrl[1]; /* might (will) be longer */ char mrl[1]; /* might (will) be longer */
} xine_mrl_reference_data_t; } xine_mrl_reference_data_t XINE_DEPRECATED;
typedef struct { typedef struct {
int alternative; /* as above */ int alternative; /* as above */
uint32_t start_time, duration; /* milliseconds */ uint32_t start_time, duration; /* milliseconds */
uint32_t spare[20]; /* for future expansion */ uint32_t spare[20]; /* for future expansion */
const char mrl[1]; /* might (will) be longer */ const char mrl[1]; /* might (will) be longer */
/*const char title[]; ** immediately follows MRL's terminating NUL */ /*const char title[]; ** immediately follows MRL's terminating NUL */
} xine_mrl_reference_data_ext_t; } xine_mrl_reference_data_ext_t;
/* /*
 End of changes. 4 change blocks. 
3 lines changed or deleted 5 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/