summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/xine/audio_out.h4
-rw-r--r--include/xine/video_out.h4
-rw-r--r--include/xine/xine_internal.h17
3 files changed, 23 insertions, 2 deletions
diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index daeeb75ea..dd7d16a0d 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -341,7 +341,9 @@ int _x_ao_channels2mode( int channels ) XINE_PROTECTED;
#define AO_PROP_AMP_MUTE 18 /* amplifier mute */
#define AO_PROP_NUM_STREAMS 19 /* read-only */
#define AO_PROP_CLOCK_SPEED 20 /* inform audio_out that speed has changed */
-#define AO_NUM_PROPERTIES 21
+#define AO_PROP_BUFS_TOTAL 21 /* read-only */
+#define AO_PROP_BUFS_FREE 22 /* read-only */
+#define AO_NUM_PROPERTIES 23
/* audio device control ops */
#define AO_CTRL_PLAY_PAUSE 0
diff --git a/include/xine/video_out.h b/include/xine/video_out.h
index 201d0149f..9d5380884 100644
--- a/include/xine/video_out.h
+++ b/include/xine/video_out.h
@@ -261,7 +261,9 @@ struct xine_video_port_s {
#define VO_PROP_OUTPUT_YOFFSET 22 /* read-only */
#define VO_PROP_SHARPNESS 24
#define VO_PROP_NOISE_REDUCTION 25
-#define VO_NUM_PROPERTIES 26
+#define VO_PROP_BUFS_TOTAL 26 /* read-only */
+#define VO_PROP_BUFS_FREE 27 /* read-only */
+#define VO_NUM_PROPERTIES 28
/* number of colors in the overlay palette. Currently limited to 256
at most, because some alphablend functions use an 8-bit index into
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index ac8e6cabf..7064539ab 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -361,11 +361,28 @@ struct xine_stream_s {
* which is a valid stream that does not want to be addressed. */
#define XINE_ANON_STREAM ((xine_stream_t *)-1)
+typedef struct
+{
+ int total;
+ int ready;
+ int avail;
+}
+xine_query_buffers_data_t;
+
+typedef struct
+{
+ xine_query_buffers_data_t vi;
+ xine_query_buffers_data_t ai;
+ xine_query_buffers_data_t vo;
+ xine_query_buffers_data_t ao;
+}
+xine_query_buffers_t;
/*
* private function prototypes:
*/
+int _x_query_buffers(xine_stream_t *stream, xine_query_buffers_t *query) XINE_PROTECTED;
int _x_query_buffer_usage(xine_stream_t *stream, int *num_video_buffers, int *num_audio_buffers, int *num_video_frames, int *num_audio_frames) XINE_PROTECTED;
int _x_lock_port_rewiring(xine_t *xine, int ms_to_time_out) XINE_PROTECTED;
void _x_unlock_port_rewiring(xine_t *xine) XINE_PROTECTED;