Mercurial > mplayer.hg

comparison libvo/vo_sdl.c @ 2182:a7e539b11ba0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix non-X11 build
author atmos4
date Sat, 13 Oct 2001 13:38:59 +0000
parents b2d628ee2383
children 48f0ac1e9d13
comparison
equal deleted inserted replaced
2181:d90f8fc7ead6 2182:a7e539b11ba0
563 mode = priv->fullmode = findArrayEnd(priv->fullmodes) - 1; 563 mode = priv->fullmode = findArrayEnd(priv->fullmodes) - 1;
564 564
565 /* calculate new video size/aspect */ 565 /* calculate new video size/aspect */
566 if(!priv->mode) { 566 if(!priv->mode) {
567 if(priv->fulltype&FS) { 567 if(priv->fulltype&FS) {
568 #ifdef HAVE_X11
568 aspect(&newwidth, &newheight, priv->XWidth ? priv->XWidth : priv->dstwidth, priv->XHeight ? priv->XHeight : priv->dstheight); 569 aspect(&newwidth, &newheight, priv->XWidth ? priv->XWidth : priv->dstwidth, priv->XHeight ? priv->XHeight : priv->dstheight);
570 #else
571 aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
572 #endif
569 } else 573 } else
570 if(priv->fulltype&VM) { 574 if(priv->fulltype&VM) {
575 #ifdef HAVE_X11
571 aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth))); 576 aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth)));
577 #else
578 aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
579 #endif
572 } else { 580 } else {
573 aspect(&newwidth, &newheight, priv->fullmodes[mode]->w, priv->fullmodes[mode]->h); 581 aspect(&newwidth, &newheight, priv->fullmodes[mode]->w, priv->fullmodes[mode]->h);
574 } 582 }
575 } 583 }
576 584
1083 } 1091 }
1084 } 1092 }
1085 1093
1086 else if ( keypressed == SDLK_n ) { 1094 else if ( keypressed == SDLK_n ) {
1087 int newwidth = priv->dstwidth, newheight = priv->dstheight; 1095 int newwidth = priv->dstwidth, newheight = priv->dstheight;
1096 #ifdef HAVE_X11
1088 aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth))); 1097 aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth)));
1098 #else
1099 aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
1100 #endif
1089 if (priv->surface->w != newwidth || priv->surface->h != newheight) { 1101 if (priv->surface->w != newwidth || priv->surface->h != newheight) {
1090 priv->surface = SDL_SetVideoMode(newwidth, newheight, priv->bpp, priv->sdlflags); 1102 priv->surface = SDL_SetVideoMode(newwidth, newheight, priv->bpp, priv->sdlflags);
1091 priv->windowsize.w = priv->surface->w; 1103 priv->windowsize.w = priv->surface->w;
1092 priv->windowsize.h = priv->surface->h; 1104 priv->windowsize.h = priv->surface->h;
1093 if(verbose > 1) printf("SDL: Normal size\n"); 1105 if(verbose > 1) printf("SDL: Normal size\n");