Mercurial > mplayer.hg
changeset 951:9fb176abc1a7
Some fixups for SDL/aalib.
| author | atmosfear |
|---|---|
| date | Sat, 02 Jun 2001 22:12:28 +0000 |
| parents | de1e10c4da3c |
| children | 18cf424995cd |
| files | libvo/vo_sdl.c |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_sdl.c Sat Jun 02 20:48:16 2001 +0000 +++ b/libvo/vo_sdl.c Sat Jun 02 22:12:28 2001 +0000 @@ -194,6 +194,9 @@ /* fullscreen behaviour; see init */ int fulltype; + /* is X running (0/1) */ + int X; + #ifdef HAVE_X11 /* X11 Resolution */ int XWidth, XHeight; @@ -638,6 +641,7 @@ XScreen = DefaultScreen(XDisplay); priv->XWidth = DisplayWidth(XDisplay, XScreen); priv->XHeight = DisplayHeight(XDisplay, XScreen); + priv->X = 1; if(verbose) printf("SDL: X11 Resolution %ix%i\n", priv->XWidth, priv->XHeight); saver_off(XDisplay); XCloseDisplay(XDisplay); @@ -707,7 +711,7 @@ set_fullmode(priv->fullmode); } else { - if((strcmp(priv->driver, "x11") == 0) || (strcmp(priv->driver, "aalib") == 0)) { + if((strcmp(priv->driver, "x11") == 0) || ((strcmp(priv->driver, "aalib") == 0) && priv->X)) { if(verbose) printf("SDL: setting windowed mode\n"); #ifdef HAVE_X11 priv->surface = SDL_SetVideoMode (res.w, res.h, priv->bpp, priv->sdlflags); @@ -716,11 +720,11 @@ #endif } else { - if(verbose) printf("SDL: setting nonzoomed fullscreen with modeswitching\n"); - printf("SDL: Info - please use -zoom switch to scale video\n"); + if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n"); + printf("SDL: Info - please use -vm switch instead if you don't want scaled video\n"); priv->surface = NULL; - priv->fulltype = VM; + priv->fulltype = ZOOM; set_fullmode(priv->fullmode); } }