annotate empty slides from presentation.txt

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index b4f3721..538828c 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -18,6 +18,7 @@ use lib 'lib';
 use HTML5TV::Slides;
 
 my $debug = $ENV{DEBUG} || 0;
+my $generate = $ENV{GENERATE} || 0;
 
 my $movie = shift @ARGV;
 
@@ -32,7 +33,7 @@ if ( ! $movie && -e 'media/_editing' ) {
 } elsif ( -f $movie && $movie =~ m{\.og[vg]$}i ) {
        my $movie_master = $movie;
        $movie = base_dir($movie) . '/video.ogv';
-       unlink $movie if -e $movie;
+       unlink $movie;
        symlink base_name($movie_master), $movie;
        warn "symlink video.ogv -> $movie_master";
 } else {
@@ -63,7 +64,7 @@ our $from_mplayer;
 our $err_mplayer;
 our $prop = {};
 
-my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
+my @mplayer_command = (
         'mplayer',
                '-slave', '-idle',
 #              '-quiet',
@@ -73,6 +74,10 @@ my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
                '-vf' => 'screenshot',
 );
 
+push @mplayer_command, qw/ -vo null -ao null / if $generate;
+
+my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer, @mplayer_command );
+
 my $select = IO::Select->new();
 #$select->add( \*STDIN );
 $select->add( $from_mplayer );
@@ -246,6 +251,8 @@ sub html5tv {
                mkdir $path;
        }
 
+       my $max_slide_height = 480; # XXX
+
        foreach my $hires ( @slides_hires ) {
 
                my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( $hires );
@@ -263,10 +270,8 @@ sub html5tv {
                        my $file = slide_jpg( $factor => $nr );
                        next if -e $file;
 
-                       $min_slide_height = $prop->{height} if $prop->{height} > $min_slide_height;
-
-                       my $w = int( $min_slide_height / $factor * $slide_aspect );
-                       my $h = int( $min_slide_height / $factor );
+                       my $w = int( $max_slide_height / $factor * $slide_aspect );
+                       my $h = int( $max_slide_height / $factor );
 
                        warn "slide [$nr] $hires -> ${w}x${h} $file\n";
 
@@ -419,7 +424,8 @@ sub html5tv {
        $html =~ s{media/_editing}{media/$media_part}gs;
        write_file "www/$media_part.html", $html;
 
-       my $carousel_width = $prop->{width} + $slide_width - 80;
+       # video + full-sized slide on right
+       my $carousel_width = $prop->{width} + ( $slide_width * $slide_factor );
        $carousel_width -= $carousel_width % ( $slide_width + 6 ); # round to full slide
        my $carousel_height =   $slide_height + 2;
 
@@ -540,6 +546,8 @@ sub save_subtitles {
                ;
 }
 
+sub annotate_subtitles;
+
 sub load_subtitles {
        if ( ! -e "$subtitles.yaml" ) {
                warn "no subtitles $subtitles to load\n";
@@ -547,6 +555,7 @@ sub load_subtitles {
        }
        @subtitles = YAML::LoadFile "$subtitles.yaml";
        warn "subtitles ", dump @subtitles;
+       annotate_subtitles;
        save_subtitles;
 }
 
@@ -561,7 +570,7 @@ sub edit_subtitles {
 my @slide_titles;
 if ( -e "$media_dir/presentation.txt" ) {
        my $slides = read_file "$media_dir/presentation.txt";
-       my @s = map { [ split(/[\n\r]+/, $_) ] } split(/\f/, $slides);
+       my @s = ( map { [ split(/[\n\r]+/, $_) ] } split(/\f/, $slides) );
 
        my $slide_line = 0;
        $slide_line++ if $s[1]->[$slide_line] eq $s[2]->[$slide_line]; # skip header
@@ -570,7 +579,19 @@ if ( -e "$media_dir/presentation.txt" ) {
                push @slide_titles, $s->[$slide_line];
        }
 
-       warn "# slides titles ", dump @slide_titles;
+       warn "# slides titles ", dump(@slide_titles);
+}
+
+sub annotate_subtitles {
+       return unless @slide_titles;
+       foreach my $s ( @subtitles ) {
+               if ( $s->[2] =~ m{^[(\d+)\]$} ) {
+                       if ( my $title = $slide_titles[ $1 - 1 ] ) {
+                               $s->[2] = "[$1] " . substr($title,0,40);
+                               warn "annotated [$1] $title\n";
+                       }
+               }
+       }
 }
 
 
@@ -733,6 +754,8 @@ sub from_mplayer {
 
                warn "slide $nr from video $pos file $shot\n";
                save_subtitles;
+       } elsif ( $line =~ m{File not found} ) {
+               die $line;
        } else {
                warn "IGNORE $line";
        }
@@ -744,6 +767,8 @@ push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metada
 my $t = time;
 my $line;
 
+push @to_mplayer, 'pause' if $generate;
+
 while ( 1 ) {
 
        my $dt = time - $t;
@@ -773,5 +798,9 @@ while ( 1 ) {
                print $to_mplayer $cmd;
        }
 
+       if ( $generate && html5tv() ) {
+               warn "generated\n";
+               exit;
+       }
 }