diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-08 17:11:27 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-05-08 17:11:27 +0100 |
| commit | 92d72104e3cd37e7470a41a65b230297592f1331 (patch) | |
| tree | 5b411206574417f441e169d86f93db2a136dd027 /src/xine-engine/xine_internal.h | |
| parent | efbef33b133ee728285f6bfb5f5014041dc991d4 (diff) | |
| parent | 213eac661441a9c482f280c5cb5ec63240c8d29e (diff) | |
| download | xine-lib-92d72104e3cd37e7470a41a65b230297592f1331.tar.gz xine-lib-92d72104e3cd37e7470a41a65b230297592f1331.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/xine-engine/xine_internal.h')
| -rw-r--r-- | src/xine-engine/xine_internal.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 4231b33ca..dfce36cae 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -161,6 +161,15 @@ struct xine_ticket_s { * revocation or by other threads acquiring tickets */ void (*revoke)(xine_ticket_t *self, int atomic); + /* behaves like acquire() but doesn't block the calling thread; when + * the thread would have been blocked, 0 is returned otherwise 1 + * this function acquires a ticket even if ticket revocation is active */ + int (*acquire_nonblocking)(xine_ticket_t *self, int irrevocable); + + /* behaves like release() but doesn't block the calling thread; should + * be used in combination with acquire_nonblocking() */ + void (*release_nonblocking)(xine_ticket_t *self, int irrevocable); + void (*dispose)(xine_ticket_t *self); pthread_mutex_t lock; @@ -360,6 +369,8 @@ struct xine_stream_s { * private function prototypes: */ +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; + void _x_handle_stream_end (xine_stream_t *stream, int non_user) XINE_PROTECTED; /* report message to UI. usually these are async errors */ |