diff options
Diffstat (limited to 'src/xine-engine')
-rw-r--r-- | src/xine-engine/spu_decoder.c | 4 | ||||
-rw-r--r-- | src/xine-engine/spu_decoder.h | 4 | ||||
-rw-r--r-- | src/xine-engine/video_out.c | 8 | ||||
-rw-r--r-- | src/xine-engine/video_out.h | 3 |
4 files changed, 13 insertions, 6 deletions
diff --git a/src/xine-engine/spu_decoder.c b/src/xine-engine/spu_decoder.c index 0878bf06a..047f9b90d 100644 --- a/src/xine-engine/spu_decoder.c +++ b/src/xine-engine/spu_decoder.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2000-2001 the xine project * + * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001 + * * This file is part of xine, a unix video player. * * xine is free software; you can redistribute it and/or modify @@ -17,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: spu_decoder.c,v 1.3 2001/07/04 17:10:24 uid32519 Exp $ + * $Id: spu_decoder.c,v 1.4 2001/07/04 20:32:29 uid32519 Exp $ * * functions that implement spu decoding diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h index 7ece22335..267a7fbaa 100644 --- a/src/xine-engine/spu_decoder.h +++ b/src/xine-engine/spu_decoder.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2000-2001 the xine project * + * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001 + * * This file is part of xine, a unix video player. * * xine is free software; you can redistribute it and/or modify @@ -17,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: spu_decoder.h,v 1.1 2001/07/04 17:10:24 uid32519 Exp $ + * $Id: spu_decoder.h,v 1.2 2001/07/04 20:32:29 uid32519 Exp $ */ #ifndef HAVE_SPU_OUT_H #define HAVE_SPU_OUT_H diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index f778f99f3..d3b354ce6 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -1,4 +1,4 @@ - /* +/* * Copyright (C) 2000, 2001 the xine project * * This file is part of xine, a unix video player. @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.29 2001/07/04 18:12:12 uid32519 Exp $ + * $Id: video_out.c,v 1.30 2001/07/04 20:32:29 uid32519 Exp $ * */ @@ -491,12 +491,13 @@ static int vo_frame_draw (vo_frame_t *img) { static vo_overlay_t *vo_get_overlay (vo_instance_t *this) { /* FIXME: implement */ - return NULL; + return this->overlay; } static void vo_queue_overlay (vo_instance_t *this, vo_overlay_t *overlay) { /* FIXME: implement */ + this->driver->set_overlay (this->driver, overlay); } vo_instance_t *vo_new_instance (vo_driver_t *driver, metronom_t *metronom) { @@ -505,6 +506,7 @@ vo_instance_t *vo_new_instance (vo_driver_t *driver, metronom_t *metronom) { int i; this = xmalloc (sizeof (vo_instance_t)) ; + this->overlay = xmalloc (sizeof (vo_overlay_t)) ; this->driver = driver; this->metronom = metronom; diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index a4826c61f..30ffddd78 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.h,v 1.9 2001/07/04 17:10:24 uid32519 Exp $ + * $Id: video_out.h,v 1.10 2001/07/04 20:32:29 uid32519 Exp $ * * * xine version of video_out.h @@ -125,6 +125,7 @@ struct vo_instance_s { /* private stuff */ vo_driver_t *driver; + vo_overlay_t *overlay; metronom_t *metronom; img_buf_fifo_t *free_img_buf_queue; |