added @to_mplayer command queue

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index ffc4d49..59dc3f1 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -71,8 +71,8 @@ our $prop = {};
 my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
         'mplayer',
                '-slave', '-idle',
-               '-quiet',
-               '-msglevel', 'demux=9', '-msgmodule',
+#              '-quiet',
+#              '-msglevel', 'demux=9', '-msgmodule',
                '-edlout', $edl,
                '-osdlevel', 3,
                '-vf' => 'screenshot',
@@ -81,7 +81,7 @@ my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
 my $select = IO::Select->new();
 #$select->add( \*STDIN );
 $select->add( $from_mplayer );
-$select->add( $err_mplayer );
+#$select->add( $err_mplayer );
 
 sub load_subtitles;
 
@@ -274,7 +274,7 @@ sub html5tv {
 
                        $im->Resize( width => $w, height => $h, filter => 13, blur => 0.9 );
 
-                       my $c = $h / 10;
+                       my $c = 1; # $h / 10;
                        my %info = (
                                font => 'Sans', pointsize => $h / 10,
                                #text => "$factor = $w*$h",
@@ -492,6 +492,8 @@ sub t_srt {
        return $srt;
 }
 
+my @to_mplayer;
+
 sub save_subtitles {
 
        html5tv || return;
@@ -509,9 +511,11 @@ sub save_subtitles {
        write_file $subtitles, $srt;
        YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles;
 
-       print $to_mplayer "sub_remove\n";
-       print $to_mplayer qq|sub_load "$subtitles"\n|;
-       print $to_mplayer "sub_select 1\n";
+       push @to_mplayer
+               , "sub_remove\n"
+               , qq|sub_load "$subtitles"\n|
+               , "sub_select 1\n"
+               ;
 }
 
 sub load_subtitles {
@@ -621,23 +625,14 @@ my $slides = HTML5TV::Slides->new(
        }
 );
 
-print $to_mplayer "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
-
-my $t = time;
-
-while ( my $line = <$from_mplayer> ) {
-
-#warn "### $line\n";
 
-       my $dt = time - $t;
-#warn "dt $dt\n";
-       if ( abs($dt) > 0.7 ) {
-               $slides->show( $pos );
-               $t = time;
-       }
+sub from_mplayer {
+       my $line = shift;
 
-       if ( $line =~ m{DEMUX.+pts=(\d+\.\d+)} ) {
-               $pos = $1 if $1 > 0.2; # mplayer demuxer report fake position while seeking
+       if ( $line =~ m{V:\s+(\d+\.\d+)\s+} ) {
+               $pos = $1;
+               print "$pos\r";
+#              $pos = $1 if $1 > 0.2; # mplayer demuxer report fake position while seeking
        } elsif ( $line =~ m{Exiting} ) {
                exit;
        } elsif ( $line =~ m{ANS_(\w+)=(\S+)} ) {
@@ -685,3 +680,39 @@ while ( my $line = <$from_mplayer> ) {
 
 }
 
+push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
+
+my $t = time;
+my $line;
+
+while ( 1 ) {
+
+       my $dt = time - $t;
+       if ( abs($dt) > 0.7 ) {
+warn "dt $dt\n";
+               $slides->show( $pos );
+               $t = time;
+       }
+
+       foreach my $fd ( $select->can_read(0.1) ) {
+               if ( $fd == $from_mplayer ) {
+                       my $ch;
+                       sysread $from_mplayer, $ch, 1;
+                       if ( $ch =~ m{[\n\r]} ) {
+                               from_mplayer $line;
+                               $line = '';
+                       } else {
+                               $line .= $ch;
+                       }
+               } else {
+                       warn "unknown fd $fd";
+               }
+       }
+
+       if ( my $cmd = shift @to_mplayer ) {
+               warn ">>>> $cmd\n";
+               print $to_mplayer $cmd;
+       }
+
+}
+