mirror of https://github.com/mpv-player/mpv
code cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4494 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
420039c5f5
commit
c4d519e193
|
@ -47,8 +47,16 @@ extern int verbose;
|
||||||
|
|
||||||
extern vo_functions_t video_out_vesa;
|
extern vo_functions_t video_out_vesa;
|
||||||
|
|
||||||
|
static void vlvo_query_vaa(vo_vaa_t *vaa)
|
||||||
|
{
|
||||||
|
memset(vaa,0,sizeof(vo_vaa_t));
|
||||||
|
}
|
||||||
|
|
||||||
int vlvo_preinit(const char *drvname)
|
int vlvo_preinit(const char *drvname)
|
||||||
{
|
{
|
||||||
|
printf("vesa_lvo: This branch is no longer supported.\n"
|
||||||
|
"vesa_lvo: Please use -vo vesa:vidix instead\n");
|
||||||
|
return -1;
|
||||||
if(verbose > 1) printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname);
|
if(verbose > 1) printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname);
|
||||||
lvo_handler = open(drvname,O_RDWR);
|
lvo_handler = open(drvname,O_RDWR);
|
||||||
if(lvo_handler == -1)
|
if(lvo_handler == -1)
|
||||||
|
@ -62,6 +70,7 @@ int vlvo_preinit(const char *drvname)
|
||||||
video_out_vesa.flip_page=vlvo_flip_page;
|
video_out_vesa.flip_page=vlvo_flip_page;
|
||||||
video_out_vesa.draw_osd=vlvo_draw_osd;
|
video_out_vesa.draw_osd=vlvo_draw_osd;
|
||||||
video_out_vesa.query_format=vlvo_query_info;
|
video_out_vesa.query_format=vlvo_query_info;
|
||||||
|
video_out_vesa.query_vaa=vlvo_query_vaa;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,6 +79,9 @@ int vlvo_init(unsigned src_width,unsigned src_height,
|
||||||
unsigned dst_height,unsigned format,unsigned dest_bpp)
|
unsigned dst_height,unsigned format,unsigned dest_bpp)
|
||||||
{
|
{
|
||||||
size_t i,awidth;
|
size_t i,awidth;
|
||||||
|
printf("vesa_lvo: This branch is no longer supported.\n"
|
||||||
|
"vesa_lvo: Please use -vo vesa:vidix instead\n");
|
||||||
|
return -1;
|
||||||
if(verbose > 1) printf("vesa_lvo: vlvo_init() was called\n");
|
if(verbose > 1) printf("vesa_lvo: vlvo_init() was called\n");
|
||||||
image_width = src_width;
|
image_width = src_width;
|
||||||
image_height = src_height;
|
image_height = src_height;
|
||||||
|
|
|
@ -338,11 +338,7 @@ static void flip_page(void)
|
||||||
if(!HAS_DGA()) __vbeCopyData(dga_buffer);
|
if(!HAS_DGA()) __vbeCopyData(dga_buffer);
|
||||||
flip_trigger = 0;
|
flip_trigger = 0;
|
||||||
}
|
}
|
||||||
if(vo_doublebuffering && multi_size > 1 && !lvo_name
|
if(vo_doublebuffering && multi_size > 1)
|
||||||
#ifdef CONFIG_VIDIX
|
|
||||||
&& !vidix_name
|
|
||||||
#endif
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
if((err=vbeSetDisplayStart(multi_buff[multi_idx],1)) != VBE_OK)
|
if((err=vbeSetDisplayStart(multi_buff[multi_idx],1)) != VBE_OK)
|
||||||
|
@ -400,11 +396,7 @@ static uint32_t draw_frame(uint8_t *src[])
|
||||||
if(verbose > 2)
|
if(verbose > 2)
|
||||||
printf("vo_vesa: rgb2rgb_fnc was called\n");
|
printf("vo_vesa: rgb2rgb_fnc was called\n");
|
||||||
}
|
}
|
||||||
if((!rgb2rgb_fnc || !HAS_DGA()) && !lvo_name
|
if(!rgb2rgb_fnc || !HAS_DGA()) __vbeCopyData(data);
|
||||||
#ifdef CONFIG_VIDIX
|
|
||||||
&& !vidix_name
|
|
||||||
#endif
|
|
||||||
) __vbeCopyData(data);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue