RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 20:31:37 +00:00
Code Issues Releases Wiki Activity

Number of frames to show the OSD shouldn't be hardcoded, derive from fps instead

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16930 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ranma 2005-11-06 14:44:49 +00:00
parent d4dd22f383
commit 649712e405
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mplayer.c
View File

@ -2859,7 +2859,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
case MP_CMD_SEEK : { case MP_CMD_SEEK : {
float v; float v;
int abs; int abs;
osd_show_percentage = 25; osd_show_percentage = sh_video->fps;
v = cmd->args[0].v.f; v = cmd->args[0].v.f;
abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
if(abs==2) { /* Absolute seek to a specific timestamp in seconds */ if(abs==2) { /* Absolute seek to a specific timestamp in seconds */
@ -2898,7 +2898,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
case MP_CMD_AUDIO_DELAY : { case MP_CMD_AUDIO_DELAY : {
float v = cmd->args[0].v.f; float v = cmd->args[0].v.f;
audio_delay += v; audio_delay += v;
osd_show_av_delay = 9; osd_show_av_delay = sh_video->fps/2;
if(sh_audio) sh_audio->delay+= v; if(sh_audio) sh_audio->delay+= v;
} break; } break;
case MP_CMD_SPEED_INCR : { case MP_CMD_SPEED_INCR : {
@ -2994,7 +2994,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
sub_delay = v; sub_delay = v;
else else
sub_delay += v; sub_delay += v;
osd_show_sub_delay = 9; // show the subdelay in OSD osd_show_sub_delay = sh_video->fps/2; // show the subdelay in OSD
} }
#endif #endif
} break; } break;
@ -3003,7 +3003,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if (sh_video) { if (sh_video) {
int movement = cmd->args[0].v.i; int movement = cmd->args[0].v.i;
step_sub(subdata, sh_video->pts, movement); step_sub(subdata, sh_video->pts, movement);
osd_show_sub_delay = 9; // show the subdelay in OSD osd_show_sub_delay = sh_video->fps/2; // show the subdelay in OSD
} }
#endif #endif
} break; } break;
@ -3023,7 +3023,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
/* Show OSD state when disabled, but not when an explicit /* Show OSD state when disabled, but not when an explicit
argument is given to the osd command, i.e. in slave mode. */ argument is given to the osd command, i.e. in slave mode. */
if (v == -1 && osd_level <= 1) if (v == -1 && osd_level <= 1)
osd_show_status = 9; osd_show_status = sh_video->fps/2;
} }
#endif #endif
} break; } break;
@ -3274,7 +3274,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(v < 0){ if(v < 0){
frame_dropping = (frame_dropping+1)%3; frame_dropping = (frame_dropping+1)%3;
#ifdef USE_OSD #ifdef USE_OSD
osd_show_framedropping=10; osd_show_framedropping=sh_video->fps/2;
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
#endif #endif
} }
@ -3424,7 +3424,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(video_out && vo_config_count) { if(video_out && vo_config_count) {
video_out->control(VOCTRL_ONTOP, 0); video_out->control(VOCTRL_ONTOP, 0);
#ifdef USE_OSD #ifdef USE_OSD
osd_show_ontop=10; osd_show_ontop=sh_video->fps/2;
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
#endif #endif
} }
@ -3435,7 +3435,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(video_out && vo_config_count) { if(video_out && vo_config_count) {
video_out->control(VOCTRL_ROOTWIN, 0); video_out->control(VOCTRL_ROOTWIN, 0);
#ifdef USE_OSD #ifdef USE_OSD
osd_show_rootwin=10; osd_show_rootwin=sh_video->fps/2;
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
#endif #endif
} }
@ -3473,7 +3473,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
if(sub_pos >100) sub_pos=100; if(sub_pos >100) sub_pos=100;
if(sub_pos <0) sub_pos=0; if(sub_pos <0) sub_pos=0;
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
osd_show_sub_pos = 9; osd_show_sub_pos = sh_video->fps/2;
} }
#endif #endif
} break; } break;
@ -3485,7 +3485,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
sub_alignment = cmd->args[0].v.i; sub_alignment = cmd->args[0].v.i;
else else
sub_alignment = (sub_alignment+1) % 3; sub_alignment = (sub_alignment+1) % 3;
osd_show_sub_alignment = 9; osd_show_sub_alignment = sh_video->fps/2;
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
} }
#endif #endif
@ -3495,7 +3495,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
#ifdef USE_SUB #ifdef USE_SUB
if (sh_video) { if (sh_video) {
sub_visibility=1-sub_visibility; sub_visibility=1-sub_visibility;
osd_show_sub_visibility = 9; // show state of subtitle visibility in OSD osd_show_sub_visibility = sh_video->fps/2; // show state of subtitle visibility in OSD
vo_osd_changed(OSDTYPE_SUBTITLE); vo_osd_changed(OSDTYPE_SUBTITLE);
} }
#endif #endif
@ -3763,7 +3763,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavEvent,dvd_nav_text); mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavEvent,dvd_nav_text);
//osd_show_dvd_nav_delay = 60; //osd_show_dvd_nav_delay = 60;
osd_show_dvd_nav_highlight=1; osd_show_dvd_nav_highlight=sh_video->fps/2;
osd_show_dvd_nav_sx=hevent->sx; osd_show_dvd_nav_sx=hevent->sx;
osd_show_dvd_nav_ex=hevent->ex; osd_show_dvd_nav_ex=hevent->ex;
osd_show_dvd_nav_sy=hevent->sy; osd_show_dvd_nav_sy=hevent->sy;