diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-10 19:33:05 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-10 19:33:05 +0000 |
| commit | 9125c00c6d1242b911cbf68cdd25114cd9972c8f (patch) | |
| tree | 313071ce6aac40d9fb35b12d65eba2bbf84927dc /src/xine-engine | |
| parent | cec0ffca0dfba3f6807e63636ea2c12cec982db9 (diff) | |
| download | xine-lib-9125c00c6d1242b911cbf68cdd25114cd9972c8f.tar.gz xine-lib-9125c00c6d1242b911cbf68cdd25114cd9972c8f.tar.bz2 | |
subtitle patches (esp. for XShm) from James
CVS patchset: 263
CVS date: 2001/07/10 19:33:05
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/video_out.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index f573670ac..2bcb5d4ea 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -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.32 2001/07/09 16:13:12 guenter Exp $ + * $Id: video_out.c,v 1.33 2001/07/10 19:33:05 guenter Exp $ * */ @@ -276,21 +276,21 @@ static void *video_out_loop (void *this_gen) { xprintf (VERBOSE|VIDEO, "video_out : passing to video driver, image with pts = %d\n", pts); + overlay=this->first_overlay; while (overlay) { if(overlay->state==OVERLAY_SHOWING) { - this->driver->overlay_blend (img,overlay); + if (this->driver->overlay_blend) this->driver->overlay_blend (this->driver, img, overlay); } overlay=overlay->next; } + this->driver->display_frame (this->driver, img); -/* Control Overlay SHOW/HIDE based on PTS */ -/* FIXME: Not implemented: These all need to be put to FREE state if the slider gets moved or STOP is pressed. */ + /* Control Overlay SHOW/HIDE based on PTS */ overlay=this->first_overlay; count=1; while (overlay) { -// count++; switch(overlay->state) { case OVERLAY_FREE: break; diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 2d825462d..f73f1a707 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.11 2001/07/08 18:15:54 guenter Exp $ + * $Id: video_out.h,v 1.12 2001/07/10 19:33:05 guenter Exp $ * * * xine version of video_out.h @@ -218,9 +218,7 @@ struct vo_driver_s { void (*display_frame) (vo_driver_t *this, vo_frame_t *vo_img); /* overlay functions */ - void (*overlay_blend) (vo_frame_t *vo_img, vo_overlay_t *overlay); - void (*set_overlay) (vo_driver_t *this, vo_overlay_t *overlay); - + void (*overlay_blend) (vo_driver_t *this, vo_frame_t *vo_img, vo_overlay_t *overlay); /* * these can be used by the gui directly: |