changes according to OSD calculations

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1728 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atlka 2001-08-28 14:22:37 +00:00
parent 60737e3845
commit 7e4dac5d3d
2 changed files with 10 additions and 13 deletions

View File

@ -34,8 +34,8 @@ int vo_osd_progbar_value=100; // 0..256
// if we have n=256 bars then OSD progbar looks like below // if we have n=256 bars then OSD progbar looks like below
// //
// 0 1 2 3 ... 256 <= vo_osd_progbar_value // 0 1 2 3 ... 256 <= vo_osd_progbar_value
// | | | | | // | | | | |
// [ === === === ... === ] // [ === === === ... === ]
// //
// the above schema is rescalled to n=elems bars // the above schema is rescalled to n=elems bars
@ -56,12 +56,9 @@ inline static void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x
if (vo_osd_progbar_value<=0) if (vo_osd_progbar_value<=0)
mark=0; mark=0;
else { else if ((mark=(vo_osd_progbar_value*elems)>>8)>elems)
int mm=vo_osd_progbar_value*elems; mark=elems;
mark=mm>>8;
if (mm & 0x00FF) mark++;
if (mark>elems) mark=elems;
}
// printf("osd.progbar width=%d xpos=%d\n",width,x); // printf("osd.progbar width=%d xpos=%d\n",width,x);
c=vo_osd_progbar_type; c=vo_osd_progbar_type;

View File

@ -1759,11 +1759,11 @@ if(rel_seek_secs || abs_seek_pos){
// Set OSD: // Set OSD:
if(osd_level){ if(osd_level){
int len=((demuxer->movi_end-demuxer->movi_start)>>8); int len=((demuxer->movi_end-demuxer->movi_start)>>8);
if(len>0){ if (len>0){
osd_visible=sh_video->fps; // 1 sec osd_visible=sh_video->fps; // 1 sec
vo_osd_progbar_type=0; vo_osd_progbar_type=0;
vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len; vo_osd_progbar_value=(demuxer->filepos-demuxer->movi_start)/len;
} }
} }
#endif #endif