From c07f0b3a2ef6eb9f434e5aab061d329eb10811ef Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sun, 11 Oct 2009 02:40:11 +0200 Subject: [PATCH] display preroll osd messages which me miss by a half of second or so because of keyframes (sigh!) --- bin/mplayer.pl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/mplayer.pl b/bin/mplayer.pl index ce8ece5..2fe18b5 100755 --- a/bin/mplayer.pl +++ b/bin/mplayer.pl @@ -63,11 +63,14 @@ sub focus_term { } sub preroll { - my $pos = shift; + my ( $pos, $osd ) = @_; + $osd =~ s{\W+}{ }gs; + warn "PREROLL $pos $osd\n"; + print $to_mplayer "osd_show_text \"PREROLL $osd\" ", $preroll * 1000, "\n"; my $to = $pos - $preroll; $to = 0 if $to < 0; - warn "$pos PREROLL $to\n"; print $to_mplayer "set_property time_pos $to\n"; + print $to_mplayer "get_property time_pos\n"; print $to_mplayer "play\n"; } @@ -85,7 +88,6 @@ sub repl { } -our $prop; our @subtitles; sub html5tv { @@ -204,7 +206,7 @@ sub add_subtitle { focus_mplayer; - preroll $subtitles[ $#subtitles ]->[0]; + preroll $subtitles[ $#subtitles ]->[0], $line; } sub time_pos { @@ -225,7 +227,7 @@ sub prev_subtitle { my $pos = time_pos; my $s = ( grep { $_->[0] < $pos } @subtitles )[0]; warn "<<<< subtitle ", sub_fmt $s; - preroll $s->[0]; + preroll $s->[0], $s->[2]; # print $to_mplayer "set_property time_pos $s->[0]\n"; } @@ -233,7 +235,7 @@ sub next_subtitle { my $pos = time_pos + $preroll; my $s = ( grep { $_->[0] > $pos } @subtitles )[0]; warn ">>>> subtitle ", sub_fmt $s; - preroll $s->[0]; + preroll $s->[0], $s->[2]; # print $to_mplayer "set_property time_pos $s->[0]\n"; } @@ -260,7 +262,7 @@ sub move_subtitle { my $new_start = $subtitles[$nr]->[0] += $offset; warn "subtitle $nr $pos $offset $new_start\n"; save_subtitles; - preroll $new_start; + preroll $new_start, "$pos $offset $new_start"; } ); } -- 2.20.1