[Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.99,1.100

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv17519/libvo

Modified Files:
	vo_vesa.c 
Log Message:
neomagic tv out support throught vesa vbe, patch by Rudolf Marek

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vo_vesa.c	24 Dec 2003 22:00:50 -0000	1.99
+++ vo_vesa.c	25 Jun 2004 17:29:18 -0000	1.100
@@ -123,6 +123,10 @@
 static vidix_grkey_t gr_key;
 #endif
 
+/* Neomagic TV out */
+static int neomagic_tvout = 0;
+static int neomagic_tvnorm = NEO_PAL;
+ 
 #define HAS_DGA()  (win.idx == -1)
 #define MOVIE_MODE (MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS)
 #define FRAME_MODE (MODE_WIN_RELOCATABLE | MODE_WIN_WRITEABLE)
@@ -444,6 +448,10 @@
    else
    if(strcmp(sd,"dga") == 0)   { flags &= ~(SUBDEV_NODGA); flags |= SUBDEV_FORCEDGA; }
    else
+   if(strcmp(sd,"neotv_pal") == 0)   { neomagic_tvout = 1; neomagic_tvnorm = NEO_PAL; }
+   else
+   if(strcmp(sd,"neotv_ntsc") == 0)   { neomagic_tvout = 1; neomagic_tvnorm = NEO_NTSC; }
+   else
    if(memcmp(sd,"lvo:",4) == 0) lvo_name = &sd[4]; /* lvo_name will be valid within init() */
 #ifdef CONFIG_VIDIX
    else
@@ -927,6 +935,15 @@
 			return -1;
 		}
 		
+		if (neomagic_tvout) {
+		    err = vbeSetTV(video_mode,neomagic_tvnorm);
+		    if (err!=0x4f) {
+		    printf("vo_vesa: Sorry unsupported mode, try -x 640 -zoom\n");
+		    }
+		    else {
+		    printf("vo_vesa: Oh you really have picture on TV!\n");
+		    } 
+		}
 		/* Now we are in video mode!!!*/
 		/* Below 'return -1' is impossible */
 		if(verbose)