diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 6 | ||||
| -rw-r--r-- | include/xine.h.in | 107 |
2 files changed, 24 insertions, 89 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 46a9e2478..673f508fa 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -10,12 +10,6 @@ noinst_HEADERS = config.h configure.h CONFIG_CLEAN_FILES = xine.h $(inttypes_h) -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/include/xine.h.in b/include/xine.h.in index ad70e0953..5a06eab65 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -87,13 +87,6 @@ typedef struct xine_stream_s xine_stream_t; typedef struct xine_audio_port_s xine_audio_port_t; typedef struct xine_video_port_s xine_video_port_t; -#ifndef XINE_DISABLE_DEPRECATED_FEATURES -/* convenience types: simple player UIs might want to call ports drivers */ -typedef xine_audio_port_t xine_ao_driver_t; -typedef xine_video_port_t xine_vo_driver_t; -#endif - - /********************************************************************* * global engine handling * *********************************************************************/ @@ -464,17 +457,17 @@ typedef struct { int64_t vpts; /* timestamp 1/90000 sec for a/v sync */ int64_t duration; + double aspect_ratio; int width, height; int colorspace; /* XINE_IMGFMT_* */ - double aspect_ratio; int pos_stream; /* bytes from stream start */ int pos_time; /* milliseconds */ + int frame_number; /* frame number (may be unknown) */ + uint8_t *data; void *xine_frame; /* used internally by xine engine */ - - int frame_number; /* frame number (may be unknown) */ } xine_video_frame_t; int xine_get_next_video_frame (xine_video_port_t *port, @@ -492,11 +485,11 @@ typedef struct { int num_channels; int bits_per_sample; /* per channel */ - off_t pos_stream; /* bytes from stream start */ - int pos_time; /* milliseconds */ - uint8_t *data; void *xine_frame; /* used internally by xine engine */ + + off_t pos_stream; /* bytes from stream start */ + int pos_time; /* milliseconds */ } xine_audio_frame_t; int xine_get_next_audio_frame (xine_audio_port_t *port, @@ -575,7 +568,7 @@ xine_post_t *xine_post_init(xine_t *xine, const char *name, const char *const *xine_list_post_plugins(xine_t *xine) XINE_PROTECTED; /* get a list of all post plugins of one type */ -const char *const *xine_list_post_plugins_typed(xine_t *xine, int type) XINE_PROTECTED; +const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) XINE_PROTECTED; /* * post plugin input/output @@ -594,13 +587,13 @@ struct xine_post_in_s { /* the name identifying this input */ const char *name; - /* the datatype of this input, use one of XINE_POST_DATA_* here */ - int type; - /* the data pointer; input is directed to this memory location, * so you simply access the pointer to access the input data */ void *data; + /* the datatype of this input, use one of XINE_POST_DATA_* here */ + int type; + }; struct xine_post_out_s { @@ -608,9 +601,6 @@ struct xine_post_out_s { /* the name identifying this output */ const char *name; - /* the datatype of this output, use one of XINE_POST_DATA_* here */ - int type; - /* the data pointer; output should be directed to this memory location, * so in the easy case you simply write through the pointer */ void *data; @@ -626,6 +616,9 @@ struct xine_post_out_s { * if you do not implement rewiring, set this to NULL */ int (*rewire) (xine_post_out_t *self, void *data); + /* the datatype of this output, use one of XINE_POST_DATA_* here */ + int type; + }; /* get a list of all inputs of a post plugin */ @@ -960,8 +953,8 @@ typedef struct { char *origin; /* file plugin: path */ char *mrl; /* <type>://<location> */ char *link; - uint32_t type; /* see below */ off_t size; /* size of this source, may be 0 */ + uint32_t type; /* see below */ } xine_mrl_t; /* mrl types */ @@ -1068,12 +1061,6 @@ void xine_plugins_garbage_collector(xine_t *self) XINE_PROTECTED; * visual specific gui <-> xine engine communication * *********************************************************************/ -#ifndef XINE_DISABLE_DEPRECATED_FEATURES -/* talk to video output driver - old method */ -int xine_gui_send_vo_data (xine_stream_t *self, - int type, void *data) XINE_PROTECTED; -#endif - /* new (preferred) method to talk to video driver. */ int xine_port_send_gui_data (xine_video_port_t *vo, int type, void *data) XINE_PROTECTED; @@ -1356,12 +1343,12 @@ typedef struct { #define CHECK_XV 6 struct xine_health_check_s { - int status; const char* cdrom_dev; const char* dvd_dev; char* msg; char* title; char* explanation; + int status; }; typedef struct xine_health_check_s xine_health_check_t; @@ -1398,17 +1385,17 @@ struct xine_cfg_entry_s { int type; + /* user experience level */ + int exp_level; /* 0 => beginner, + 10 => advanced user, + 20 => expert */ + /* type unknown */ char *unknown_value; /* type string */ char *str_value; char *str_default; -#ifndef XINE_DISABLE_DEPRECATED_FEATURES - char *str_sticky; -#else - void *dummy; -#endif /* common to range, enum, num, bool; * num_value is also used by string to indicate what's required: @@ -1431,11 +1418,6 @@ struct xine_cfg_entry_s { const char *description; const char *help; - /* user experience level */ - int exp_level; /* 0 => beginner, - 10 => advanced user, - 20 => expert */ - /* callback function and data for live changeable values */ /* some config entries will take effect immediately, although they * do not have a callback registered; such values will have some @@ -1661,6 +1643,7 @@ void xine_config_reset (xine_t *self) XINE_PROTECTED; #define XINE_EVENT_VDR_AUDIO 332 #define XINE_EVENT_VDR_INFO 333 #define XINE_EVENT_VDR_CHANNELPREVIOUS 334 +#define XINE_EVENT_VDR_SUBTITLES 335 /* some space for further keys */ #define XINE_EVENT_VDR_SETVIDEOWINDOW 350 #define XINE_EVENT_VDR_FRAMESIZECHANGED 351 @@ -1675,12 +1658,13 @@ void xine_config_reset (xine_t *self) XINE_PROTECTED; * xine event struct */ typedef struct { - int type; /* event type (constants see above) */ xine_stream_t *stream; /* stream this event belongs to */ void *data; /* contents depending on type */ int data_length; + int type; /* event type (constants see above) */ + /* you do not have to provide this, it will be filled in by xine_event_send() */ struct timeval tv; /* timestamp of event creation */ } xine_event_t; @@ -1938,6 +1922,7 @@ typedef struct { #define XINE_MSG_AUDIO_OUT_UNAVAILABLE 11 /* none */ #define XINE_MSG_PERMISSION_ERROR 12 /* (file name or mrl) */ #define XINE_MSG_FILE_EMPTY 13 /* file is empty */ +#define XINE_MSG_AUTHENTICATION_NEEDED 14 /* (mrl, likely http) */ /* opaque xine_event_queue_t */ typedef struct xine_event_queue_s xine_event_queue_t; @@ -2084,50 +2069,6 @@ void xine_osd_set_palette (xine_osd_t *self, */ void xine_osd_free (xine_osd_t *self) XINE_PROTECTED; - -#ifndef XINE_DISABLE_DEPRECATED_FEATURES - -/********************************************************************* - * TV-mode API, to make it possible to use nvtvd to view movies * - *********************************************************************/ - -/* These functions are just dummies to maintain API compatibility. - * You should use libnvtvsimple in your frontend instead. */ - -typedef enum { - XINE_TVSYSTEM_PAL = 0, - XINE_TVSYSTEM_NTSC -} xine_tvsystem; - -/* connect to nvtvd server and save current TV and X settings */ -int xine_tvmode_init (xine_t *self) XINE_PROTECTED; - -/* Turn tvmode on/off (1/0)*/ -int xine_tvmode_use(xine_t *self, int use_tvmode) XINE_PROTECTED; - -/* Set which tv system to use: XINE_TVSYSTEM_PAL or XINE_TVSYSTEM_NTSC */ -void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system) XINE_PROTECTED; - -/* try to change TV state if enabled - * type select 'regular' (0) or 'TV' (1) state - * width frame width the mode should match best or 0 if unknown - * height frame height the mode should match best or 0 if unknown - * fps frame rate the mode should match best or 0 if unknown - * returns: finally selected state - */ -int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps) XINE_PROTECTED; - -/* adapt (maximum) output size to visible area if necessary and return pixel - * aspect and real frame rate if available - */ -void xine_tvmode_size (xine_t *self, int *width, int *height, - double *pixelratio, double *fps) XINE_PROTECTED; - -/* restore old TV and X settings and close nvtvd connection */ -void xine_tvmode_exit (xine_t *self) XINE_PROTECTED; - -#endif - #ifdef __cplusplus } #endif |