atlka@pg.gda.pl:

utf8 opion corrected
added draw_osd() funcion to libvo/vo_*.c files
corrected indicators (brightness, sound etc.) to be in 0..100 range
if we have Name.utf file it automatically switches to utf8 mode


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1503 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atlka 2001-08-13 11:33:34 +00:00
parent ca99c8dc89
commit 8a50a66922
4 changed files with 9 additions and 29 deletions

View File

@ -187,35 +187,6 @@ inline static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,in
memy-=vo_font->height;
xsize=lastxsize=-vo_font->charspace;
}
xsize+=w+vo_font->charspace;
if ((dxs<xsize && lastStripPosition>0) || j==len-1)
{
if (j==len-1) lastStripPosition=len;
else xsize=lastxsize;
j=lastStripPosition;
x=dxs/2-xsize/2;
for(k=previousStrip;k<lastStripPosition;k++){
int c=text[k];
int font;
if (sub_unicode && (c>=0x80)) c=(c<<8)+text[++k];
font=vo_font->font[c];
if(x>=0 && x+vo_font->width[c]<dxs)
if(font>=0)
draw_alpha(x,y,
vo_font->width[c],
vo_font->pic_a[font]->h,
vo_font->pic_b[font]->bmp+vo_font->start[c],
vo_font->pic_a[font]->bmp+vo_font->start[c],
vo_font->pic_a[font]->w);
x+=vo_font->width[c]+vo_font->charspace;
}
x=0;
y+=vo_font->height;
previousStrip=lastStripPosition;
xsize=lastxsize=-vo_font->charspace;
}
}
}

View File

@ -25,6 +25,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
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);
static void flip_page(void);
static void check_events(void);
static void uninit(void);

View File

@ -137,6 +137,10 @@ typedef struct
DWORD dwChunkLength; // Length of chunk
} AVIINDEXENTRY;
static void draw_osd(void)
{
}
static void
flip_page(void)
{

View File

@ -58,6 +58,10 @@ get_info(void)
return &vo_info;
}
static void draw_osd(void)
{
}
static void flip_page (void)
{
FILE * f;