diff options
author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-03 15:31:51 +0000 |
---|---|---|
committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-03 15:31:51 +0000 |
commit | 4d053a65c0adac026c7673d34ca6410002caf159 (patch) | |
tree | 216229d49b70ab433beda628e81fdd6b7075eb8d /libvo/vo_xv.c | |
parent | 5a2e880711e69b60d53f2b57909361a88cca8178 (diff) | |
download | mpv-4d053a65c0adac026c7673d34ca6410002caf159.tar.bz2 mpv-4d053a65c0adac026c7673d34ca6410002caf159.tar.xz |
Simplified aspect() for the loss of some functionality to get ansi compatibility.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2056 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 62560c0be9..840b227a87 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -121,7 +121,6 @@ static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsi static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { // int screen; -// int myx,myy; char *hello = (title == NULL) ? "Xv render" : title; // char *name = ":0.0"; XSizeHints hint; @@ -169,9 +168,8 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t */ { - rect_t newres = aspect(d_width,d_height,vo_screenwidth,vo_screenheight); - dwidth=d_width=newres.w; dheight=d_height=newres.h; - //myx=newres.x; myy=newres.y; + aspect(&d_width,&d_height,vo_screenwidth,vo_screenheight); + dwidth=d_width; dheight=d_height; } #endif @@ -286,12 +284,12 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t if ( mFullscreen ) { - drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; /* =myx; */ + drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; drwcX+=drwX; - drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; /* =myy; */ + drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; drwcY+=drwY; - drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); /* =dwidth */ - drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); /* =dheight */ + drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); + drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); } #ifdef HAVE_NEW_GUI |