[Mplayer-cvslog] CVS: main/libvo vo_dga.c,1.15,1.16 vo_fsdga.c,1.2,1.3 vo_gl.c,1.3,1.4 vo_mga.c,1.9,1.10 vo_odivx.c,1.5,1.6 vo_png.c,1.2,1.3 vo_sdl.c,1.23,1.24 vo_svga.c,1.21,1.22 vo_x11.c,1.14,1.15 vo_xmga.c,1.15,1.16 vo_xv.c,1.14,1.15
Szabolcs Berecz
szabii at users.sourceforge.net
Tue Apr 24 12:21:14 CEST 2001
Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv31465
Modified Files:
vo_dga.c vo_fsdga.c vo_gl.c vo_mga.c vo_odivx.c vo_png.c
vo_sdl.c vo_svga.c vo_x11.c vo_xmga.c vo_xv.c
Log Message:
some warnings killed
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** vo_dga.c 2001/04/19 21:39:10 1.15
--- vo_dga.c 2001/04/24 10:21:12 1.16
***************
*** 24,27 ****
--- 24,30 ----
*
* $Log$
+ * Revision 1.16 2001/04/24 10:21:12 szabii
+ * some warnings killed
+ *
* Revision 1.15 2001/04/19 21:39:10 arpi_esp
* driver info now depends on detected DGA version
***************
*** 275,278 ****
--- 278,293 ----
//---------------------------------------------------------
+ extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
***************
*** 359,362 ****
--- 374,381 ----
//---------------------------------------------------------
+
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
static void flip_page( void ){
Index: vo_fsdga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fsdga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** vo_fsdga.c 2001/04/11 19:41:38 1.2
--- vo_fsdga.c 2001/04/24 10:21:12 1.3
***************
*** 282,286 ****
if( !vo_init() ) return 0; // Can't open X11
! printf("Format: %lx\n", format);
if( format==IMGFMT_YV12 ) return 1;
--- 282,286 ----
if( !vo_init() ) return 0; // Can't open X11
! printf("Format: %lx\n", (unsigned long) format);
if( format==IMGFMT_YV12 ) return 1;
***************
*** 342,346 ****
vo_dga_bpp = (vo_depthonscreen+7) >> 3;
! printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n",
vo_dga_width, vo_dga_vp_width,
vo_dga_vp_height, vo_depthonscreen, vo_dga_base,
--- 342,346 ----
vo_dga_bpp = (vo_depthonscreen+7) >> 3;
! printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %p, bpp: %d\n",
vo_dga_width, vo_dga_vp_width,
vo_dga_vp_height, vo_depthonscreen, vo_dga_base,
Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** vo_gl.c 2001/04/13 00:54:05 1.3
--- vo_gl.c 2001/04/24 10:21:12 1.4
***************
*** 80,84 ****
static uint32_t texture_height;
! static resize(int x,int y){
printf("Resize: %dx%d\n",x,y);
glViewport( 0, 0, x, y );
--- 80,84 ----
static uint32_t texture_height;
! static void resize(int x,int y){
printf("Resize: %dx%d\n",x,y);
glViewport( 0, 0, x, y );
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** vo_mga.c 2001/04/16 03:33:35 1.9
--- vo_mga.c 2001/04/24 10:21:12 1.10
***************
*** 112,115 ****
--- 112,118 ----
}
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
static void flip_page(void)
Index: vo_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_odivx.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** vo_odivx.c 2001/04/11 19:41:38 1.5
--- vo_odivx.c 2001/04/24 10:21:12 1.6
***************
*** 153,157 ****
encore(0x123,0,&enc_frame,&enc_result);
! printf("coded length: %d \n",enc_frame.length);
if(encode_name){
--- 153,157 ----
encore(0x123,0,&enc_frame,&enc_result);
! printf("coded length: %ld \n",enc_frame.length);
if(encode_name){
Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** vo_png.c 2001/04/19 20:23:28 1.2
--- vo_png.c 2001/04/24 10:21:12 1.3
***************
*** 13,16 ****
--- 13,17 ----
#include <stdlib.h>
#include <string.h>
+ #include <errno.h>
#include <png.h>
***************
*** 147,151 ****
png.fp = fopen (fname, "wb");
if (png.fp == NULL) {
! printf("\nPNG Error opening %s for writing!\n");
png.status = ERROR;
return png;
--- 148,152 ----
png.fp = fopen (fname, "wb");
if (png.fp == NULL) {
! printf("\nPNG Error opening %s for writing!\n", strerror(errno));
png.status = ERROR;
return png;
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** vo_sdl.c 2001/04/22 17:07:57 1.23
--- vo_sdl.c 2001/04/24 10:21:12 1.24
***************
*** 446,450 ****
priv->windowsize.w = d_width;
priv->windowsize.h = d_height;
! if(priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags))
SDL_ShowCursor(0);
break;
--- 446,450 ----
priv->windowsize.w = d_width;
priv->windowsize.h = d_height;
! if((priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)))
SDL_ShowCursor(0);
break;
***************
*** 710,713 ****
--- 710,717 ----
* returns : doesn't return
**/
+
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
static void flip_page (void)
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** vo_svga.c 2001/04/18 18:14:11 1.21
--- vo_svga.c 2001/04/24 10:21:12 1.22
***************
*** 419,422 ****
--- 419,436 ----
}
+ extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+
+
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
unsigned char *srca, int stride) {
***************
*** 482,485 ****
--- 496,500 ----
}
gl_putbox(x_pos, y_pos, maxw, maxh, src[0]);
+ return 0;
}
***************
*** 498,503 ****
--- 513,523 ----
}
gl_putbox((int)(x * scaling) + x_pos, (int)(y * scaling) + y_pos, sw, sh, src);
+ return 0;
}
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
+
static void flip_page(void) {
if (y_pos) {
***************
*** 537,539 ****
}
}
!
\ No newline at end of file
--- 557,559 ----
}
}
!
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** vo_x11.c 2001/04/13 00:54:05 1.14
--- vo_x11.c 2001/04/24 10:21:12 1.15
***************
*** 320,324 ****
bpp=myximage->bits_per_pixel;
! fprintf( stderr,"X11 color mask: R:%X G:%X B:%X\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
// If we have blue in the lowest bit then obviously RGB
--- 320,324 ----
bpp=myximage->bits_per_pixel;
! fprintf( stderr,"X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );
// If we have blue in the lowest bit then obviously RGB
***************
*** 388,391 ****
--- 388,404 ----
}
+ extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+ extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
+ unsigned char *srca, int srcstride, unsigned char* dstbase,
+ int dststride);
+
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
switch(bpp){
***************
*** 406,409 ****
--- 419,425 ----
}
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
static void flip_page( void ){
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** vo_xmga.c 2001/04/23 19:49:17 1.15
--- vo_xmga.c 2001/04/24 10:21:12 1.16
***************
*** 143,146 ****
--- 143,150 ----
}
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
+
static void flip_page(void){
#ifdef SHOW_TIME
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** vo_xv.c 2001/04/24 05:58:09 1.14
--- vo_xv.c 2001/04/24 10:21:12 1.15
***************
*** 283,286 ****
--- 283,290 ----
}
+ extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0,
+ int w,int h, unsigned char* src, unsigned char *srca,
+ int stride));
+
static void flip_page(void)
{
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list