summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am3
-rw-r--r--include/xine.h26
-rw-r--r--include/xine/audio_decoder.h2
-rw-r--r--include/xine/audio_out.h2
-rw-r--r--include/xine/buffer.h1
-rw-r--r--include/xine/demux.h2
-rw-r--r--include/xine/input_plugin.h2
-rw-r--r--include/xine/post.h2
-rw-r--r--include/xine/spu_decoder.h2
-rw-r--r--include/xine/vdr.h3
-rw-r--r--include/xine/video_decoder.h2
-rw-r--r--include/xine/video_out.h2
-rw-r--r--include/xine/xine_internal.h1
13 files changed, 39 insertions, 11 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 7f569f498..aa26094a6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -46,7 +46,8 @@ nobase_include_HEADERS = xine.h \
xine/xmllexer.h \
xine/xmlparser.h
-noinst_HEADERS = config.h configure.h
+noinst_HEADERS = config.h
+nodist_noinst_HEADERS = configure.h
nodist_include_HEADERS = $(inttypes_h)
diff --git a/include/xine.h b/include/xine.h
index 17b8cfbf6..035f4ef7f 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -401,14 +401,38 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED;
* image format can be YUV 4:2:0 or 4:2:2
* will copy the image data into memory that <img> points to
* (interleaved for yuv 4:2:2 or planary for 4:2:0)
+ *
+ * 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.
*
- * returns 1 on success, 0 failure.
+ * all functions return 1 on success, 0 failure.
*/
int xine_get_current_frame (xine_stream_t *stream,
int *width, int *height,
int *ratio_code, int *format,
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 */
#define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y')
#define XINE_IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y')
diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h
index 49194e290..05d29823d 100644
--- a/include/xine/audio_decoder.h
+++ b/include/xine/audio_decoder.h
@@ -61,7 +61,7 @@ struct audio_decoder_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index b720110bf..25e5deb68 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -258,7 +258,7 @@ struct audio_driver_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index 9401f8852..a53b99db3 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -264,6 +264,7 @@ extern "C" {
#define BUF_AUDIO_SMACKER 0x033B0000
#define BUF_AUDIO_FLVADPCM 0x033C0000
#define BUF_AUDIO_WAVPACK 0x033D0000
+#define BUF_AUDIO_MP3ADU 0x033E0000
/*@}*/
/**
diff --git a/include/xine/demux.h b/include/xine/demux.h
index 35a5c9a82..72808f76d 100644
--- a/include/xine/demux.h
+++ b/include/xine/demux.h
@@ -66,7 +66,7 @@ struct demux_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/**
* @brief MIME types supported for this plugin
diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index e434dc5a8..95fc65c4e 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -60,7 +60,7 @@ struct input_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* ls function, optional: may be NULL
diff --git a/include/xine/post.h b/include/xine/post.h
index 10844d03a..a8f721a9a 100644
--- a/include/xine/post.h
+++ b/include/xine/post.h
@@ -65,7 +65,7 @@ struct post_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h
index d36b5b691..1833a22b4 100644
--- a/include/xine/spu_decoder.h
+++ b/include/xine/spu_decoder.h
@@ -62,7 +62,7 @@ struct spu_decoder_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/vdr.h b/include/xine/vdr.h
index 5102d7f77..a2a3e800f 100644
--- a/include/xine/vdr.h
+++ b/include/xine/vdr.h
@@ -22,7 +22,7 @@
#define __VDR_H
-#define XINE_VDR_VERSION 801
+#define XINE_VDR_VERSION 802
enum funcs
@@ -270,6 +270,7 @@ typedef struct __attribute__((packed)) data_clear_s
int32_t n;
int8_t s;
+ uint8_t i;
}
data_clear_t;
diff --git a/include/xine/video_decoder.h b/include/xine/video_decoder.h
index 916cfe68b..022c2af33 100644
--- a/include/xine/video_decoder.h
+++ b/include/xine/video_decoder.h
@@ -62,7 +62,7 @@ struct video_decoder_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/video_out.h b/include/xine/video_out.h
index 02eff3cac..0bdd0f557 100644
--- a/include/xine/video_out.h
+++ b/include/xine/video_out.h
@@ -403,7 +403,7 @@ struct video_driver_class_s {
/**
* @brief Optional non-standard catalog to use with dgettext() for description.
*/
- const char *textdomain;
+ const char *text_domain;
/*
* free all class-related resources
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index 20bf6a9c8..805c569a3 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -325,6 +325,7 @@ struct xine_stream_s {
/* demux thread stuff */
pthread_t demux_thread;
pthread_mutex_t demux_lock;
+ pthread_cond_t demux_resume;
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 08:46:14 +0000