[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[271] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[271] mplayerxp
|
From: <nic...@us...> - 2012-10-31 17:46:00
|
Revision: 271
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=271&view=rev
Author: nickols_k
Date: 2012-10-31 17:45:52 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
use inline functions instead of #define
Modified Paths:
--------------
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpdemux/yuv4mpeg.c
mplayerxp/libvo/osd.h
mplayerxp/libvo/video_out.h
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/x11_common.c
mplayerxp/mplayer.c
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libmpcodecs/vd.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -188,13 +188,13 @@
// autodetect flipping
if(vo_conf.flip==0){
- VO_FLIP_UNSET(vo_data);
+ vo_FLIP_UNSET(vo_data);
if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
- VO_FLIP_SET(vo_data);
+ vo_FLIP_SET(vo_data);
}
- if(vo_data->flags&VFCAP_FLIPPED) VO_FLIP_REVERT(vo_data);
- if(VO_FLIP(vo_data) && !(vo_data->flags&VFCAP_FLIP)){
+ if(vo_data->flags&VFCAP_FLIPPED) vo_FLIP_REVERT(vo_data);
+ if(vo_FLIP(vo_data) && !(vo_data->flags&VFCAP_FLIP)){
// we need to flip, but no flipping filter avail.
sh->vfilter=vf=vf_open_filter(vf,sh,"mirror","x");
}
Modified: mplayerxp/libmpdemux/yuv4mpeg.c
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libmpdemux/yuv4mpeg.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -29,9 +29,9 @@
#include <stdlib.h>
#include <string.h>
#include "yuv4mpeg.h"
-#include "yuv4mpeg_intern.h"
#include "demux_msg.h"
#include "osdep/mplib.h"
+#include "yuv4mpeg_intern.h"
/* quick test of two ratios for equality (i.e. identical components) */
#define Y4M_RATIO_EQL(a,b) ( ((a).n == (b).n) && ((a).d == (b).d) )
@@ -153,7 +153,7 @@
static int y4m_snprint_xtags(char *s, int maxn, y4m_xtag_list_t *xtags)
{
int i, room;
-
+
for (i = 0, room = maxn - 1; i < xtags->count; i++) {
int n = snprintf(s, room + 1, " %s", xtags->tags[i]);
if ((n < 0) || (n > room)) return Y4M_ERR_HEADER;
Modified: mplayerxp/libvo/osd.h
===================================================================
--- mplayerxp/libvo/osd.h 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/osd.h 2012-10-31 17:45:52 UTC (rev 271)
@@ -15,11 +15,11 @@
extern draw_alpha_f vo_draw_alpha_rgb32_ptr;
extern draw_alpha_f vo_draw_alpha_rgb15_ptr;
extern draw_alpha_f vo_draw_alpha_rgb16_ptr;
-#define vo_draw_alpha_yv12(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_yv12_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_yuy2(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_yuy2_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_uyvy(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_uyvy_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_rgb24(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_rgb24_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_rgb32(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_rgb32_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_rgb15(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_rgb15_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
-#define vo_draw_alpha_rgb16(w,h,src,srca,srcstride,dstbase,dstrstride,finalize) (*vo_draw_alpha_rgb16_ptr)(w,h,src,srca,srcstride,dstbase,dstrstride,finalize)
+static inline void vo_draw_alpha_yv12(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_yv12_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_yuy2(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_yuy2_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_uyvy(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_uyvy_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_rgb24(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_rgb24_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_rgb32(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_rgb32_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_rgb15(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_rgb15_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
+static inline void vo_draw_alpha_rgb16(int w,int h, const unsigned char* src, const unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride,int finalize) { (*vo_draw_alpha_rgb16_ptr)(w,h,src,srca,srcstride,dstbase,dststride,finalize); }
#endif
Modified: mplayerxp/libvo/video_out.h
===================================================================
--- mplayerxp/libvo/video_out.h 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/video_out.h 2012-10-31 17:45:52 UTC (rev 271)
@@ -182,19 +182,19 @@
const subtitle* sub;
int osd_changed_flag;
}vo_data_t;
-#define VO_ZOOM(vo) ((vo)->flags&VOFLAG_SWSCALE)
-#define VO_ZOOM_SET(vo) ((vo)->flags|=VOFLAG_SWSCALE)
-#define VO_ZOOM_UNSET(vo) ((vo)->flags&=~VOFLAG_SWSCALE)
-#define VO_FS(vo) ((vo)->flags&VOFLAG_FULLSCREEN)
-#define VO_FS_SET(vo) ((vo)->flags|=VOFLAG_FULLSCREEN)
-#define VO_FS_UNSET(vo) ((vo)->flags&=~VOFLAG_FULLSCREEN)
-#define VO_VM(vo) ((vo)->flags&VOFLAG_MODESWITCHING)
-#define VO_VM_SET(vo) ((vo)->flags|=VOFLAG_MODESWITCHING)
-#define VO_VM_UNSET(vo) ((vo)->flags&=~VOFLAG_MODESWITCHING)
-#define VO_FLIP(vo) ((vo)->flags&VOFLAG_FLIPPING)
-#define VO_FLIP_SET(vo) ((vo)->flags|=VOFLAG_FLIPPING)
-#define VO_FLIP_UNSET(vo) ((vo)->flags&=~VOFLAG_FLIPPING)
-#define VO_FLIP_REVERT(vo) ((vo)->flags^=VOFLAG_FLIPPING)
+static inline int vo_ZOOM(const vo_data_t*vo) { return vo->flags&VOFLAG_SWSCALE; }
+static inline void vo_ZOOM_SET(vo_data_t*vo) { vo->flags|=VOFLAG_SWSCALE; }
+static inline void vo_ZOOM_UNSET(vo_data_t*vo) { vo->flags&=~VOFLAG_SWSCALE; }
+static inline int vo_FS(const vo_data_t*vo) { return vo->flags&VOFLAG_FULLSCREEN; }
+static inline void vo_FS_SET(vo_data_t*vo) { vo->flags|=VOFLAG_FULLSCREEN; }
+static inline void vo_FS_UNSET(vo_data_t*vo) { vo->flags&=~VOFLAG_FULLSCREEN; }
+static inline int vo_VM(const vo_data_t*vo) { return vo->flags&VOFLAG_MODESWITCHING; }
+static inline void vo_VM_SET(vo_data_t*vo) { vo->flags|=VOFLAG_MODESWITCHING; }
+static inline void vo_VM_UNSET(vo_data_t*vo) { vo->flags&=~VOFLAG_MODESWITCHING; }
+static inline int vo_FLIP(const vo_data_t*vo) { return vo->flags&VOFLAG_FLIPPING; }
+static inline void vo_FLIP_SET(vo_data_t*vo) { vo->flags|=VOFLAG_FLIPPING; }
+static inline void vo_FLIP_UNSET(vo_data_t*vo) { vo->flags&=~VOFLAG_FLIPPING; }
+static inline void vo_FLIP_REVERT(vo_data_t*vo){ vo->flags^=VOFLAG_FLIPPING; }
/** VO-driver interface */
typedef struct vo_functions_s
Modified: mplayerxp/libvo/vo_fbdev.c
===================================================================
--- mplayerxp/libvo/vo_fbdev.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_fbdev.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -841,12 +841,12 @@
}
if (priv->pre_init_err) return 1;
- if (priv_conf.mode_name && !VO_VM(vo)) {
+ if (priv_conf.mode_name && !vo_VM(vo)) {
MSG_ERR(FBDEV "-fbmode can only be used with -vm\n");
return 1;
}
- if (VO_VM(vo) && (parse_fbmode_cfg(vo,priv_conf.mode_cfgfile) < 0)) return 1;
- if (d_width && (VO_ZOOM(vo) || VO_VM(vo))) {
+ if (vo_VM(vo) && (parse_fbmode_cfg(vo,priv_conf.mode_cfgfile) < 0)) return 1;
+ if (d_width && (vo_ZOOM(vo) || vo_VM(vo))) {
priv->out_width = d_width;
priv->out_height = d_height;
} else {
@@ -863,7 +863,7 @@
return 1;
}
fb_mode2fb_vinfo(priv->mode, &priv->vinfo);
- } else if (VO_VM(vo)) {
+ } else if (vo_VM(vo)) {
priv->monitor_hfreq = str2range(priv_conf.monitor_hfreq_str);
priv->monitor_vfreq = str2range(priv_conf.monitor_vfreq_str);
priv->monitor_dotclock = str2range(priv_conf.monitor_dotclock_str);
@@ -925,7 +925,7 @@
break;
}
- if (VO_FLIP(vo) && ((((priv->pixel_format & 0xff) + 7) / 8) != priv->pixel_size)) {
+ if (vo_FLIP(vo) && ((((priv->pixel_format & 0xff) + 7) / 8) != priv->pixel_size)) {
MSG_ERR(FBDEV "Flipped output with depth conversion is not "
"supported\n");
return 1;
@@ -977,12 +977,12 @@
memset(priv->next_frame,0,sizeof(priv->next_frame));
priv->out_width=width;
priv->out_height=height;
- if(VO_ZOOM(vo)) {
+ if(vo_ZOOM(vo)) {
aspect_save_orig(width,height);
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(priv->xres,priv->yres);
aspect(&priv->out_width,&priv->out_height,A_ZOOM);
- } else if(VO_FS(vo)) {
+ } else if(vo_FS(vo)) {
priv->out_width = priv->xres;
priv->out_height = priv->yres;
}
Modified: mplayerxp/libvo/vo_opengl.c
===================================================================
--- mplayerxp/libvo/vo_opengl.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_opengl.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -132,7 +132,7 @@
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
glRasterPos2i(x, y);
- glPixelZoom(sx,VO_FLIP(vo)?sy:-sy);
+ glPixelZoom(sx,vo_FLIP(vo)?sy:-sy);
}
static void resize(vo_data_t*vo,int x,int y){
@@ -172,12 +172,12 @@
priv->image_width = width;
priv->image_format=format;
- if ( VO_FS(vo) ) { vo->dest.w=d_width; vo->dest.h=d_height; }
+ if ( vo_FS(vo) ) { vo->dest.w=d_width; vo->dest.h=d_height; }
priv->num_buffers=vo_conf.da_buffs;
aspect_save_screenres(vo_conf.screenwidth,vo_conf.screenheight);
- aspect(&d_width,&d_height,VO_ZOOM(vo)?A_ZOOM:A_NOZOOM);
+ aspect(&d_width,&d_height,vo_ZOOM(vo)?A_ZOOM:A_NOZOOM);
vo_x11_calcpos(vo,&hint,d_width,d_height,flags);
hint.flags = PPosition | PSize;
@@ -208,7 +208,7 @@
((vo_conf.WinID==0) ? 0 : (PointerMotionMask
| ButtonPressMask | ButtonReleaseMask )));
XSetStandardProperties(vo->mDisplay, vo->window, hello, hello, None, NULL, 0, &hint);
- if ( VO_FS(vo) ) vo_x11_decoration(vo, vo->mDisplay,vo->window,0 );
+ if ( vo_FS(vo) ) vo_x11_decoration(vo, vo->mDisplay,vo->window,0 );
XMapWindow(vo->mDisplay, vo->window);
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(vo,vo->mDisplay,vo->window,&hint);
@@ -217,7 +217,7 @@
XFlush(vo->mDisplay);
XSync(vo->mDisplay, False);
#ifdef HAVE_XF86VM
- if ( VO_VM(vo) ) {
+ if ( vo_VM(vo) ) {
/* Grab the mouse pointer in our window */
XGrabPointer( vo->mDisplay, vo->window, True, 0,
GrabModeAsync, GrabModeAsync,
Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_sdl.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -926,7 +926,7 @@
retval = VO_EVENT_RESIZE;
} else if ( keypressed == SDLK_n ) {
#ifdef HAVE_X11
- aspect(&priv->dstwidth, &priv->dstheight,VO_ZOOM(vo)?A_ZOOM:A_NOZOOM);
+ aspect(&priv->dstwidth, &priv->dstheight,vo_ZOOM(vo)?A_ZOOM:A_NOZOOM);
#endif
if (priv->surface->w != priv->dstwidth || priv->surface->h != priv->dstheight) {
if(set_video_mode(vo,priv->dstwidth, priv->dstheight, priv->bpp, priv->sdlflags)!=0) exit(EXIT_FAILURE);
Modified: mplayerxp/libvo/vo_x11.c
===================================================================
--- mplayerxp/libvo/vo_x11.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_x11.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -145,7 +145,7 @@
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(vo_conf.screenwidth,vo_conf.screenheight);
- aspect(&d_width,&d_height,VO_FS(vo)?A_ZOOM:A_NOZOOM);
+ aspect(&d_width,&d_height,vo_FS(vo)?A_ZOOM:A_NOZOOM);
vo_x11_calcpos(vo,&hint,d_width,d_height,flags);
hint.flags=PPosition | PSize;
@@ -167,7 +167,7 @@
xswamask=CWBackPixel | CWBorderPixel | CWColormap;
#ifdef HAVE_XF86VM
- if ( VO_VM(vo) ) {
+ if ( vo_VM(vo) ) {
xswa.override_redirect=True;
xswamask|=CWOverrideRedirect;
}
@@ -185,7 +185,7 @@
}
vo_x11_classhint( vo->mDisplay,vo->window,"vo_x11" );
vo_x11_hidecursor(vo->mDisplay,vo->window);
- if ( VO_FS(vo) ) vo_x11_decoration(vo,vo->mDisplay,vo->window,0 );
+ if ( vo_FS(vo) ) vo_x11_decoration(vo,vo->mDisplay,vo->window,0 );
XSelectInput( vo->mDisplay,vo->window,StructureNotifyMask );
XSetStandardProperties( vo->mDisplay,vo->window,title,title,None,NULL,0,&hint );
XMapWindow( vo->mDisplay,vo->window );
@@ -205,7 +205,7 @@
((vo_conf.WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) );
#ifdef HAVE_XF86VM
- if ( VO_VM(vo) ) {
+ if ( vo_VM(vo) ) {
/* Grab the mouse pointer in our window */
XGrabPointer(vo->mDisplay, vo->window, True, 0,
GrabModeAsync, GrabModeAsync,
Modified: mplayerxp/libvo/vo_xv.c
===================================================================
--- mplayerxp/libvo/vo_xv.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_xv.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -283,13 +283,13 @@
priv->image_width = width;
priv->image_format=format;
- if ( VO_FS(vo) ) { vo->dest.w=d_width; vo->dest.h=d_height; }
+ if ( vo_FS(vo) ) { vo->dest.w=d_width; vo->dest.h=d_height; }
priv->num_buffers=vo_conf.da_buffs;
aspect_save_screenres(vo_conf.screenwidth,vo_conf.screenheight);
- aspect(&d_width,&d_height,VO_ZOOM(vo)?A_ZOOM:A_NOZOOM);
+ aspect(&d_width,&d_height,vo_ZOOM(vo)?A_ZOOM:A_NOZOOM);
vo_x11_calcpos(vo,&hint,d_width,d_height,flags);
hint.flags = PPosition | PSize;
@@ -320,7 +320,7 @@
((vo_conf.WinID==0) ? 0 : (PointerMotionMask
| ButtonPressMask | ButtonReleaseMask)));
XSetStandardProperties(vo->mDisplay, vo->window, hello, hello, None, NULL, 0, &hint);
- if ( VO_FS(vo) ) vo_x11_decoration(vo,vo->mDisplay,vo->window,0 );
+ if ( vo_FS(vo) ) vo_x11_decoration(vo,vo->mDisplay,vo->window,0 );
XMapWindow(vo->mDisplay, vo->window);
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(vo,vo->mDisplay,vo->window,&hint);
@@ -329,7 +329,7 @@
XFlush(vo->mDisplay);
XSync(vo->mDisplay, False);
#ifdef HAVE_XF86VM
- if ( VO_VM(vo) ) {
+ if ( vo_VM(vo) ) {
/* Grab the mouse pointer in our window */
XGrabPointer(vo->mDisplay, vo->window, True, 0,
GrabModeAsync, GrabModeAsync,
@@ -409,8 +409,8 @@
XTranslateCoordinates( vo->mDisplay,vo->window,priv->mRoot,0,0,&priv->drwcX,&priv->drwcY,&priv->mRoot );
MSG_V( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",priv->drwcX,priv->drwcY,priv->drwX,priv->drwY,priv->drwWidth,priv->drwHeight );
- aspect(&priv->dwidth,&priv->dheight,VO_ZOOM(vo)?A_ZOOM:A_NOZOOM);
- if ( VO_FS(vo) ) {
+ aspect(&priv->dwidth,&priv->dheight,vo_ZOOM(vo)?A_ZOOM:A_NOZOOM);
+ if ( vo_FS(vo) ) {
aspect(&priv->dwidth,&priv->dheight,A_ZOOM);
priv->drwX=( vo_conf.screenwidth - (priv->dwidth > vo_conf.screenwidth?vo_conf.screenwidth:priv->dwidth) ) / 2;
priv->drwcX+=priv->drwX;
@@ -477,8 +477,8 @@
XTranslateCoordinates( vo->mDisplay,vo->window,priv->mRoot,0,0,&priv->drwcX,&priv->drwcY,&priv->mRoot );
MSG_V( "[xv-resize] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",priv->drwcX,priv->drwcY,priv->drwX,priv->drwY,priv->drwWidth,priv->drwHeight );
- aspect(&priv->dwidth,&priv->dheight,VO_ZOOM(vo)?A_ZOOM:A_NOZOOM);
- if ( VO_FS(vo) ) {
+ aspect(&priv->dwidth,&priv->dheight,vo_ZOOM(vo)?A_ZOOM:A_NOZOOM);
+ if ( vo_FS(vo) ) {
aspect(&priv->dwidth,&priv->dheight,A_ZOOM);
priv->drwX=( vo_conf.screenwidth - (priv->dwidth > vo_conf.screenwidth?vo_conf.screenwidth:priv->dwidth) ) / 2;
priv->drwcX+=priv->drwX;
@@ -491,7 +491,7 @@
}
if ( e & VO_EVENT_EXPOSE ) {
XvShmPutImage(vo->mDisplay, priv->port, vo->window, vo->gc, priv->image[priv->expose_idx], 0, 0, priv->image_width, priv->image_height, priv->drwX, priv->drwY, 1, 1, False);
- XvShmPutImage(vo->mDisplay, priv->port, vo->window, vo->gc, priv->image[priv->expose_idx], 0, 0, priv->image_width, priv->image_height, priv->drwX,priv->drwY,priv->drwWidth,(VO_FS(vo)?priv->drwHeight - 1:priv->drwHeight), False);
+ XvShmPutImage(vo->mDisplay, priv->port, vo->window, vo->gc, priv->image[priv->expose_idx], 0, 0, priv->image_width, priv->image_height, priv->drwX,priv->drwY,priv->drwWidth,(vo_FS(vo)?priv->drwHeight - 1:priv->drwHeight), False);
}
return e|VO_EVENT_FORCE_UPDATE;
}
@@ -502,7 +502,7 @@
priv->expose_idx=idx;
XvShmPutImage(vo->mDisplay, priv->port, vo->window, vo->gc, priv->image[idx],
0, 0, priv->image_width, priv->image_height,
- priv->drwX,priv->drwY,priv->drwWidth,(VO_FS(vo)?priv->drwHeight - 1:priv->drwHeight),
+ priv->drwX,priv->drwY,priv->drwWidth,(vo_FS(vo)?priv->drwHeight - 1:priv->drwHeight),
False);
if (priv->num_buffers>1) XFlush(vo->mDisplay);
else XSync(vo->mDisplay, False);
Modified: mplayerxp/libvo/vo_xvidix.c
===================================================================
--- mplayerxp/libvo/vo_xvidix.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/vo_xvidix.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -80,12 +80,12 @@
XTranslateCoordinates(vo->mDisplay, vo->window, priv->mRoot, 0, 0,
&priv->drwcX, &priv->drwcY, &priv->mRoot);
- if (!VO_FS(vo))
+ if (!vo_FS(vo))
MSG_V( "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
priv->drwcX, priv->drwcY, priv->drwX, priv->drwY, priv->drwWidth, priv->drwHeight);
/* following stuff copied from vo_xmga.c */
- if (VO_FS(vo)) {
+ if (vo_FS(vo)) {
priv->drwX = (vo_conf.screenwidth - (priv->dwidth > vo_conf.screenwidth ? vo_conf.screenwidth : priv->dwidth)) / 2;
priv->drwcX += priv->drwX;
priv->drwY = (vo_conf.screenheight - (priv->dheight > vo_conf.screenheight ? vo_conf.screenheight : priv->dheight)) / 2;
@@ -153,7 +153,7 @@
XClearWindow( vo->mDisplay,vo->window );
XSetForeground(vo->mDisplay, vo->gc, priv->fgColor);
XFillRectangle(vo->mDisplay, vo->window, vo->gc, priv->drwX, priv->drwY, priv->drwWidth,
- (VO_FS(vo) ? priv->drwHeight - 1 : priv->drwHeight));
+ (vo_FS(vo) ? priv->drwHeight - 1 : priv->drwHeight));
/* flush, update drawable */
XFlush(vo->mDisplay);
@@ -223,7 +223,7 @@
priv->win_w = d_width;
priv->win_h = d_height;
- if (VO_FS(vo)) { vo->dest.w=d_width; vo->dest.h=d_height; }
+ if (vo_FS(vo)) { vo->dest.w=d_width; vo->dest.h=d_height; }
priv->X_already_started++;
@@ -247,8 +247,8 @@
aspect(&d_width, &d_height,flags & VOFLAG_SWSCALE?A_ZOOM:A_NOZOOM);
- if (VO_FS(vo)) { /* fullscreen */
- if (VO_ZOOM(vo)) aspect(&d_width, &d_height, A_ZOOM);
+ if (vo_FS(vo)) { /* fullscreen */
+ if (vo_ZOOM(vo)) aspect(&d_width, &d_height, A_ZOOM);
else {
d_width = vo_conf.screenwidth;
d_height = vo_conf.screenheight;
@@ -269,7 +269,7 @@
window_depth = 24;
XMatchVisualInfo(vo->mDisplay, vo->mScreen, window_depth, TrueColor, &vinfo);
- xswa.background_pixel = VO_FS(vo) ? BlackPixel(vo->mDisplay, vo->mScreen) : priv->fgColor;
+ xswa.background_pixel = vo_FS(vo) ? BlackPixel(vo->mDisplay, vo->mScreen) : priv->fgColor;
xswa.border_pixel = 0;
xswa.colormap = XCreateColormap(vo->mDisplay, RootWindow(vo->mDisplay, vo->mScreen),
vinfo.visual, AllocNone);
@@ -290,7 +290,7 @@
vo_x11_classhint(vo->mDisplay, vo->window, "xvidix");
vo_x11_hidecursor(vo->mDisplay, vo->window);
- if (VO_FS(vo)) vo_x11_decoration(vo,vo->mDisplay, vo->window, 0);
+ if (vo_FS(vo)) vo_x11_decoration(vo,vo->mDisplay, vo->window, 0);
XGetNormalHints(vo->mDisplay, vo->window, &hint);
hint.x = priv->win_x;
Modified: mplayerxp/libvo/x11_common.c
===================================================================
--- mplayerxp/libvo/x11_common.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/libvo/x11_common.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -750,7 +750,7 @@
hint->width=d_width;
hint->height=d_height;
#ifdef HAVE_XF86VM
- if ( VO_VM(vo) ) {
+ if ( vo_VM(vo) ) {
vm_width=d_width; vm_height=d_height;
vo_vm_switch(vo,vm_width, vm_height,&modeline_width, &modeline_height);
hint->x=(vo_conf.screenwidth-modeline_width)/2;
@@ -760,7 +760,7 @@
}
else
#endif
- if ( VO_FS(vo) ) {
+ if ( vo_FS(vo) ) {
hint->width=vo_conf.screenwidth;
hint->height=vo_conf.screenheight;
hint->x=0;
@@ -772,13 +772,13 @@
{
priv_t*priv=(priv_t*)vo->priv2;
XUnmapWindow( vo->mDisplay,vo->window );
- if ( !VO_FS(vo) ) {
- VO_FS_SET(vo);
+ if ( !vo_FS(vo) ) {
+ vo_FS_SET(vo);
priv->prev=vo->dest;
vo->dest.x=0; vo->dest.y=0; vo->dest.w=vo_conf.screenwidth; vo->dest.h=vo_conf.screenheight;
vo_x11_decoration(vo,vo->mDisplay,vo->window,0 );
} else {
- VO_FS_UNSET(vo);
+ vo_FS_UNSET(vo);
vo->dest=priv->prev;
vo_x11_decoration(vo,vo->mDisplay,vo->window,1 );
}
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-10-31 17:14:17 UTC (rev 270)
+++ mplayerxp/mplayer.c 2012-10-31 17:45:52 UTC (rev 271)
@@ -1890,10 +1890,10 @@
/* Go through the codec.conf and find the best codec...*/
sh_video->inited=0;
vo_data->flags=0;
- if(vo_conf.fullscreen) VO_FS_SET(vo_data);
- if(vo_conf.softzoom) VO_ZOOM_SET(vo_data);
- if(vo_conf.flip>0) VO_FLIP_SET(vo_data);
- if(vo_conf.vidmode) VO_VM_SET(vo_data);
+ if(vo_conf.fullscreen) vo_FS_SET(vo_data);
+ if(vo_conf.softzoom) vo_ZOOM_SET(vo_data);
+ if(vo_conf.flip>0) vo_FLIP_SET(vo_data);
+ if(vo_conf.vidmode) vo_VM_SET(vo_data);
codecs_reset_selection(0);
if(mp_conf.video_codec) {
/* forced codec by name: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
