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 10 #define XINE_SUB_VERSION 11
#define XINE_VERSION "1.1.10" #define XINE_VERSION "1.1.11"
/* /*
* 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 416 skipping to change at line 416
#define XINE_VERBOSITY_LOG 1 #define XINE_VERBOSITY_LOG 1
#define XINE_VERBOSITY_DEBUG 2 #define XINE_VERBOSITY_DEBUG 2
/* /*
* snapshot function * snapshot function
* *
* image format can be YUV 4:2:0 or 4:2:2 * image format can be YUV 4:2:0 or 4:2:2
* will copy the image data into memory that <img> points to * will copy the image data into memory that <img> points to
* (interleaved for yuv 4:2:2 or planary for 4:2:0) * (interleaved for yuv 4:2:2 or planary for 4:2:0)
* *
* returns 1 on success, 0 failure. * xine_get_current_frame() requires that <img> must be able
* to hold the image data. Use a NULL pointer to retrieve the
* necessary parameters for calculating the buffer size. Be
* aware that the image can change between two successive calls
* so you better pause the stream.
*
* xine_get_current_frame_s() requires to specify the buffer
* size and it returns the needed / used size. It won't copy
* image data into a too small buffer.
*
* xine_get_current_frame_alloc() takes care of allocating
* a buffer on it's own, so image data can be retrieved by
* a single call without the need to pause the stream.
*
* all functions return 1 on success, 0 failure.
*/ */
int xine_get_current_frame (xine_stream_t *stream, int xine_get_current_frame (xine_stream_t *stream,
int *width, int *height, int *width, int *height,
int *ratio_code, int *format, int *ratio_code, int *format,
uint8_t *img) XINE_PROTECTED; uint8_t *img) XINE_PROTECTED;
int xine_get_current_frame_s (xine_stream_t *stream,
int *width, int *height,
int *ratio_code, int *format,
uint8_t *img, int *size) XINE_PROTECTED;
int xine_get_current_frame_alloc (xine_stream_t *stream,
int *width, int *height,
int *ratio_code, int *format,
uint8_t **img, int *size) XINE_PROTECTED;
/* xine image formats */ /* xine image formats */
#define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y') #define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y')
#define XINE_IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y') #define XINE_IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y')
#define XINE_IMGFMT_XVMC (('C'<<24)|('M'<<16)|('v'<<8)|'X') #define XINE_IMGFMT_XVMC (('C'<<24)|('M'<<16)|('v'<<8)|'X')
#define XINE_IMGFMT_XXMC (('C'<<24)|('M'<<16)|('x'<<8)|'X') #define XINE_IMGFMT_XXMC (('C'<<24)|('M'<<16)|('x'<<8)|'X')
/* get current xine's virtual presentation timestamp (1/90000 sec) /* get current xine's virtual presentation timestamp (1/90000 sec)
* note: this is mostly internal data. * note: this is mostly internal data.
* one can use vpts with xine_osd_show() and xine_osd_hide(). * one can use vpts with xine_osd_show() and xine_osd_hide().
*/ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 27 lines changed or added


 xine_internal.h   xine_internal.h 
skipping to change at line 334 skipping to change at line 334
/* event mechanism */ /* event mechanism */
xine_list_t *event_queues; xine_list_t *event_queues;
pthread_mutex_t event_queues_lock; pthread_mutex_t event_queues_lock;
/* demux thread stuff */ /* demux thread stuff */
pthread_t demux_thread; pthread_t demux_thread;
int demux_thread_created; int demux_thread_created;
int demux_thread_running; int demux_thread_running;
pthread_mutex_t demux_lock; pthread_mutex_t demux_lock;
int demux_action_pending; int demux_action_pending;
pthread_cond_t demux_resume;
pthread_mutex_t demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */ pthread_mutex_t demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */
extra_info_t *current_extra_info; extra_info_t *current_extra_info;
pthread_mutex_t current_extra_info_lock; pthread_mutex_t current_extra_info_lock;
int video_seek_count; int video_seek_count;
xine_post_out_t video_source; xine_post_out_t video_source;
xine_post_out_t audio_source; xine_post_out_t audio_source;
int slave_is_subtitle; /* ... and will be automati caly disposed */ int slave_is_subtitle; /* ... and will be automati caly disposed */
 End of changes. 1 change blocks. 
0 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/