diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 52 | ||||
| -rw-r--r-- | include/xine/Makefile.am | 11 | ||||
| -rw-r--r-- | include/xine/buffer.h | 1 | ||||
| -rw-r--r-- | include/xine/configfile.h | 35 | ||||
| -rw-r--r-- | include/xine/plugin_catalog.h | 1 | ||||
| -rw-r--r-- | include/xine/video_out.h | 9 | ||||
| -rw-r--r-- | include/xine/xineutils.h | 6 |
7 files changed, 93 insertions, 22 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 1493a33f8..7f569f498 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,17 +1,53 @@ -SUBDIRS = xine -#EXTRA_DIST = xine.h.in +EXTRA_DIST = xine/version.h.in if GENERATED_INTTYPES_H inttypes_h = inttypes.h endif -include_HEADERS = xine.h +nobase_include_HEADERS = xine.h \ + xine/alphablend.h \ + xine/array.h \ + xine/attributes.h \ + xine/audio_decoder.h \ + xine/audio_out.h \ + xine/broadcaster.h \ + xine/buffer.h \ + xine/compat.h \ + xine/configfile.h \ + xine/demux.h \ + xine/info_helper.h \ + xine/input_plugin.h \ + xine/io_helper.h \ + xine/list.h \ + xine/metronom.h \ + xine/os_types.h \ + xine/osd.h \ + xine/plugin_catalog.h \ + xine/pool.h \ + xine/post.h \ + xine/refcounter.h \ + xine/resample.h \ + xine/ring_buffer.h \ + xine/scratch.h \ + xine/sorted_array.h \ + xine/spu.h \ + xine/spu_decoder.h \ + xine/vdr.h \ + xine/version.h \ + xine/video_decoder.h \ + xine/video_out.h \ + xine/video_overlay.h \ + xine/vo_scale.h \ + xine/xine_buffer.h \ + xine/xine_internal.h \ + xine/xine_plugin.h \ + xine/xineintl.h \ + xine/xineutils.h \ + xine/xmllexer.h \ + xine/xmlparser.h noinst_HEADERS = config.h configure.h -CONFIG_CLEAN_FILES = $(inttypes_h) +nodist_include_HEADERS = $(inttypes_h) -install-data-local: install-includeHEADERS -if GENERATED_INTTYPES_H - $(INSTALL) inttypes.h $(DESTDIR)$(includedir) -endif +CONFIG_CLEAN_FILES = $(inttypes_h) diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am deleted file mode 100644 index cc086dfaf..000000000 --- a/include/xine/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = version.h.in - -xineincludedir = $(includedir)/xine -xineinclude_HEADERS = version.h buffer.h metronom.h configfile.h vo_scale.h \ - audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ - video_overlay.h osd.h spu.h scratch.h xine_plugin.h xineintl.h \ - plugin_catalog.h audio_decoder.h video_decoder.h post.h \ - io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ - demux.h input_plugin.h attributes.h compat.h xine_buffer.h \ - xineutils.h xmllexer.h xmlparser.h list.h array.h sorted_array.h \ - pool.h ring_buffer.h os_types.h vdr.h diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 4af718a1b..9401f8852 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -192,6 +192,7 @@ extern "C" { #define BUF_VIDEO_VP6F 0x02630000 #define BUF_VIDEO_THEORA_RAW 0x02640000 #define BUF_VIDEO_VC1 0x02650000 +#define BUF_VIDEO_VMNC 0x02660000 /*@}*/ /** diff --git a/include/xine/configfile.h b/include/xine/configfile.h index 724a75245..e8f2c070e 100644 --- a/include/xine/configfile.h +++ b/include/xine/configfile.h @@ -148,6 +148,8 @@ struct config_values_s { xine_config_cb_t changed_cb, void *cb_data); + void (*register_entry) (config_values_t *self, cfg_entry_t* entry); + /** convenience function to update range, enum, num and bool values */ void (*update_num) (config_values_t *self, const char *key, int value); @@ -167,7 +169,7 @@ struct config_values_s { cfg_entry_t* (*lookup_entry) (config_values_t *self, const char *key); /** - * unregister callback function + * unregister entry callback function */ void (*unregister_callback) (config_values_t *self, const char *key); @@ -176,12 +178,41 @@ struct config_values_s { */ void (*dispose) (config_values_t *self); - /* + /** + * callback called when a new config entry is registered + */ + void (*set_new_entry_callback) (config_values_t *self, xine_config_cb_t new_entry_cb, void *cb_data); + + /** + * unregister the callback + */ + void (*unset_new_entry_callback) (config_values_t *self); + + /** + * serialize a config entry. + * return a base64 null terminated string. + */ + char* (*get_serialized_entry) (config_values_t *self, const char *key); + + /** + * deserialize a config entry. + * value is a base 64 encoded string + * return the key of the serialized entry + */ + char* (*register_serialized_entry) (config_values_t *self, const char *value); + + /** * config values are stored here: */ cfg_entry_t *first, *last, *cur; /** + * new entry callback + */ + xine_config_cb_t new_entry_cb; + void *new_entry_cbdata; + + /** * mutex for modification to the config */ pthread_mutex_t config_lock; diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h index be02c3649..bacdfa56c 100644 --- a/include/xine/plugin_catalog.h +++ b/include/xine/plugin_catalog.h @@ -45,6 +45,7 @@ typedef struct { plugin_file_t *file; plugin_info_t *info; void *plugin_class; + xine_list_t *config_entry_list; int ref; /* count intances of plugins */ int priority; } plugin_node_t ; diff --git a/include/xine/video_out.h b/include/xine/video_out.h index f34380af1..02eff3cac 100644 --- a/include/xine/video_out.h +++ b/include/xine/video_out.h @@ -282,7 +282,14 @@ struct xine_video_port_s { #define VO_CAP_UNSCALED_OVERLAY 0x00000010 /* driver can blend overlay at output resolution */ #define VO_CAP_CROP 0x00000020 /* driver can crop */ #define VO_CAP_XXMC 0x00000040 /* driver can use extended XvMC */ - +#define VO_CAP_HUE 0x00010000 +#define VO_CAP_SATURATION 0x00020000 +#define VO_CAP_CONTRAST 0x00040000 +#define VO_CAP_BRIGHTNESS 0x00080000 +#define VO_CAP_COLORKEY 0x00100000 +#define VO_CAP_AUTOPAINT_COLORKEY 0x00200000 +#define VO_CAP_ZOOM_X 0x00400000 +#define VO_CAP_ZOOM_Y 0x00800000 /* * vo_driver_s contains the functions every display driver diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index 0ab6fdc07..8ef64b143 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -942,6 +942,12 @@ const char *xine_guess_spu_encoding(void) XINE_PROTECTED; */ int xine_monotonic_clock(struct timeval *tv, struct timezone *tz) XINE_PROTECTED; +/** + * Unknown FourCC reporting functions + */ +void _x_report_video_fourcc (xine_t *, const char *module, uint32_t) XINE_PROTECTED; +void _x_report_audio_format_tag (xine_t *, const char *module, uint32_t) XINE_PROTECTED; + /* don't harm following code */ #ifdef extern # undef extern |