Mercurial > mplayer.hg
changeset 25884:f6697d25b040
More places that should use SEEK_ABSOLUTE / SEEK_FACTOR
| author | reimar |
|---|---|
| date | Tue, 29 Jan 2008 16:22:34 +0000 |
| parents | baf32110d3fc |
| children | fa24feceb3f9 |
| files | command.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/command.c Tue Jan 29 15:11:38 2008 +0000 +++ b/command.c Tue Jan 29 16:22:34 2008 +0000 @@ -344,7 +344,7 @@ demuxer_get_percent_pos(mpctx->demuxer)); } - abs_seek_pos = 3; + abs_seek_pos = SEEK_ABSOLUTE | SEEK_FACTOR; rel_seek_secs = pos / 100.0; return M_PROPERTY_OK; } @@ -359,7 +359,7 @@ case M_PROPERTY_SET: if(!arg) return M_PROPERTY_ERROR; M_PROPERTY_CLAMP(prop, *(double*)arg); - abs_seek_pos = 1; + abs_seek_pos = SEEK_ABSOLUTE; rel_seek_secs = *(double*)arg; return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: @@ -429,7 +429,7 @@ &next_pts, &chapter_num, &chapter_name); if (chapter >= 0) { if (next_pts > -1.0) { - abs_seek_pos = 1; + abs_seek_pos = SEEK_ABSOLUTE; rel_seek_secs = next_pts; } if (chapter_name) @@ -2310,13 +2310,13 @@ v = cmd->args[0].v.f; abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; if (abs == 2) { /* Absolute seek to a specific timestamp in seconds */ - abs_seek_pos = 1; + abs_seek_pos = SEEK_ABSOLUTE; if (sh_video) mpctx->osd_function = (v > sh_video->pts) ? OSD_FFW : OSD_REW; rel_seek_secs = v; } else if (abs) { /* Absolute seek by percentage */ - abs_seek_pos = 3; + abs_seek_pos = SEEK_ABSOLUTE | SEEK_FACTOR; if (sh_video) mpctx->osd_function = OSD_FFW; // Direction isn't set correctly rel_seek_secs = v / 100.0;