[MPlayer-cvslog] CVS: main/libvo mga_common.c, 1.60, 1.61 vesa_lvo.c, 1.18, 1.19 vo_aa.c, 1.45, 1.46 vo_bl.c, 1.9, 1.10 vo_caca.c, 1.1, 1.2 vo_cvidix.c, 1.13, 1.14 vo_dfbmga.c, 1.26, 1.27 vo_dga.c, 1.71, 1.72 vo_directfb2.c, 1.17, 1.18 vo_dxr3.c, 1.123, 1.124 vo_fbdev.c, 1.90, 1.91 vo_fbdev2.c, 1.5, 1.6 vo_gif89a.c, 1.12, 1.13 vo_gl.c, 1.67, 1.68 vo_jpeg.c, 1.27, 1.28 vo_md5sum.c, 1.4, 1.5 vo_mga.c, 1.38, 1.39 vo_mpegpes.c, 1.40, 1.41 vo_null.c, 1.12, 1.13 vo_png.c, 1.25, 1.26 vo_pnm.c, 1.7, 1.8 vo_sdl.c, 1.120, 1.121 vo_svga.c, 1.77, 1.78 vo_syncfb.c, 1.14, 1.15 vo_tdfx_vid.c, 1.4, 1.5 vo_tga.c, 1.2, 1.3 vo_vesa.c, 1.104, 1.105 vo_winvidix.c, 1.5, 1.6 vo_x11.c, 1.141, 1.142 vo_xmga.c, 1.91, 1.92 vo_xover.c, 1.11, 1.12 vo_xv.c, 1.164, 1.165 vo_xvidix.c, 1.71, 1.72 vo_xvmc.c, 1.19, 1.20 vo_yuv4mpeg.c, 1.21, 1.22 vo_zr.c, 1.30, 1.31
Jindrich Makovicka CVS
syncmail at mplayerhq.hu
Mon Apr 18 17:52:42 CEST 2005
- Previous message: [MPlayer-cvslog] CVS: main/libmpcodecs vd.c, 1.82, 1.83 vd_zrmjpeg.c, 1.2, 1.3 ve_divx4.c, 1.17, 1.18 ve_libdv.c, 1.12, 1.13 ve_nuv.c, 1.6, 1.7 ve_qtvideo.c, 1.13, 1.14 ve_vfw.c, 1.18, 1.19 vf_flip.c, 1.12, 1.13 vf_vo.c, 1.24, 1.25
- Next message: [MPlayer-cvslog] CVS: main/libvo mga_common.c, 1.60, 1.61 vesa_lvo.c, 1.18, 1.19 vo_aa.c, 1.45, 1.46 vo_bl.c, 1.9, 1.10 vo_caca.c, 1.1, 1.2 vo_cvidix.c, 1.13, 1.14 vo_dfbmga.c, 1.26, 1.27 vo_dga.c, 1.71, 1.72 vo_directfb2.c, 1.17, 1.18 vo_dxr3.c, 1.123, 1.124 vo_fbdev.c, 1.90, 1.91 vo_fbdev2.c, 1.5, 1.6 vo_gif89a.c, 1.12, 1.13 vo_gl.c, 1.67, 1.68 vo_jpeg.c, 1.27, 1.28 vo_md5sum.c, 1.4, 1.5 vo_mga.c, 1.38, 1.39 vo_mpegpes.c, 1.40, 1.41 vo_null.c, 1.12, 1.13 vo_png.c, 1.25, 1.26 vo_pnm.c, 1.7, 1.8 vo_sdl.c, 1.120, 1.121 vo_svga.c, 1.77, 1.78 vo_syncfb.c, 1.14, 1.15 vo_tdfx_vid.c, 1.4, 1.5 vo_tga.c, 1.2, 1.3 vo_vesa.c, 1.104, 1.105 vo_winvidix.c, 1.5, 1.6 vo_x11.c, 1.141, 1.142 vo_xmga.c, 1.91, 1.92 vo_xover.c, 1.11, 1.12 vo_xv.c, 1.164, 1.165 vo_xvidix.c, 1.71, 1.72 vo_xvmc.c, 1.19, 1.20 vo_yuv4mpeg.c, 1.21, 1.22 vo_zr.c, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
CVS change done by Jindrich Makovicka CVS
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv29755/libvo
Modified Files:
mga_common.c vesa_lvo.c vo_aa.c vo_bl.c vo_caca.c vo_cvidix.c
vo_dfbmga.c vo_dga.c vo_directfb2.c vo_dxr3.c vo_fbdev.c
vo_fbdev2.c vo_gif89a.c vo_gl.c vo_jpeg.c vo_md5sum.c vo_mga.c
vo_mpegpes.c vo_null.c vo_png.c vo_pnm.c vo_sdl.c vo_svga.c
vo_syncfb.c vo_tdfx_vid.c vo_tga.c vo_vesa.c vo_winvidix.c
vo_x11.c vo_xmga.c vo_xover.c vo_xv.c vo_xvidix.c vo_xvmc.c
vo_yuv4mpeg.c vo_zr.c
Log Message:
replace VO and VF numeric flags with #defined identifiers
Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mga_common.c 28 Oct 2004 01:15:52 -0000 1.60
+++ mga_common.c 18 Apr 2005 15:52:38 -0000 1.61
@@ -204,7 +204,7 @@
case IMGFMT_IYUV:
case IMGFMT_YUY2:
case IMGFMT_UYVY:
- return 3 | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
+ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_ACCEPT_STRIDE;
}
return 0;
}
Index: vesa_lvo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vesa_lvo.c 28 Oct 2004 01:15:52 -0000 1.18
+++ vesa_lvo.c 18 Apr 2005 15:52:38 -0000 1.19
@@ -27,6 +27,7 @@
#include "fastmemcpy.h"
#include "osd.h"
#include "video_out.h"
+#include "libmpcodecs/vfcap.h"
#define WIDTH_ALIGN 32 /* should be 16 for rage:422 and 32 for rage:420 */
#define NUM_FRAMES 10
@@ -289,7 +290,7 @@
uint32_t vlvo_query_info(uint32_t format)
{
if(verbose > 1) printf("vesa_lvo: query_format was called: %x (%s)\n",format,vo_format_name(format));
- return 1;
+ return VFCAP_CSP_SUPPORTED;
}
uint32_t vlvo_control(uint32_t request, void *data, ...)
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vo_aa.c 11 Mar 2005 02:09:23 -0000 1.45
+++ vo_aa.c 18 Apr 2005 15:52:38 -0000 1.46
@@ -229,7 +229,7 @@
}
static uint32_t
config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format) {
/*
* main init
Index: vo_bl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_bl.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vo_bl.c 14 Apr 2005 12:44:28 -0000 1.9
+++ vo_bl.c 18 Apr 2005 15:52:38 -0000 1.10
@@ -214,7 +214,7 @@
&udp_init, &udp_send, &udp_close } };
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
void * ptr;
Index: vo_caca.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_caca.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vo_caca.c 6 Apr 2004 00:04:48 -0000 1.1
+++ vo_caca.c 18 Apr 2005 15:52:38 -0000 1.2
@@ -137,7 +137,7 @@
}
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
image_height = height;
image_width = width;
Index: vo_cvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_cvidix.c 25 Nov 2004 17:23:13 -0000 1.13
+++ vo_cvidix.c 18 Apr 2005 15:52:38 -0000 1.14
@@ -76,7 +76,7 @@
}
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_height, uint32_t flags, char *title, uint32_t format){
- vo_fs = flags & 0x01;
+ vo_fs = flags & VOFLAG_FULLSCREEN;
if(!vo_config_count){
if(vo_screenwidth && vo_screenheight){
if(!vo_geometry)center=1;
Index: vo_dfbmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vo_dfbmga.c 7 Mar 2005 22:45:47 -0000 1.26
+++ vo_dfbmga.c 18 Apr 2005 15:52:38 -0000 1.27
@@ -547,7 +547,7 @@
static uint32_t
config( uint32_t width, uint32_t height,
uint32_t d_width, uint32_t d_height,
- uint32_t fullscreen,
+ uint32_t flags,
char *title,
uint32_t format )
{
@@ -735,7 +735,7 @@
out_height = screen_height;
aspect_save_screenres( out_width, out_height );
- aspect( &out_width, &out_height, (fullscreen & 0x01) ? A_ZOOM : A_NOZOOM );
+ aspect( &out_width, &out_height, (flags & VOFLAG_FULLSCREEN) ? A_ZOOM : A_NOZOOM );
if (in_width != out_width ||
in_height != out_height)
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_dga.c 24 Feb 2005 17:07:49 -0000 1.71
+++ vo_dga.c 18 Apr 2005 15:52:38 -0000 1.72
@@ -627,7 +627,7 @@
vo_dga_vp_width = mX;
vo_dga_vp_height = mY;
- if ((flags & 0x04) || (flags & 0x01))
+ if ((flags & VOFLAG_SWSCALE) || (flags & VOFLAG_FULLSCREEN))
{ /* -zoom or -fs */
scale_dstW = (d_width + 7) & ~7;
scale_dstH = d_height;
@@ -636,9 +636,9 @@
aspect_save_screenres(mX, mY);
aspect_save_orig(scale_srcW, scale_srcH);
aspect_save_prescale(scale_dstW, scale_dstH);
- if (flags & 0x01) /* -fs */
+ if (flags & VOFLAG_FULLSCREEN) /* -fs */
aspect(&scale_dstW, &scale_dstH, A_ZOOM);
- else if (flags & 0x04) /* -fs */
+ else if (flags & VOFLAG_SWSCALE) /* -fs */
aspect(&scale_dstW, &scale_dstH, A_NOZOOM);
mp_msg(MSGT_VO, MSGL_INFO,
"vo_dga: Aspect corrected size for SwScaler: %4d x %4d.\n",
Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vo_directfb2.c 28 Oct 2004 01:15:52 -0000 1.17
+++ vo_directfb2.c 18 Apr 2005 15:52:38 -0000 1.18
@@ -524,7 +524,7 @@
#define CONFIG_ERROR -1
static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
/*
@@ -533,10 +533,10 @@
// decode flags
- int fs = fullscreen & 0x01;
- int vm = fullscreen & 0x02;
- int zoom = fullscreen & 0x04;
- int flip = fullscreen & 0x08;
+ int fs = flags & VOFLAG_FULLSCREEN;
+ int vm = flags & VOFLAG_MODESWITCHING;
+ int zoom = flags & VOFLAG_SWSCALE;
+ int flip = flags & VOFLAG_FLIPPING;
DFBSurfaceDescription dsc;
DFBResult ret;
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- vo_dxr3.c 31 Mar 2005 22:06:34 -0000 1.123
+++ vo_dxr3.c 18 Apr 2005 15:52:38 -0000 1.124
@@ -418,7 +418,7 @@
}
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
int tmp1, tmp2, size;
em8300_register_t reg;
Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- vo_fbdev.c 3 Dec 2004 20:55:00 -0000 1.90
+++ vo_fbdev.c 18 Apr 2005 15:52:38 -0000 1.91
@@ -797,11 +797,11 @@
uint32_t format)
{
struct fb_cmap *cmap;
- int vm = flags & 0x02;
- int zoom = flags & 0x04;
+ int vm = flags & VOFLAG_MODESWITCHING;
+ int zoom = flags & VOFLAG_SWSCALE;
int vt_fd;
- fs = flags & 0x01;
+ fs = flags & VOFLAG_FULLSCREEN;
if(pre_init_err == -2)
{
Index: vo_fbdev2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_fbdev2.c 3 Dec 2004 20:55:00 -0000 1.5
+++ vo_fbdev2.c 18 Apr 2005 15:52:38 -0000 1.6
@@ -208,7 +208,7 @@
uint32_t format)
{
struct fb_cmap *cmap;
- int fs = flags & 0x01;
+ int fs = flags & VOFLAG_FULLSCREEN;
out_width = width;
out_height = height;
Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_gif89a.c 28 Jan 2004 10:03:40 -0000 1.12
+++ vo_gif89a.c 18 Apr 2005 15:52:38 -0000 1.13
@@ -165,7 +165,7 @@
}
static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
#ifdef HAVE_GIF_4
Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vo_gl.c 10 Apr 2005 13:12:55 -0000 1.67
+++ vo_gl.c 18 Apr 2005 15:52:38 -0000 1.68
@@ -163,7 +163,7 @@
aspect(&d_width,&d_height,A_NOZOOM);
#ifdef X11_FULLSCREEN
-// if( flags&0x01 ){ // (-fs)
+// if( flags&VOFLAG_FULLSCREEN ){ // (-fs)
// aspect(&d_width,&d_height,A_ZOOM);
// }
#endif
@@ -214,7 +214,7 @@
vo_x11_classhint( mDisplay,vo_window,"gl" );
vo_hidecursor(mDisplay,vo_window);
-// if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
+// if ( flags&VOFLAG_FULLSCREEN ) vo_x11_decoration( mDisplay,vo_window,0 );
XSelectInput(mDisplay, vo_window, StructureNotifyMask);
/* Tell other applications about this window */
XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
Index: vo_jpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_jpeg.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vo_jpeg.c 28 Feb 2005 00:26:53 -0000 1.27
+++ vo_jpeg.c 18 Apr 2005 15:52:38 -0000 1.28
@@ -144,7 +144,7 @@
/* ------------------------------------------------------------------------- */
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
char buf[BUFLENGTH];
Index: vo_md5sum.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_md5sum.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_md5sum.c 28 Feb 2005 00:26:53 -0000 1.4
+++ vo_md5sum.c 18 Apr 2005 15:52:38 -0000 1.5
@@ -136,7 +136,7 @@
*/
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
if (vo_config_count > 0 ) { /* Already configured */
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- vo_mga.c 3 Dec 2004 20:55:00 -0000 1.38
+++ vo_mga.c 18 Apr 2005 15:52:38 -0000 1.39
@@ -34,7 +34,7 @@
#define FBDEV "/dev/fb0"
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
// if (f >= 0) mga_uninit();
@@ -60,7 +60,7 @@
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(vo_screenwidth,vo_screenheight);
- if(fullscreen&0x01) { /* -fs */
+ if(fullscreen&VOFLAG_FULLSCREEN) { /* -fs */
aspect(&d_width,&d_height,A_ZOOM);
vo_fs = VO_TRUE;
} else {
Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_mpegpes.c 19 Aug 2004 09:51:07 -0000 1.40
+++ vo_mpegpes.c 18 Apr 2005 15:52:38 -0000 1.41
@@ -81,7 +81,7 @@
LIBVO_EXTERN (mpegpes)
static uint32_t
-config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
{
#ifdef HAVE_DVB
switch(s_height){
@@ -368,7 +368,7 @@
static uint32_t
query_format(uint32_t format)
{
- if(format==IMGFMT_MPEGPES) return 3|VFCAP_TIMER;
+ if(format==IMGFMT_MPEGPES) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_TIMER;
return 0;
}
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_null.c 11 Nov 2002 15:20:26 -0000 1.12
+++ vo_null.c 18 Apr 2005 15:52:38 -0000 1.13
@@ -66,11 +66,11 @@
static uint32_t
query_format(uint32_t format)
{
- return 1;
+ return VFCAP_CSP_SUPPORTED;
}
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
image_width = width;
image_height = height;
Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vo_png.c 10 Jan 2005 15:51:55 -0000 1.25
+++ vo_png.c 18 Apr 2005 15:52:38 -0000 1.26
@@ -41,7 +41,7 @@
};
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
if(z_compression == 0) {
Index: vo_pnm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pnm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_pnm.c 28 Feb 2005 04:25:25 -0000 1.7
+++ vo_pnm.c 18 Apr 2005 15:52:38 -0000 1.8
@@ -257,7 +257,7 @@
*/
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
char buf[BUFLENGTH];
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- vo_sdl.c 1 Mar 2005 19:59:20 -0000 1.120
+++ vo_sdl.c 18 Apr 2005 15:52:38 -0000 1.121
@@ -155,11 +155,6 @@
#endif
-#define FS 0x01
-#define VM 0x02
-#define ZOOM 0x04
-#define FLIP 0x08
-
#ifdef SDL_ENABLE_LOCKS
#define SDL_OVR_LOCK(x) if (SDL_LockYUVOverlay (priv->overlay)) { \
if(verbose) printf("SDL: Couldn't lock YUV overlay\n"); \
@@ -690,7 +685,7 @@
/* if we haven't set a fullmode yet, default to the lowest res fullmode first */
/* But select a mode where the full video enter */
- if(priv->X && priv->fulltype & FS) {
+ if(priv->X && priv->fulltype & VOFLAG_FULLSCREEN) {
screen_surface_w = priv->XWidth;
screen_surface_h = priv->XHeight;
}
@@ -726,7 +721,7 @@
/* calculate new video size/aspect */
if(priv->mode == YUV) {
- if(priv->fulltype&FS)
+ if(priv->fulltype&VOFLAG_FULLSCREEN)
aspect_save_screenres(priv->XWidth, priv->XHeight);
aspect(&priv->dstwidth, &priv->dstheight, A_ZOOM);
@@ -868,28 +863,28 @@
*/
// printf("SDL: flags are set to: %i\n", flags);
// printf("SDL: Width: %i Height: %i D_Width %i D_Height: %i\n", width, height, d_width, d_height);
- if(flags&FLIP) {
+ if(flags&VOFLAG_FLIPPING) {
if(verbose) printf("SDL: using flipped video (only with RGB/BGR/packed YUV)\n");
priv->flip = 1;
}
- if(flags&FS) {
+ if(flags&VOFLAG_FULLSCREEN) {
if(verbose) printf("SDL: setting zoomed fullscreen without modeswitching\n");
printf("SDL: Info - please use -vm or -zoom to switch to best resolution.\n");
- priv->fulltype = FS;
+ priv->fulltype = VOFLAG_FULLSCREEN;
set_fullmode(priv->fullmode);
/*if((priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)))
SDL_ShowCursor(0);*/
} else
- if(flags&VM) {
+ if(flags&VOFLAG_MODESWITCHING) {
if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
- priv->fulltype = VM;
+ priv->fulltype = VOFLAG_MODESWITCHING;
set_fullmode(priv->fullmode);
/*if((priv->surface = SDL_SetVideoMode (d_width ? d_width : width, d_height ? d_height : height, priv->bpp, priv->sdlfullflags)))
SDL_ShowCursor(0);*/
} else
- if(flags&ZOOM) {
+ if(flags&VOFLAG_SWSCALE) {
if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
- priv->fulltype = ZOOM;
+ priv->fulltype = VOFLAG_SWSCALE;
set_fullmode(priv->fullmode);
}
else {
@@ -904,7 +899,7 @@
}
else {
if(verbose) printf("SDL: setting zoomed fullscreen with modeswitching\n");
- priv->fulltype = ZOOM;
+ priv->fulltype = VOFLAG_SWSCALE;
set_fullmode(priv->fullmode);
}
}
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- vo_svga.c 3 Nov 2004 17:25:38 -0000 1.77
+++ vo_svga.c 18 Apr 2005 15:52:38 -0000 1.78
@@ -38,10 +38,10 @@
#include "video_out_internal.h"
#include "fastmemcpy.h"
#include "osdep/getch2.h"
-#ifdef CONFIG_VIDIX
-#include "vosub_vidix.h"
-#endif
-
+#ifdef CONFIG_VIDIX
+#include "vosub_vidix.h"
+#endif
+
#include "sub.h"
#include "mp_msg.h"
@@ -74,7 +74,7 @@
static uint8_t zerobuf[8192];//used when clear screen with vga_draw
static int squarepix;
-static int force_vm=0;
+static int force_vm=0;
static int force_native=0;
static int sync_flip=0;
static int blackbar_osd=0;
@@ -103,11 +103,11 @@
""
};
-#ifdef CONFIG_VIDIX
-static char vidix_name[32] = "";
+#ifdef CONFIG_VIDIX
+static char vidix_name[32] = "";
static vidix_grkey_t gr_key;
-#endif
-
+#endif
+
LIBVO_EXTERN(svga)
@@ -122,7 +122,7 @@
static uint32_t preinit(const char *arg)
{
int i;
-char s[64];
+char s[64];
getch2_disable();
memset(zerobuf,0,sizeof(zerobuf));
@@ -130,23 +130,23 @@
sync_flip=vo_vsync;
blackbar_osd=0;
- if(arg)while(*arg) {
-#ifdef CONFIG_VIDIX
- if(memcmp(arg,"vidix",5)==0) {
- i=6;
- while(arg[i] && arg[i]!=':') i++;
- strncpy(vidix_name, arg+6, i-6);
- vidix_name[i-5]=0;
- if(arg[i]==':')i++;
- arg+=i;
- vidix_preinit(vidix_name, &video_out_svga);
- }
-#endif
- if(!strncmp(arg,"sq",2)) {
- squarepix=1;
- arg+=2;
- if( *arg == ':' ) arg++;
- }
+ if(arg)while(*arg) {
+#ifdef CONFIG_VIDIX
+ if(memcmp(arg,"vidix",5)==0) {
+ i=6;
+ while(arg[i] && arg[i]!=':') i++;
+ strncpy(vidix_name, arg+6, i-6);
+ vidix_name[i-5]=0;
+ if(arg[i]==':')i++;
+ arg+=i;
+ vidix_preinit(vidix_name, &video_out_svga);
+ }
+#endif
+ if(!strncmp(arg,"sq",2)) {
+ squarepix=1;
+ arg+=2;
+ if( *arg == ':' ) arg++;
+ }
if(!strncmp(arg,"native",6)) {
force_native=1;
@@ -166,12 +166,12 @@
if( *arg == ':' ) arg++;
}
- if(*arg) {
- i=0;
- while(arg[i] && arg[i]!=':')i++;
+ if(*arg) {
+ i=0;
+ while(arg[i] && arg[i]!=':')i++;
if(i<64){
- strncpy(s, arg, i);
- s[i]=0;
+ strncpy(s, arg, i);
+ s[i]=0;
force_vm=vga_getmodenumber(s);
if(force_vm>0) {
@@ -182,10 +182,10 @@
}
arg+=i;
if(*arg==':')arg++;
- }
- }
+ }
+ }
- vga_init();
+ vga_init();
return 0;
}
@@ -399,7 +399,7 @@
// This function is called to init the video driver for specific mode
//
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t flags, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format) {
int32_t req_w = width;// (d_width > 0 ? d_width : width);
int32_t req_h = height;// (d_height > 0 ? d_height : height);
@@ -407,16 +407,16 @@
int32_t req_bpp;
uint32_t accflags;
- if(verbose)
- printf("vo_svga: config(%i, %i, %i, %i, %08x, %s, %08x)\n", width, height,
- d_width, d_height, flags, title, format);
+ if(verbose)
+ printf("vo_svga: config(%i, %i, %i, %i, %08x, %s, %08x)\n", width, height,
+ d_width, d_height, flags, title, format);
//Only RGB modes supported
if (!IMGFMT_IS_RGB(format) && !IMGFMT_IS_BGR(format)) {assert(0);return -1;}
req_bpp = IMGFMT_BGR_DEPTH(format);
if( vo_dbpp!=0 && vo_dbpp!=req_bpp) {assert(0);return-1;}
- if(!force_vm) {
+ if(!force_vm) {
if (verbose) {
printf("vo_svga: Looking for the best resolution...\n");
printf("vo_svga: req_w: %d, req_h: %d, bpp: %d\n",req_w,req_h,req_bpp);
@@ -550,14 +550,14 @@
x_pos &= ~(15); //align x offset position to 16 pixels
printf("vo_svga: centering image. start at (%d,%d)\n",x_pos,y_pos);
-#ifdef CONFIG_VIDIX
+#ifdef CONFIG_VIDIX
- if(vidix_name[0]){
+ if(vidix_name[0]){
vidix_init(width, height, x_pos, y_pos, modeinfo->width, modeinfo->height,
- format, mode_bpp, modeinfo->width,modeinfo->height);
+ format, mode_bpp, modeinfo->width,modeinfo->height);
printf("vo_svga: Using VIDIX. w=%i h=%i mw=%i mh=%i\n",width,height,
- modeinfo->width,modeinfo->height);
- vidix_start();
+ modeinfo->width,modeinfo->height);
+ vidix_start();
/*set colorkey*/
if(vidix_grkey_support()){
vidix_grkey_get(&gr_key);
@@ -571,8 +571,8 @@
gr_key.ckey.op = CKEY_FALSE;
vidix_grkey_set(&gr_key);
}
- }
-#endif
+ }
+#endif
vga_setdisplaystart(0);
return (0);
@@ -641,9 +641,9 @@
static void uninit(void) {
-#ifdef CONFIG_VIDIX
- if(vidix_name[0])vidix_term();
-#endif
+#ifdef CONFIG_VIDIX
+ if(vidix_name[0])vidix_term();
+#endif
vga_setmode(TEXT);
}
Index: vo_syncfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_syncfb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_syncfb.c 11 Nov 2002 15:20:26 -0000 1.14
+++ vo_syncfb.c 18 Apr 2005 15:52:38 -0000 1.15
@@ -342,12 +342,12 @@
case IMGFMT_YV12:
// case IMGFMT_RGB|24:
// case IMGFMT_BGR|24:
- return 1;
+ return VFCAP_CSP_SUPPORTED;
}
return 0;
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
uint_32 frame_size;
Index: vo_tdfx_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfx_vid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_tdfx_vid.c 12 Mar 2003 15:04:05 -0000 1.4
+++ vo_tdfx_vid.c 18 Apr 2005 15:52:38 -0000 1.5
@@ -214,7 +214,7 @@
switch(format) {
case IMGFMT_BGR8:
if(tdfx_cfg.screen_format == TDFX_VID_FORMAT_BGR8)
- return 3 | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
+ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
return 0;
case IMGFMT_YUY2:
case IMGFMT_UYVY:
@@ -226,19 +226,19 @@
case IMGFMT_I420:
if(tdfx_cfg.screen_format == TDFX_VID_FORMAT_BGR8)
return 0;
- return 3 | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
+ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE;
}
return 0;
}
static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
if(tdfx_fd < 0)
return 1;
// When we are run as sub vo we must follow the size gaven to us
- if(!(fullscreen & VOFLAG_XOVERLAY_SUB_VO)) {
+ if(!(flags & VOFLAG_XOVERLAY_SUB_VO)) {
if(!vo_screenwidth)
vo_screenwidth = tdfx_cfg.screen_width;
if(!vo_screenheight)
@@ -248,7 +248,7 @@
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(vo_screenwidth,vo_screenheight);
- if(fullscreen&0x01) { /* -fs */
+ if(flags&VOFLAG_FULLSCREEN) { /* -fs */
aspect(&d_width,&d_height,A_ZOOM);
vo_fs = VO_TRUE;
} else {
Index: vo_tga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vo_tga.c 12 Jun 2004 17:37:47 -0000 1.2
+++ vo_tga.c 18 Apr 2005 15:52:38 -0000 1.3
@@ -178,7 +178,7 @@
return VO_TRUE;
}
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
/* buffer for alpha */
if(line_buff){ free(line_buff); line_buff=NULL; }
Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- vo_vesa.c 24 Feb 2005 17:08:54 -0000 1.104
+++ vo_vesa.c 18 Apr 2005 15:52:38 -0000 1.105
@@ -468,7 +468,7 @@
#ifdef CONFIG_VIDIX
if(vidix_name)return(vidix_query_fourcc(format));
#endif
- return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
+ return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
}
static void paintBkGnd( void )
@@ -634,12 +634,12 @@
return -1;
}
if(subdev_flags == 0xFFFFFFFFUL) return -1;
- if(flags & 0x8)
+ if(flags & VOFLAG_FLIPPING)
{
printf("vo_vesa: switch -flip is not supported\n");
}
- if(flags & 0x04) use_scaler = 1;
- if(flags & 0x01)
+ if(flags & VOFLAG_SWSCALE) use_scaler = 1;
+ if(flags & VOFLAG_FULLSCREEN)
{
if(use_scaler) use_scaler = 2;
else fs_mode = 1;
Index: vo_winvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_winvidix.c 28 Oct 2004 01:15:52 -0000 1.5
+++ vo_winvidix.c 18 Apr 2005 15:52:38 -0000 1.6
@@ -179,7 +179,7 @@
vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
- vo_fs = flags&0x01;
+ vo_fs = flags&VOFLAG_FULLSCREEN;
aspect(&d_width, &d_height, A_NOZOOM);
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- vo_x11.c 28 Oct 2004 01:15:52 -0000 1.141
+++ vo_x11.c 18 Apr 2005 15:52:38 -0000 1.142
@@ -293,13 +293,13 @@
vo_dwidth = d_width;
vo_dheight = d_height;
- if (flags & 0x03)
+ if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING))
fullscreen = 1;
- if (flags & 0x02)
+ if (flags & VOFLAG_MODESWITCHING)
vm = 1;
- if (flags & 0x08)
+ if (flags & VOFLAG_FLIPPING)
Flip_Flag = 1;
- zoomFlag = flags & 0x04;
+ zoomFlag = flags & VOFLAG_SWSCALE;
int_pause = 0;
// if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
@@ -690,10 +690,10 @@
if (IMGFMT_BGR_DEPTH(format) <= 8)
return 0; // TODO 8bpp not yet fully implemented
if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
- return 3 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
+ return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
VFCAP_ACCEPT_STRIDE;
else
- return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
+ return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP |
VFCAP_ACCEPT_STRIDE;
}
@@ -709,7 +709,7 @@
case IMGFMT_I420:
case IMGFMT_IYUV:
case IMGFMT_YV12:
- return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE;
+ return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE;
}
return 0;
}
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- vo_xmga.c 15 Nov 2004 09:09:29 -0000 1.91
+++ vo_xmga.c 18 Apr 2005 15:52:38 -0000 1.92
@@ -177,7 +177,7 @@
else
#endif
{
- if (flags & 1)
+ if (flags & VOFLAG_FULLSCREEN)
aspect(&dwidth, &dheight, A_ZOOM);
XGetWindowAttributes(mDisplay, mRootWin, &attribs);
@@ -237,13 +237,13 @@
XStoreName(mDisplay, vo_window, mTitle);
XMapWindow(mDisplay, vo_window);
- if (flags & 1)
+ if (flags & VOFLAG_FULLSCREEN)
vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay, vo_window);
#endif
- } else if (!(flags & 1))
+ } else if (!(flags & VOFLAG_FULLSCREEN))
XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy,
vo_dwidth, vo_dheight);
}
@@ -254,7 +254,7 @@
} // !GUI
- if ((flags & 1) && (!WinID))
+ if ((flags & VOFLAG_FULLSCREEN) && (!WinID))
{
vo_dx = 0;
vo_dy = 0;
Index: vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_xover.c 15 Nov 2004 09:09:29 -0000 1.11
+++ vo_xover.c 18 Apr 2005 15:52:38 -0000 1.12
@@ -270,7 +270,7 @@
#endif
#ifdef X11_FULLSCREEN
- if ( ( flags&1 )||(flags & 0x04) ) aspect(&d_width, &d_height, A_ZOOM);
+ if ( ( flags&VOFLAG_FULLSCREEN )||(flags & VOFLAG_SWSCALE) ) aspect(&d_width, &d_height, A_ZOOM);
#endif
dwidth = d_width;
dheight = d_height;
@@ -317,12 +317,12 @@
XStoreName(mDisplay, vo_window, title);
XMapWindow(mDisplay, vo_window);
- if ( flags&1 ) vo_x11_fullscreen();
+ if ( flags&VOFLAG_FULLSCREEN ) vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay, vo_window);
#endif
- } else if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight );
+ } else if ( !(flags&VOFLAG_FULLSCREEN) ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight );
}
if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
@@ -331,7 +331,7 @@
}
#endif
- if ( ( !WinID )&&( flags&1 ) ) { vo_dx=0; vo_dy=0; vo_dwidth=vo_screenwidth; vo_dheight=vo_screenheight; vo_fs=1; }
+ if ( ( !WinID )&&( flags&VOFLAG_FULLSCREEN ) ) { vo_dx=0; vo_dy=0; vo_dwidth=vo_screenwidth; vo_dheight=vo_screenheight; vo_fs=1; }
if(sub_vo->config(image_width,image_height,vo_dwidth,vo_dheight,
flags | VOFLAG_XOVERLAY_SUB_VO,NULL,format)) {
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- vo_xv.c 16 Apr 2005 17:10:31 -0000 1.164
+++ vo_xv.c 18 Apr 2005 15:52:38 -0000 1.165
@@ -188,10 +188,10 @@
vo_dheight = d_height;
#ifdef HAVE_XF86VM
- if (flags & 0x02)
+ if (flags & VOFLAG_MODESWITCHING)
vm = 1;
#endif
- flip_flag = flags & 8;
+ flip_flag = flags & VOFLAG_FLIPPING;
num_buffers =
vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1;
@@ -331,7 +331,7 @@
NULL, 0, &hint);
vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0);
XMapWindow(mDisplay, vo_window);
- if (flags & 1)
+ if (flags & VOFLAG_FULLSCREEN)
vo_x11_fullscreen();
else
{
@@ -346,7 +346,7 @@
if (!vo_fs)
XMoveResizeWindow(mDisplay, vo_window, hint.x, hint.y,
hint.width, hint.height);
- if (flags & 1 && !vo_fs)
+ if (flags & VOFLAG_FULLSCREEN && !vo_fs)
vo_x11_fullscreen(); // handle -fs on non-first file
}
@@ -405,7 +405,7 @@
#endif
aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
- if (((flags & 1) && (WinID <= 0)) || vo_fs)
+ if (((flags & VOFLAG_FULLSCREEN) && (WinID <= 0)) || vo_fs)
{
aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
drwX =
Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_xvidix.c 15 Nov 2004 09:09:29 -0000 1.71
+++ vo_xvidix.c 18 Apr 2005 15:52:38 -0000 1.72
@@ -301,7 +301,7 @@
#endif
#ifdef X11_FULLSCREEN
- if ((flags & 1) || (flags & 0x04))
+ if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE))
aspect(&d_width, &d_height, A_ZOOM);
#endif
dwidth = d_width;
@@ -367,13 +367,13 @@
XStoreName(mDisplay, vo_window, title);
XMapWindow(mDisplay, vo_window);
- if (flags & 1)
+ if (flags & VOFLAG_FULLSCREEN)
vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay, vo_window);
#endif
- } else if (!(flags & 1))
+ } else if (!(flags & VOFLAG_FULLSCREEN))
XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy,
vo_dwidth, vo_dheight);
}
@@ -385,7 +385,7 @@
}
#endif
- if ((!WinID) && (flags & 1))
+ if ((!WinID) && (flags & VOFLAG_FULLSCREEN))
{
vo_dx = 0;
vo_dy = 0;
Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vo_xvmc.c 18 Apr 2005 14:35:11 -0000 1.19
+++ vo_xvmc.c 18 Apr 2005 15:52:38 -0000 1.20
@@ -602,7 +602,7 @@
vo_dwidth=d_width; vo_dheight=d_height;
#ifdef HAVE_XF86VM
- if( flags&0x02 ) vm = 1;
+ if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif
aspect_save_screenres(vo_screenwidth,vo_screenheight);
@@ -686,7 +686,7 @@
XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
XSetWMNormalHints( mDisplay,vo_window,&hint );
XMapWindow(mDisplay, vo_window);
- if ( flags&1 ) vo_x11_fullscreen();
+ if ( flags&VOFLAG_FULLSCREEN ) vo_x11_fullscreen();
else {
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay,vo_window);
@@ -697,7 +697,7 @@
// vo_fs set means we were already at fullscreen
vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
if ( !vo_fs ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
- if ( flags&1 && !vo_fs ) vo_x11_fullscreen(); // handle -fs on non-first file
+ if ( flags&VOFLAG_FULLSCREEN && !vo_fs ) vo_x11_fullscreen(); // handle -fs on non-first file
}
// vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
@@ -719,7 +719,7 @@
}
aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
- if ( (( flags&1 )&&( WinID <= 0 )) || vo_fs )
+ if ( (( flags&VOFLAG_FULLSCREEN )&&( WinID <= 0 )) || vo_fs )
{
aspect(&vo_dwidth,&vo_dheight,A_ZOOM);
drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2;
Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_yuv4mpeg.c 19 Jan 2005 17:10:20 -0000 1.21
+++ vo_yuv4mpeg.c 18 Apr 2005 15:52:38 -0000 1.22
@@ -79,7 +79,7 @@
#define Y4M_IS_INTERLACED (config_interlace != Y4M_ILACE_NONE)
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title,
+ uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
if (image_width == width && image_height == height &&
Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vo_zr.c 8 Jan 2005 14:32:25 -0000 1.30
+++ vo_zr.c 18 Apr 2005 15:52:38 -0000 1.31
@@ -301,7 +301,7 @@
static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
- uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
int i, tmp, stretchx, stretchy;
framenum = 0;
- Previous message: [MPlayer-cvslog] CVS: main/libmpcodecs vd.c, 1.82, 1.83 vd_zrmjpeg.c, 1.2, 1.3 ve_divx4.c, 1.17, 1.18 ve_libdv.c, 1.12, 1.13 ve_nuv.c, 1.6, 1.7 ve_qtvideo.c, 1.13, 1.14 ve_vfw.c, 1.18, 1.19 vf_flip.c, 1.12, 1.13 vf_vo.c, 1.24, 1.25
- Next message: [MPlayer-cvslog] CVS: main/libvo mga_common.c, 1.60, 1.61 vesa_lvo.c, 1.18, 1.19 vo_aa.c, 1.45, 1.46 vo_bl.c, 1.9, 1.10 vo_caca.c, 1.1, 1.2 vo_cvidix.c, 1.13, 1.14 vo_dfbmga.c, 1.26, 1.27 vo_dga.c, 1.71, 1.72 vo_directfb2.c, 1.17, 1.18 vo_dxr3.c, 1.123, 1.124 vo_fbdev.c, 1.90, 1.91 vo_fbdev2.c, 1.5, 1.6 vo_gif89a.c, 1.12, 1.13 vo_gl.c, 1.67, 1.68 vo_jpeg.c, 1.27, 1.28 vo_md5sum.c, 1.4, 1.5 vo_mga.c, 1.38, 1.39 vo_mpegpes.c, 1.40, 1.41 vo_null.c, 1.12, 1.13 vo_png.c, 1.25, 1.26 vo_pnm.c, 1.7, 1.8 vo_sdl.c, 1.120, 1.121 vo_svga.c, 1.77, 1.78 vo_syncfb.c, 1.14, 1.15 vo_tdfx_vid.c, 1.4, 1.5 vo_tga.c, 1.2, 1.3 vo_vesa.c, 1.104, 1.105 vo_winvidix.c, 1.5, 1.6 vo_x11.c, 1.141, 1.142 vo_xmga.c, 1.91, 1.92 vo_xover.c, 1.11, 1.12 vo_xv.c, 1.164, 1.165 vo_xvidix.c, 1.71, 1.72 vo_xvmc.c, 1.19, 1.20 vo_yuv4mpeg.c, 1.21, 1.22 vo_zr.c, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list