summaryrefslogtreecommitdiff
path: root/src/xine-engine/video_out.c
diff options
context:
space:
mode:
authoruid32519 <none@none>2001-07-04 20:32:29 +0000
committeruid32519 <none@none>2001-07-04 20:32:29 +0000
commit733a94dbd41f79c4a1b7e137bd8e032eebfaf043 (patch)
tree676ede9ee4bb316870ca7cba71aafab4a8dad864 /src/xine-engine/video_out.c
parent6140dca53aa5cc3d72b851f66360eecee72430e4 (diff)
downloadxine-lib-733a94dbd41f79c4a1b7e137bd8e032eebfaf043.tar.gz
xine-lib-733a94dbd41f79c4a1b7e137bd8e032eebfaf043.tar.bz2
latest overlay patches from James, simple overlays should work
CVS patchset: 254 CVS date: 2001/07/04 20:32:29
Diffstat (limited to 'src/xine-engine/video_out.c')
-rw-r--r--src/xine-engine/video_out.c8
1 files changed, 5 insertions, 3 deletions
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;