[Mplayer-cvslog] CVS: main/libvo aspect.c,1.14,1.15 osd.c,1.19,1.20 sub.h,1.27,1.28 vo_dga.c,1.66,1.67 vo_directfb.c,1.27,1.28 vo_directfb2.c,1.13,1.14 vo_directx.c,1.20,1.21 vo_gl2.c,1.36,1.37 vo_sdl.c,1.107,1.108 vo_svga.c,1.70,1.71 vo_x11.c,1.134,1.135
Gabucino
gabucino at mplayerhq.hu
Sat Oct 4 19:29:38 CEST 2003
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv24410/libvo
Modified Files:
aspect.c osd.c sub.h vo_dga.c vo_directfb.c vo_directfb2.c
vo_directx.c vo_gl2.c vo_sdl.c vo_svga.c vo_x11.c
Log Message:
many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>
Index: aspect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/aspect.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aspect.c 21 Sep 2003 15:34:51 -0000 1.14
+++ aspect.c 4 Oct 2003 17:29:04 -0000 1.15
@@ -64,7 +64,7 @@
#ifdef ASPECT_DEBUG
printf("aspect(0) no aspect forced!\n");
#endif
- return; // the user doesnt want to fix aspect
+ return; // the user doesn't want to fix aspect
}
#ifdef ASPECT_DEBUG
printf("aspect(0) fitin: %dx%d zoom: %d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
Index: osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/osd.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- osd.c 3 Aug 2003 18:33:28 -0000 1.19
+++ osd.c 4 Oct 2003 17:29:04 -0000 1.20
@@ -240,7 +240,7 @@
fast_osd_16bpp_table[i]=((i>>3)<<11)|((i>>2)<<5)|(i>>3);
}
#endif
-//FIXME the optimized stuff is a lie for 15/16bpp as they arent optimized yet
+//FIXME the optimized stuff is a lie for 15/16bpp as they aren't optimized yet
if(verbose)
{
#ifdef RUNTIME_CPUDETECT
Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sub.h 24 Jan 2003 10:24:06 -0000 1.27
+++ sub.h 4 Oct 2003 17:29:04 -0000 1.28
@@ -23,7 +23,7 @@
typedef struct mp_osd_obj_s {
struct mp_osd_obj_s* next;
unsigned char type;
- unsigned char alignment; // 2 bits: x;y percents, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
+ unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
unsigned short flags;
int x,y;
int dxs,dys;
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vo_dga.c 28 Jul 2003 14:54:19 -0000 1.66
+++ vo_dga.c 4 Oct 2003 17:29:04 -0000 1.67
@@ -727,7 +727,7 @@
return 1;
}
-// now lets start the DGA thing
+// now let's start the DGA thing
if ( !vo_config_count || width != prev_width || height != prev_height )
{
Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vo_directfb.c 15 Aug 2003 13:04:37 -0000 1.27
+++ vo_directfb.c 4 Oct 2003 17:29:04 -0000 1.28
@@ -362,7 +362,7 @@
DFBCHECK (DirectFBCreate (&dfb));
DFBCHECK (dfb->SetCooperativeLevel (dfb, DFSCL_FULLSCREEN));
- // lets try to get YUY2 layer - borrowed from DirectFb examples
+ // let's try to get YUY2 layer - borrowed from DirectFb examples
/* Enumerate display layers */
DFBCHECK (dfb->EnumDisplayLayers( dfb, enum_layers_callback, &videolayer ));
@@ -1496,7 +1496,7 @@
framelocked=0;
};
#endif
- // lets clear blackborders
+ // let's clear blackborders
primary->SetColor(primary,0,0,0,0);
// top
primary->FillRectangle(primary,0,0,screen_width,yoffset);
Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_directfb2.c 7 Sep 2003 19:42:35 -0000 1.13
+++ vo_directfb2.c 4 Oct 2003 17:29:04 -0000 1.14
@@ -1486,7 +1486,7 @@
void *dst;
int pitch;
- unlock(); // isnt it silly I have to unlock surface and than lock it again :-)
+ unlock(); // isn't it silly I have to unlock surface and then lock it again :-)
if (frame) {
DFBCHECK (frame->Lock(frame,DSLF_WRITE|DSLF_READ,&dst,&pitch));
Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_directx.c 21 Sep 2003 10:31:22 -0000 1.20
+++ vo_directx.c 4 Oct 2003 17:29:04 -0000 1.21
@@ -249,7 +249,7 @@
case DDERR_NODIRECTDRAWHW:
{mp_msg(MSGT_VO, MSGL_ERR,"no directdraw hardware\n");break;}
case DDERR_NOEMULATION:
- {mp_msg(MSGT_VO, MSGL_ERR,"cant emulate\n");break;}
+ {mp_msg(MSGT_VO, MSGL_ERR,"can't emulate\n");break;}
case DDERR_NOFLIPHW:
{mp_msg(MSGT_VO, MSGL_ERR,"hardware can't do flip\n");break;}
case DDERR_NOOVERLAYHW:
Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vo_gl2.c 21 Sep 2003 15:44:23 -0000 1.36
+++ vo_gl2.c 4 Oct 2003 17:29:04 -0000 1.37
@@ -556,7 +556,7 @@
} /* for all texnumx */
} /* for all texnumy */
- /* YES - lets catch this error ...
+ /* YES - let's catch this error ...
*/
(void) glGetError ();
}
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- vo_sdl.c 26 Sep 2003 19:10:27 -0000 1.107
+++ vo_sdl.c 4 Oct 2003 17:29:04 -0000 1.108
@@ -564,7 +564,7 @@
priv->surface=NULL;
}
- /* DONT attempt to free the fullscreen modes array. SDL_Quit* does this for us */
+ /* DON'T attempt to free the fullscreen modes array. SDL_Quit* does this for us */
return 0;
}
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- vo_svga.c 25 Sep 2003 01:48:47 -0000 1.70
+++ vo_svga.c 4 Oct 2003 17:29:04 -0000 1.71
@@ -475,7 +475,7 @@
//we may try to set a bigger stride for video mode that will match the mpi->stride,
//this way we will transfer more data, but HW put_image can do it in backgraund!
-//now lets see how many pages we can use
+//now let's see how many pages we can use
max_pages = modeinfo->maxpixels/(modeinfo->height * modeinfo->width);
if(max_pages > MAXPAGES) max_pages = MAXPAGES;
if(!vo_doublebuffering) max_pages=1;
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- vo_x11.c 31 Aug 2003 22:27:10 -0000 1.134
+++ vo_x11.c 4 Oct 2003 17:29:04 -0000 1.135
@@ -275,7 +275,7 @@
XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
/* set image size (which is indeed neither the input nor output size),
- if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here
+ if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here
*/
image_width=(width + 7) & (~7);
image_height=height;
More information about the MPlayer-cvslog
mailing list