summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Lampard <mlampard@users.sourceforge.net>2001-10-24 18:39:31 +0000
committerMike Lampard <mlampard@users.sourceforge.net>2001-10-24 18:39:31 +0000
commit9645859b85a208a89958fb95feb1abf28137a063 (patch)
tree0529d7e8b965b59ec75bf94c26f23aeff0f7dde4 /src
parent9b027924db752793982cfe4793b7c28538aafd7b (diff)
downloadxine-lib-9645859b85a208a89958fb95feb1abf28137a063.tar.gz
xine-lib-9645859b85a208a89958fb95feb1abf28137a063.tar.bz2
attempt to sort out overlay init once and for all...
CVS patchset: 878 CVS date: 2001/10/24 18:39:31
Diffstat (limited to 'src')
-rw-r--r--src/dxr3/overlay.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/dxr3/overlay.c b/src/dxr3/overlay.c
index e5cc04c48..88d8bd8d9 100644
--- a/src/dxr3/overlay.c
+++ b/src/dxr3/overlay.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: overlay.c,v 1.3 2001/10/24 16:09:20 mlampard Exp $
+ * $Id: overlay.c,v 1.4 2001/10/24 18:39:31 mlampard Exp $
*
* Overlay support routines for video_out_dxr3
*/
@@ -237,23 +237,13 @@ int dxr3_overlay_set_signalmode(dxr3_overlay_t *this,int mode)
void dxr3_overlay_buggy_preinit(dxr3_overlay_t *this, int fd)
{
-/* int mode = 0; */
+ int mode = 0;
/* TODO: catch errors */
this->fd_control = fd;
- dxr3_overlay_set_mode(this,EM8300_OVERLAY_MODE_OFF );
dxr3_overlay_set_screen(this);
- dxr3_overlay_set_window(this, 1,1, 320,240);
- dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY);
+ dxr3_overlay_set_window(this, 1,1, 2,2);
dxr3_overlay_set_keycolor(this);
dxr3_overlay_set_attributes(this);
-
-/* No longer required with em8300 ver 8.2+ ???
- * ioctl(this->fd_control, EM8300_IOCTL_SET_VIDEOMODE, &mode);
- * dxr3_overlay_set_screen(this);
- * dxr3_overlay_set_window(this, 1,1, 320,240);
- * dxr3_overlay_set_attributes(this);
- * dxr3_overlay_set_keycolor(this);
- * dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY);
-*/
+ dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY);
}