Mercurial > mplayer.hg
changeset 208:ae0f909ccc7c
Adds code to deal with vidmode selection. -- mgraffam
| author | mgraffam |
|---|---|
| date | Sat, 24 Mar 2001 21:36:15 +0000 |
| parents | 8626c23f4a47 |
| children | 26d2d4d3331a |
| files | mplayer.c |
| diffstat | 1 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Sat Mar 24 21:34:08 2001 +0000 +++ b/mplayer.c Sat Mar 24 21:36:15 2001 +0000 @@ -399,6 +399,9 @@ // screen info: char* video_driver=NULL; //"mga"; // default int fullscreen=0; +#ifdef HAVE_XF86VM +int vidmode=0; +#endif int screen_size_x=SCREEN_SIZE_X; int screen_size_y=SCREEN_SIZE_Y; int screen_size_xy=0; @@ -470,6 +473,12 @@ return 0; } +#ifdef HAVE_XF86VM +if (!video_driver) + vidmode=0; +else if (strcmp(video_driver,"x11")) + vidmode=0; +#endif if(!filename){ if(vcd_track) filename="/dev/cdrom"; @@ -1047,6 +1056,12 @@ } #endif +#ifdef HAVE_XF86VM + if (vidmode) { + if ( screen_size_x == SCREEN_SIZE_X ) screen_size_x = 0; + if ( screen_size_y == SCREEN_SIZE_Y ) screen_size_y = 0; + } else +#endif if(screen_size_xy>0){ if(screen_size_xy<=8){ screen_size_x=screen_size_xy*movie_size_x; @@ -1059,6 +1074,7 @@ if(screen_size_x<=8) screen_size_x*=movie_size_x; if(screen_size_y<=8) screen_size_y*=movie_size_y; } + if(verbose) printf("Destination size: %d x %d out_fmt=%0X\n", screen_size_x,screen_size_y,out_fmt);