diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-26 22:10:25 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-26 22:10:25 +0000 |
commit | 67f6da0702f10765324de68719be3133b3d05e2a (patch) | |
tree | 6c93f8604dfadaaeee7d9f11f1a83bac84204f1e | |
parent | efe401c879f3dc98d136733ee119148e4b00baad (diff) | |
download | mpv-67f6da0702f10765324de68719be3133b3d05e2a.tar.bz2 mpv-67f6da0702f10765324de68719be3133b3d05e2a.tar.xz |
-ss patch by Loring Holden
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@652 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-mplayer.h | 2 | ||||
-rw-r--r-- | libvo/x11_common.c | 2 | ||||
-rw-r--r-- | mplayer.c | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 9556300ad4..2b635e1daf 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -58,7 +58,7 @@ struct config conf[]={ {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1}, {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0}, {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0}, -// {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, + {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0}, {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1}, {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0}, {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0}, diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 67b0596d09..1237a66a52 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -92,6 +92,8 @@ void vo_x11_putkey(int key){ case wsSpace: mplayer_put_key(' '); break; case wsEscape: mplayer_put_key(KEY_ESC); break; case wsEnter: mplayer_put_key(KEY_ENTER); break; + case wsPageUp: mplayer_put_key(KEY_PAGE_UP); break; + case wsPageDown: mplayer_put_key(KEY_PAGE_DOWN); break; case wsq: case wsQ: mplayer_put_key('q'); break; case wsp: @@ -1668,6 +1668,11 @@ switch(sh_video->codec->driver){ case KEY_DOWN: osd_function=OSD_REW; rel_seek_secs-=60;break; + // seek 10 min + case KEY_PAGE_UP: + rel_seek_secs+=600;break; + case KEY_PAGE_DOWN: + rel_seek_secs-=600;break; // delay correction: case '+': buffer_delay+=0.1; // increase audio buffer delay @@ -1715,6 +1720,10 @@ switch(sh_video->codec->driver){ mixer_usemaster=!mixer_usemaster; break; } + if (seek_to_sec) { + rel_seek_secs += seek_to_sec; + seek_to_sec = 0; + } if(rel_seek_secs) if(file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){ printf("Can't seek in raw .AVI streams! (index required, try with the -idx switch!) \n"); |