[Mplayer-cvslog] CVS: main/libvo video_out.c,1.63,1.64 video_out.h,1.47,1.48 video_out_internal.h,1.13,1.14 vo_3dfx.c,1.15,1.16 vo_aa.c,1.34,1.35 vo_bl.c,1.1,1.2 vo_dfbmga.c,1.4,1.5 vo_dga.c,1.59,1.60 vo_directfb.c,1.23,1.24 vo_directfb2.c,1.4,1.5 vo_directx.c,1.5,1.6 vo_dxr2.c,1.14,1.15 vo_dxr3.c,1.109,1.110 vo_fbdev.c,1.74,1.75 vo_ggi.c,1.25,1.26 vo_gif89a.c,1.7,1.8 vo_gl.c,1.32,1.33 vo_gl2.c,1.27,1.28 vo_jpeg.c,1.7,1.8 vo_md5.c,1.13,1.14 vo_mga.c,1.34,1.35 vo_mpegpes.c,1.36,1.37 vo_null.c,1.11,1.12 vo_pgm.c,1.13,1.14 vo_png.c,1.22,1.23 vo_sdl.c,1.94,1.95 vo_svga.c,1.54,1.55 vo_syncfb.c,1.13,1.14 vo_tdfxfb.c,1.21,1.22 vo_vesa.c,1.80,1.81 vo_x11.c,1.123,1.124 vo_xmga.c,1.81,1.82 vo_xv.c,1.126,1.127 vo_xvidix.c,1.54,1.55 vo_yuv4mpeg.c,1.12,1.13 vo_zr.c,1.21,1.22
Alex Beregszaszi
alex at mplayerhq.hu
Mon Nov 11 16:20:47 CET 2002
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv953
Modified Files:
video_out.c video_out.h video_out_internal.h vo_3dfx.c vo_aa.c
vo_bl.c vo_dfbmga.c vo_dga.c vo_directfb.c vo_directfb2.c
vo_directx.c vo_dxr2.c vo_dxr3.c vo_fbdev.c vo_ggi.c
vo_gif89a.c vo_gl.c vo_gl2.c vo_jpeg.c vo_md5.c vo_mga.c
vo_mpegpes.c vo_null.c vo_pgm.c vo_png.c vo_sdl.c vo_svga.c
vo_syncfb.c vo_tdfxfb.c vo_vesa.c vo_x11.c vo_xmga.c vo_xv.c
vo_xvidix.c vo_yuv4mpeg.c vo_zr.c
Log Message:
removed get_info, using the same sheme as in libmpcodecs instead
Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- video_out.c 31 Oct 2002 23:54:26 -0000 1.63
+++ video_out.c 11 Nov 2002 15:20:25 -0000 1.64
@@ -196,7 +196,7 @@
int i=0;
mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers);
while (video_out_drivers[i]) {
- const vo_info_t *info = video_out_drivers[i++]->get_info ();
+ const vo_info_t *info = video_out_drivers[i++]->info;
printf("\t%s\t%s\n", info->short_name, info->name);
}
printf("\n");
@@ -215,7 +215,7 @@
}
for(i=0;video_out_drivers[i];i++){
vo_functions_t* video_driver=video_out_drivers[i];
- const vo_info_t *info = video_driver->get_info();
+ const vo_info_t *info = video_driver->info;
if(!strcmp(info->short_name,vo)){
// name matches, try it
if(!video_driver->preinit(vo_subdevice))
Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- video_out.h 3 Nov 2002 14:30:00 -0000 1.47
+++ video_out.h 11 Nov 2002 15:20:25 -0000 1.48
@@ -77,6 +77,7 @@
typedef struct vo_functions_s
{
+ vo_info_t *info;
/*
* Preinitializes driver (real INITIALIZATION)
* arg - currently it's vo_subdevice
@@ -101,12 +102,6 @@
* Control interface
*/
uint32_t (*control)(uint32_t request, void *data, ...);
-
- /*
- * Return driver information.
- * returns : read-only pointer to a vo_info_t structure.
- */
- const vo_info_t* (*get_info)(void);
/*
* Display a new RGB/BGR frame of the video to the screen.
Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- video_out_internal.h 23 Oct 2002 18:53:06 -0000 1.13
+++ video_out_internal.h 11 Nov 2002 15:20:25 -0000 1.14
@@ -30,7 +30,6 @@
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 const vo_info_t* get_info(void);
static uint32_t draw_frame(uint8_t *src[]);
static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
static void draw_osd(void);
@@ -42,10 +41,10 @@
#define LIBVO_EXTERN(x) vo_functions_t video_out_##x =\
{\
+ &info,\
preinit,\
config,\
control,\
- get_info,\
draw_frame,\
draw_slice,\
draw_osd,\
Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vo_3dfx.c 28 Aug 2002 21:32:31 -0000 1.15
+++ vo_3dfx.c 11 Nov 2002 15:20:25 -0000 1.16
@@ -30,8 +30,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN(3dfx)
-
#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
@@ -51,7 +49,7 @@
#include "fastmemcpy.h"
-static vo_info_t vo_info =
+static vo_info_t info =
{
"3dfx (/dev/3dfx)",
"3dfx",
@@ -59,6 +57,8 @@
""
};
+LIBVO_EXTERN(3dfx)
+
static uint32_t is_fullscreen = 1;
static uint32_t vidwidth;
@@ -419,12 +419,6 @@
printf("(display) 3dfx initialized %p\n",memBase1);
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static uint32_t
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vo_aa.c 6 Oct 2002 17:18:57 -0000 1.34
+++ vo_aa.c 11 Nov 2002 15:20:25 -0000 1.35
@@ -41,15 +41,15 @@
#define MESSAGE_SIZE 512
#define MESSAGE_DEKO " +++ %s +++ "
-LIBVO_EXTERN(aa)
-
- static vo_info_t vo_info = {
+ static vo_info_t info = {
"AAlib",
"aa",
"Alban Bedel <albeu at free.fr> and Folke Ashberg <folke at ashberg.de>",
""
};
+LIBVO_EXTERN(aa)
+
/* aa's main context we use */
aa_context *c;
aa_renderparams *p;
@@ -336,12 +336,6 @@
;
}
return 0;
-}
-
-static const vo_info_t*
-get_info(void) {
- /* who i am? */
- return (&vo_info);
}
static uint32_t
Index: vo_bl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_bl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vo_bl.c 8 Sep 2002 22:41:10 -0000 1.1
+++ vo_bl.c 11 Nov 2002 15:20:25 -0000 1.2
@@ -36,9 +36,7 @@
#include "../cfgparser.h"
#include "fastmemcpy.h"
-LIBVO_EXTERN (bl)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Blinkenlights driver: http://www.blinkenlights.de",
"bl",
@@ -46,6 +44,8 @@
""
};
+LIBVO_EXTERN (bl)
+
/* General variables */
static unsigned char *image = NULL;
@@ -218,10 +218,6 @@
memset(image, 0, bl->width*bl->height*3); /* blank the image */
mp_msg(MSGT_VO, MSGL_V, "vo_config bl called\n");
return 0;
-}
-
-static const vo_info_t* get_info(void) {
- return &vo_info;
}
static void draw_osd(void) {
Index: vo_dfbmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_dfbmga.c 10 Nov 2002 13:58:46 -0000 1.4
+++ vo_dfbmga.c 11 Nov 2002 15:20:25 -0000 1.5
@@ -52,15 +52,15 @@
#define min(x,y) (((x)<(y))?(x):(y))
#endif
-LIBVO_EXTERN(dfbmga)
-
-static vo_info_t vo_info = {
+static vo_info_t info = {
"DirectFB / Matrox G400",
"dfbmga",
"Ville Syrjala <syrjala at sci.fi>",
""
};
+LIBVO_EXTERN(dfbmga)
+
extern int verbose;
/******************************
@@ -464,11 +464,6 @@
}
return 0;
-}
-
-static const vo_info_t *get_info( void )
-{
- return &vo_info;
}
static void
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- vo_dga.c 6 Nov 2002 23:54:27 -0000 1.59
+++ vo_dga.c 11 Nov 2002 15:20:25 -0000 1.60
@@ -60,8 +60,6 @@
#include "../postproc/rgb2rgb.h"
#include "aspect.h"
-LIBVO_EXTERN( dga )
-
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
@@ -75,7 +73,7 @@
#include "../mp_msg.h"
-static vo_info_t vo_info =
+static vo_info_t info =
{
#ifdef HAVE_DGA2
"DGA ( Direct Graphic Access V2.0 )",
@@ -91,6 +89,8 @@
""
};
+LIBVO_EXTERN( dga )
+
//------------------------------------------------------------------
@@ -454,11 +454,6 @@
}
return 0;
};
-
-//---------------------------------------------------------
-
-static const vo_info_t* get_info( void )
-{ return &vo_info; }
//---------------------------------------------------------
Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vo_directfb.c 28 Aug 2002 21:32:32 -0000 1.23
+++ vo_directfb.c 11 Nov 2002 15:20:25 -0000 1.24
@@ -65,15 +65,15 @@
#define min(x,y) (((x)<(y))?(x):(y))
#endif
-LIBVO_EXTERN(directfb)
-
-static vo_info_t vo_info = {
+static vo_info_t info = {
"Direct Framebuffer Device",
"directfb",
"Jiri Svoboda Jiri.Svoboda at seznam.cz",
""
};
+LIBVO_EXTERN(directfb)
+
extern int verbose;
/******************************
@@ -1077,11 +1077,6 @@
}
return 0;
-}
-
-static const vo_info_t *get_info(void)
-{
- return &vo_info;
}
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_directfb2.c 10 Nov 2002 13:57:42 -0000 1.4
+++ vo_directfb2.c 11 Nov 2002 15:20:25 -0000 1.5
@@ -57,15 +57,15 @@
#endif
-LIBVO_EXTERN(directfb)
-
-static vo_info_t vo_info = {
+static vo_info_t info = {
"Direct Framebuffer Device",
"directfb",
"Jiri Svoboda Jiri.Svoboda at seznam.cz",
"v 2.0 (for DirectFB version >=0.9.13)"
};
+LIBVO_EXTERN(directfb)
+
extern int verbose;
/******************************
@@ -666,11 +666,6 @@
if (verbose) printf("DirectFB: Config finished [%ix%i] - [%ix%i]\n",out_width,out_height,width,height);
return 0;
-}
-
-static const vo_info_t *get_info(void)
-{
- return &vo_info;
}
extern void mplayer_put_key(int code);
Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_directx.c 17 Oct 2002 13:17:56 -0000 1.5
+++ vo_directx.c 11 Nov 2002 15:20:25 -0000 1.6
@@ -100,10 +100,7 @@
};
#define NUM_FORMATS (sizeof(g_ddpf) / sizeof(g_ddpf[0]))
-
-LIBVO_EXTERN(directx)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Directx DDraw YUV/RGB/BGR renderer",
"directx",
@@ -111,6 +108,7 @@
""
};
+LIBVO_EXTERN(directx)
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
unsigned char *srca, int stride)
@@ -303,12 +301,6 @@
if(g_lpddsPrimary->lpVtbl->SetClipper (g_lpddsPrimary,g_lpddclipper)!=DD_OK){mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't associate primary surface with clipper\n");return 1;}
mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>clipper succesfully created\n");
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static void uninit(void)
Index: vo_dxr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_dxr2.c 5 Nov 2002 22:45:53 -0000 1.14
+++ vo_dxr2.c 11 Nov 2002 15:20:25 -0000 1.15
@@ -25,7 +25,6 @@
#include <dxr2ioctl.h>
-LIBVO_EXTERN (dxr2)
extern char *get_path(char *filename);
@@ -134,13 +133,15 @@
{ NULL,NULL, 0, 0, 0, 0, NULL}
};
-static vo_info_t vo_info = {
+static vo_info_t info = {
"DXR2 video out",
"dxr2",
"Alban Bedel <albeu at free.fr> and Tobias Diedrich <ranma at gmx.at>",
""
};
+LIBVO_EXTERN (dxr2)
+
static char *ucodesearchpath[] = {
"/usr/local/lib/dxr2/dvd12.ux",
"/usr/lib/dxr2/dvd12.ux",
@@ -577,7 +578,7 @@
}
static int dxr2_setup_vga_params(void) {
- const vo_info_t* vi = sub_vo->get_info();
+ const vo_info_t* vi = sub_vo->info;
dxr2_vgaParams_t vga;
int loaded = dxr2_load_vga_params(&vga,(char*)vi->short_name);
@@ -793,7 +794,7 @@
}
// Does the sub vo support the x11 stuff
// Fix me : test the other x11 vo's and enable them
- if(strcmp(sub_vo->get_info()->short_name,"x11") == 0)
+ if(strcmp(sub_vo->info->short_name,"x11") == 0)
sub_vo_win = 1;
else
sub_vo_win = 0;
@@ -861,11 +862,6 @@
return VO_ERROR;
}
-static const vo_info_t* get_info(void)
-{
- return &vo_info;
-}
-
static void clear_alpha(int x0,int y0, int w,int h) {
uint8_t* src[] = { sub_img , NULL, NULL };
int stride[] = { movie_w * 3, 0, 0 };
@@ -965,7 +961,7 @@
if(use_ol) {
if (arg) {
for(n = 0 ; video_out_drivers[n] != NULL ; n++) {
- const vo_info_t* vi = video_out_drivers[n]->get_info();
+ const vo_info_t* vi = video_out_drivers[n]->info;
if(!vi)
continue;
if(strcasecmp(arg,vi->short_name) == 0)
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- vo_dxr3.c 6 Nov 2002 23:54:27 -0000 1.109
+++ vo_dxr3.c 11 Nov 2002 15:20:25 -0000 1.110
@@ -129,7 +129,7 @@
#define SPU_SUPPORT
-static vo_info_t vo_info =
+static vo_info_t info =
{
"DXR3/H+ video out",
"dxr3",
@@ -607,11 +607,6 @@
#endif
return 0;
-}
-
-static const vo_info_t* get_info(void)
-{
- return &vo_info;
}
static void draw_alpha(int x, int y, int w, int h, unsigned char* src, unsigned char *srca, int srcstride)
Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vo_fbdev.c 30 Oct 2002 17:51:13 -0000 1.74
+++ vo_fbdev.c 11 Nov 2002 15:20:25 -0000 1.75
@@ -37,15 +37,15 @@
extern vo_functions_t video_out_png;
#endif
-LIBVO_EXTERN(fbdev)
-
-static vo_info_t vo_info = {
+static vo_info_t info = {
"Framebuffer Device",
"fbdev",
"Szabolcs Berecz <szabi at inf.elte.hu>",
""
};
+LIBVO_EXTERN(fbdev)
+
extern int verbose;
#ifdef CONFIG_VIDIX
@@ -1125,11 +1125,6 @@
if (format == IMGFMT_YV12)
return ret;
return 0;
-}
-
-static const vo_info_t *get_info(void)
-{
- return &vo_info;
}
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
Index: vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vo_ggi.c 28 Aug 2002 21:32:32 -0000 1.25
+++ vo_ggi.c 11 Nov 2002 15:20:26 -0000 1.26
@@ -41,11 +41,7 @@
#undef GGI_FLIP
-#include "../libmpcodecs/mp_image.h"
-
-LIBVO_EXTERN (ggi)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"General Graphics Interface (GGI) output",
"ggi",
@@ -53,6 +49,8 @@
"under developement"
};
+LIBVO_EXTERN (ggi)
+
static struct ggi_conf_s {
char *driver;
@@ -268,11 +266,6 @@
ggi_conf.srcbpp = (ggi_conf.srcdepth+7)/8;
return(0);
-}
-
-static const vo_info_t *get_info(void)
-{
- return &vo_info;
}
static uint32_t get_image(mp_image_t *mpi)
Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_gif89a.c 6 Nov 2002 23:54:27 -0000 1.7
+++ vo_gif89a.c 11 Nov 2002 15:20:26 -0000 1.8
@@ -23,9 +23,7 @@
#define GIFWHORE_version 0.90
-LIBVO_EXTERN (gif89a)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"GIF89a (out.gif)",
"gif89a",
@@ -33,6 +31,8 @@
""
};
+LIBVO_EXTERN (gif89a)
+
extern int verbose;
extern int vo_config_count;
@@ -113,11 +113,6 @@
#endif
return 0;
-}
-
-static const vo_info_t* get_info(void)
-{
- return &vo_info;
}
/* forward declaration */
Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- vo_gl.c 27 Oct 2002 03:16:21 -0000 1.32
+++ vo_gl.c 11 Nov 2002 15:20:26 -0000 1.33
@@ -15,9 +15,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-
-LIBVO_EXTERN(gl)
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
//#include <X11/keysym.h>
@@ -30,7 +27,7 @@
#include "x11_common.h"
#include "aspect.h"
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11 (OpenGL)",
"gl",
@@ -38,6 +35,8 @@
""
};
+LIBVO_EXTERN(gl)
+
/* local data */
static unsigned char *ImageData=NULL;
@@ -243,12 +242,6 @@
saver_off(mDisplay); // turning off screen saver
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static void check_events(void)
Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vo_gl2.c 6 Nov 2002 23:54:27 -0000 1.27
+++ vo_gl2.c 11 Nov 2002 15:20:26 -0000 1.28
@@ -17,8 +17,6 @@
#include "video_out_internal.h"
#include "sub.h"
-LIBVO_EXTERN(gl2)
-
#include <X11/Xlib.h>
#include <X11/Xutil.h>
//#include <X11/keysym.h>
@@ -34,7 +32,7 @@
#define NDEBUG
//#undef NDEBUG
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11 (OpenGL) - multiple textures version",
"gl2",
@@ -42,6 +40,8 @@
""
};
+LIBVO_EXTERN(gl2)
+
/* private prototypes */
static const char * tweaks_used =
@@ -979,12 +979,6 @@
saver_off(mDisplay); // turning off screen saver
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static int gl_handlekey(int key)
Index: vo_jpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_jpeg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_jpeg.c 22 Sep 2002 18:43:53 -0000 1.7
+++ vo_jpeg.c 11 Nov 2002 15:20:26 -0000 1.8
@@ -22,9 +22,7 @@
#include "../postproc/swscale.h"
#include "../postproc/rgb2rgb.h"
-LIBVO_EXTERN (jpeg)
-
-static vo_info_t vo_info=
+static vo_info_t info=
{
"JPEG file",
"jpeg",
@@ -32,6 +30,8 @@
""
};
+LIBVO_EXTERN (jpeg)
+
#define RGB 0
#define BGR 1
@@ -102,12 +102,6 @@
}
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static uint32_t jpeg_write( uint8_t * name,uint8_t * buffer )
Index: vo_md5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_md5.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_md5.c 28 Aug 2002 21:32:32 -0000 1.13
+++ vo_md5.c 11 Nov 2002 15:20:26 -0000 1.14
@@ -22,9 +22,7 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN (md5)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"MD5 sum",
"md5",
@@ -32,6 +30,8 @@
""
};
+LIBVO_EXTERN (md5)
+
extern vo_functions_t video_out_pgm;
extern char vo_pgm_filename[24];
@@ -42,12 +42,6 @@
{
md5_file = fopen ("md5", "w");
return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format);
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static void draw_osd(void)
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vo_mga.c 9 Oct 2002 13:40:23 -0000 1.34
+++ vo_mga.c 11 Nov 2002 15:20:26 -0000 1.35
@@ -10,8 +10,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN(mga)
-
#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
@@ -22,7 +20,7 @@
#include "sub.h"
#include "aspect.h"
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Matrox G200/G4x0/G550 overlay (/dev/mga_vid)",
"mga",
@@ -30,6 +28,7 @@
"Based on some code by Aaron Holtzman <aholtzma at ess.engr.uvic.ca>"
};
+LIBVO_EXTERN(mga)
#include "mga_common.c"
@@ -81,11 +80,6 @@
}
return mga_init(width,height,format);
-}
-
-static const vo_info_t* get_info(void)
-{
- return &vo_info;
}
static void uninit(void)
Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vo_mpegpes.c 23 Oct 2002 14:39:13 -0000 1.36
+++ vo_mpegpes.c 11 Nov 2002 15:20:26 -0000 1.37
@@ -47,12 +47,10 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN (mpegpes)
-
int vo_mpegpes_fd=-1;
int vo_mpegpes_fd2=-1;
-static vo_info_t vo_info =
+static vo_info_t info =
{
#ifdef HAVE_DVB
"Mpeg-PES to DVB card",
@@ -64,6 +62,8 @@
""
};
+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)
{
@@ -142,11 +142,6 @@
return 0;
}
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
-}
static void draw_osd(void)
{
Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_null.c 6 Nov 2002 23:54:27 -0000 1.11
+++ vo_null.c 11 Nov 2002 15:20:26 -0000 1.12
@@ -29,10 +29,7 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN(null)
-
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Null video output",
"null",
@@ -40,6 +37,8 @@
""
};
+LIBVO_EXTERN(null)
+
static uint32_t image_width, image_height;
//static uint32_t
@@ -76,12 +75,6 @@
image_width = width;
image_height = height;
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static void
Index: vo_pgm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pgm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_pgm.c 28 Aug 2002 21:32:32 -0000 1.13
+++ vo_pgm.c 11 Nov 2002 15:20:26 -0000 1.14
@@ -22,9 +22,7 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN (pgm)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"PGM file",
"pgm",
@@ -32,6 +30,8 @@
""
};
+LIBVO_EXTERN (pgm)
+
static int image_width;
static int image_height;
static char header[1024];
@@ -51,12 +51,6 @@
snprintf (header, 1024, "P5\n\n%d %d\n255\n", width, height*3/2);
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
static void draw_osd(void)
Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vo_png.c 26 Oct 2002 16:05:47 -0000 1.22
+++ vo_png.c 11 Nov 2002 15:20:26 -0000 1.23
@@ -18,9 +18,7 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN (png)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"PNG file",
"png",
@@ -28,6 +26,8 @@
""
};
+LIBVO_EXTERN (png)
+
extern int verbose;
int z_compression = Z_NO_COMPRESSION;
static int framenum = 0;
@@ -60,12 +60,6 @@
if(verbose) printf("PNG Compression level %i\n", z_compression);
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vo_sdl.c 6 Nov 2002 23:54:27 -0000 1.94
+++ vo_sdl.c 11 Nov 2002 15:20:26 -0000 1.95
@@ -124,13 +124,11 @@
#include "../input/input.h"
#include "../input/mouse.h"
-LIBVO_EXTERN(sdl)
-
extern int verbose;
int sdl_noxv;
int sdl_forcexv;
-static vo_info_t vo_info =
+static vo_info_t info =
{
"SDL YUV/RGB/BGR renderer (SDL v1.1.7+ only!)",
"sdl",
@@ -138,6 +136,8 @@
""
};
+LIBVO_EXTERN(sdl)
+
#include <SDL.h>
//#include <SDL/SDL_syswm.h>
@@ -1568,12 +1568,6 @@
return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_FLIP;
}
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vo_svga.c 9 Oct 2002 23:39:36 -0000 1.54
+++ vo_svga.c 11 Nov 2002 15:20:26 -0000 1.55
@@ -72,15 +72,15 @@
static uint32_t x_pos, y_pos;
-LIBVO_EXTERN(svga)
-
-static vo_info_t vo_info = {
+static vo_info_t info = {
"SVGAlib",
"svga",
"Zoltan Mark Vician <se7en at sch.bme.hu>",
""
};
+LIBVO_EXTERN(svga)
+
static uint32_t preinit(const char *arg)
{
int i;
@@ -477,10 +477,6 @@
vga_setdisplaystart(0);
return (0);
-}
-
-static const vo_info_t* get_info(void) {
- return (&vo_info);
}
static uint32_t draw_frame(uint8_t *src[]) {
Index: vo_syncfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_syncfb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_syncfb.c 28 Aug 2002 21:32:32 -0000 1.13
+++ vo_syncfb.c 11 Nov 2002 15:20:26 -0000 1.14
@@ -34,8 +34,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN(syncfb)
-
#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
@@ -46,7 +44,7 @@
#include "fastmemcpy.h"
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Matrox G200/G400 Synchronous framebuffer (/dev/syncfb)",
"syncfb",
@@ -54,6 +52,8 @@
""
};
+LIBVO_EXTERN(syncfb)
+
/* deinterlacing on? looks only good in 50 Hz(PAL) or 60 Hz(NTSC) modes */
static int vo_conf_deinterlace = 0;
@@ -429,12 +429,6 @@
//clear the buffer
// memset(frame_mem,0x80,frame_size*2);
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- return &vo_info;
}
Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_tdfxfb.c 6 Nov 2002 23:54:27 -0000 1.21
+++ vo_tdfxfb.c 11 Nov 2002 15:20:26 -0000 1.22
@@ -45,9 +45,7 @@
#include "aspect.h"
#include "sub.h"
-LIBVO_EXTERN(tdfxfb)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"3Dfx Banshee/Voodoo3/Voodoo5",
"tdfxfb",
@@ -55,6 +53,8 @@
""
};
+LIBVO_EXTERN(tdfxfb)
+
/* Some registers on the card */
#define S2S_STRECH_BLT 2 // BLT + Strech
#define S2S_IMMED (1 << 8) // Do it immediatly
@@ -513,4 +513,3 @@
/* Dummy funcs */
static void check_events(void) {}
-static const vo_info_t* get_info(void) { return &vo_info; }
Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- vo_vesa.c 9 Oct 2002 23:13:47 -0000 1.80
+++ vo_vesa.c 11 Nov 2002 15:20:26 -0000 1.81
@@ -45,7 +45,6 @@
#include "../postproc/swscale.h"
-LIBVO_EXTERN(vesa)
#ifdef HAVE_PNG
extern vo_functions_t video_out_png;
@@ -68,7 +67,7 @@
#define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
-static vo_info_t vo_info =
+static vo_info_t info =
{
"VESA VBE 2.0 video output",
"vesa",
@@ -76,6 +75,8 @@
"Requires ROOT privileges"
};
+LIBVO_EXTERN(vesa)
+
/* driver data */
struct win_frame
@@ -985,14 +986,6 @@
}
}
return 0;
-}
-
-static const vo_info_t*
-get_info(void)
-{
- if(verbose > 2)
- printf("vo_vesa: get_info was called\n");
- return &vo_info;
}
static void
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- vo_x11.c 29 Oct 2002 20:27:47 -0000 1.123
+++ vo_x11.c 11 Nov 2002 15:20:26 -0000 1.124
@@ -8,7 +8,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN( x11 )
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -33,7 +32,7 @@
#include "../mplayer.h"
#endif
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11 ( XImage/Shm )",
"x11",
@@ -41,6 +40,8 @@
""
};
+LIBVO_EXTERN( x11 )
+
/* private prototypes */
static void Display_Image ( XImage * myximage,unsigned char *ImageData );
static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
@@ -431,9 +432,6 @@
saver_off(mDisplay);
return 0;
}
-
-static const vo_info_t* get_info( void )
-{ return &vo_info; }
static void Display_Image( XImage *myximage,uint8_t *ImageData )
{
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vo_xmga.c 1 Nov 2002 00:21:45 -0000 1.81
+++ vo_xmga.c 11 Nov 2002 15:20:26 -0000 1.82
@@ -17,7 +17,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN( xmga )
#include <sys/ioctl.h>
#include <unistd.h>
@@ -48,7 +47,7 @@
#include "../Gui/interface.h"
#endif
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)",
"xmga",
@@ -56,6 +55,9 @@
""
};
+LIBVO_EXTERN( xmga )
+
+
static XGCValues wGCV;
static uint32_t mDepth;
@@ -220,8 +222,6 @@
return 0;
}
-
-static const vo_info_t* get_info( void ){ return &vo_info; }
static void uninit(void){
mp_msg(MSGT_VO,MSGL_V,"vo: uninit!\n");
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- vo_xv.c 23 Oct 2002 00:36:55 -0000 1.126
+++ vo_xv.c 11 Nov 2002 15:20:26 -0000 1.127
@@ -25,7 +25,6 @@
#include "video_out.h"
#include "video_out_internal.h"
-LIBVO_EXTERN(xv)
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -43,7 +42,7 @@
#include "../Gui/interface.h"
#endif
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11/Xv",
"xv",
@@ -51,6 +50,8 @@
""
};
+LIBVO_EXTERN(xv)
+
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
// FIXME: dynamically allocate this stuff
@@ -447,9 +448,6 @@
saver_off(mDisplay); // turning off screen saver
return 0;
}
-
-static const vo_info_t * get_info(void)
-{ return &vo_info; }
static void allocate_xvimage(int foo)
{
Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vo_xvidix.c 6 Nov 2002 23:54:27 -0000 1.54
+++ vo_xvidix.c 11 Nov 2002 15:20:26 -0000 1.55
@@ -37,9 +37,8 @@
#include "../Gui/interface.h"
#endif
-LIBVO_EXTERN(xvidix)
-static vo_info_t vo_info =
+static vo_info_t info =
{
"X11 (VIDIX)",
"xvidix",
@@ -47,6 +46,8 @@
""
};
+LIBVO_EXTERN(xvidix)
+
#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
/* X11 related variables */
@@ -340,11 +341,6 @@
vo_config_count++;
return(0);
-}
-
-static const vo_info_t *get_info(void)
-{
- return(&vo_info);
}
static void check_events(void)
Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_yuv4mpeg.c 9 Oct 2002 22:37:27 -0000 1.12
+++ vo_yuv4mpeg.c 11 Nov 2002 15:20:26 -0000 1.13
@@ -37,9 +37,8 @@
#include "fastmemcpy.h"
#include "../postproc/rgb2rgb.h"
-LIBVO_EXTERN (yuv4mpeg)
-static vo_info_t vo_info =
+static vo_info_t info =
{
"yuv4mpeg output for mjpegtools (to \"stream.yuv\")",
"yuv4mpeg",
@@ -47,6 +46,8 @@
""
};
+LIBVO_EXTERN (yuv4mpeg)
+
static int image_width;
static int image_height;
@@ -137,11 +138,6 @@
fflush(yuv_out);
return 0;
-}
-
-static const vo_info_t* get_info(void)
-{
- return &vo_info;
}
/* Only use when h divisable by 2! */
Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_zr.c 29 Oct 2002 19:06:26 -0000 1.21
+++ vo_zr.c 11 Nov 2002 15:20:26 -0000 1.22
@@ -30,9 +30,7 @@
#include "jpeg_enc.h"
-LIBVO_EXTERN (zr)
-
-static vo_info_t vo_info =
+static vo_info_t info =
{
"Zoran ZR360[56]7/ZR36060 Driver (DC10(+)/buz/lml33/MatroxRR)",
"zr",
@@ -40,6 +38,8 @@
""
};
+LIBVO_EXTERN (zr)
+
#define ZR_MAX_DEVICES 4
/* General variables */
@@ -472,10 +472,6 @@
}
return 0;
-}
-
-static const vo_info_t* get_info(void) {
- return &vo_info;
}
static void draw_osd(void) {
More information about the MPlayer-cvslog
mailing list