diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-02-12 18:19:00 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-02-12 18:19:00 +0000 |
| commit | ca2ac6410b4f348e0aaba232eb089d78bc0fbdfa (patch) | |
| tree | c2fa6089615fa64fe11544843c8f94915c512fc6 /src/xine-engine/osd.h | |
| parent | c2637f6fbd4a06ff0c433eccb705f52b35d46043 (diff) | |
| download | xine-lib-ca2ac6410b4f348e0aaba232eb089d78bc0fbdfa.tar.gz xine-lib-ca2ac6410b4f348e0aaba232eb089d78bc0fbdfa.tar.bz2 | |
big commit of the new ticket system to protect the rewiring and more
(as discussed on xine-devel, slightly improved to block acquires from
different threads between atomic revoke and issue)
* xine_ticket_t is declared in xine_internal.h and implemented in xine.c
* the ticket is acquired for (hopefully) all port operations
(no modifications to decoders needed, decoder loop does this)
* the ticket is revoked on pausing and on rewiring
* OSD does not store the port pointer any more (which was very dangerous,
since the pointer can change on rewire)
CVS patchset: 6137
CVS date: 2004/02/12 18:19:00
Diffstat (limited to 'src/xine-engine/osd.h')
| -rw-r--r-- | src/xine-engine/osd.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index f1b884550..fc1a31bca 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * OSD stuff (text and graphic primitives) - * $Id: osd.h,v 1.23 2003/12/09 00:02:36 f1rmb Exp $ + * $Id: osd.h,v 1.24 2004/02/12 18:19:12 mroi Exp $ */ #ifndef HAVE_OSD_H @@ -215,7 +215,6 @@ struct osd_renderer_s { /* private stuff */ pthread_mutex_t osd_mutex; - video_overlay_manager_t *video_overlay; video_overlay_event_t event; osd_object_t *osds; /* instances of osd */ osd_font_t *fonts; /* loaded fonts */ @@ -228,7 +227,7 @@ struct osd_renderer_s { /* * initialize the osd rendering engine */ -osd_renderer_t *_x_osd_renderer_init( video_overlay_manager_t *video_overlay, xine_stream_t *stream ); +osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ); /* |