Mercurial > mplayer.hg
diff libvo/vo_dxr2.c @ 8148:5b39e79af5fe
removed get_info, using the same sheme as in libmpcodecs instead
| author | alex |
|---|---|
| date | Mon, 11 Nov 2002 15:22:10 +0000 |
| parents | 2406eb28a601 |
| children | 57bdcdb061d7 |
line wrap: on
line diff
--- a/libvo/vo_dxr2.c Mon Nov 11 14:26:07 2002 +0000 +++ b/libvo/vo_dxr2.c Mon Nov 11 15:22:10 2002 +0000 @@ -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@free.fr> and Tobias Diedrich <ranma@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)