added presentation.pdf symlinks

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index e5d4289..806820d 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -3,6 +3,8 @@
 use warnings;
 use strict;
 
+use autodie;
+
 use IPC::Open3 qw(open3);
 use IO::Select;
 use Data::Dump qw(dump);
@@ -30,7 +32,7 @@ if ( ! $movie && -e 'media/_editing' ) {
        warn "using media/_editing -> $movie\n";
 } elsif ( -d $movie && $movie =~ m{media/} ) {
        $movie .= '/video.ogv';
-} elsif ( -f $movie && $movie =~ m{\.og[vg]$}i ) {
+} elsif ( -f $movie && $movie =~ m{\.og[vg]\b}i ) {
        my $movie_master = $movie;
        $movie = base_dir($movie) . '/video.ogv';
        unlink $movie;
@@ -227,21 +229,6 @@ sub html5tv {
                push @slide_t, $s->[0];
        }
 
-       if ( @frames ) {
-               rmdir $_ foreach glob "$media_dir/s/[124]";
-               my $hires = "$media_dir/s/hires";
-               mkdir $hires unless -e $hires;
-
-               oggThumb $movie, "$hires/.f%.jpg", map { $_->[0] } @frames;
-
-               foreach my $i ( 0 .. $#frames ) {
-                       my $from = "$hires/.f$i.jpg";
-                       my $to   = "$hires/f" . $frames[$i]->[1] . '.jpg';
-                       rename $from, $to || warn "can't rename $from -> $to: $!";
-               }
-
-       }
-
        foreach ( 0 .. $#slide_t ) {
                my $slide_nr = $_ + 1;
                push @{ $sync->{htmlEvents}->{'#slide'} }, {
@@ -251,16 +238,44 @@ sub html5tv {
                };
        }
 
-       my @slides_hires = glob "$media_dir/s/hires/*";
 
-       my $path = "$media_dir/s";
+       my $max_slide_height = 480; # XXX
+
+       my $path  = "$media_dir/s";
+       my $hires = "$media_dir/s/hires";
 
        if ( ! -d $path ) {
-               warn "create slides images in $path";
+               warn "create slides in $path";
                mkdir $path;
+               mkdir $hires;
+
+               my $path = "$media_dir/presentation.pdf";
+               $path = $media_dir . '/' . readlink($path) if -l $path;
+
+               if ( -e $path ) {
+                       warn "render pdf slides from $path\n";
+                       system "pdftoppm -png -r 100 $path $hires/p";
+               }
        }
 
-       my $max_slide_height = 480; # XXX
+
+       if ( @frames ) {
+               warn "create slides from video frames";
+               rmdir $_ foreach glob "$media_dir/s/[124]";
+
+               oggThumb $movie, "$hires/.f%.jpg", map { $_->[0] } @frames;
+
+               foreach my $i ( 0 .. $#frames ) {
+                       my $from = "$hires/.f$i.jpg";
+                       my $to   = "$hires/f" . $frames[$i]->[1] . '.jpg';
+                       rename $from, $to || warn "can't rename $from -> $to: $!";
+               }
+
+       }
+
+
+       my @slides_hires = glob "$hires/*";
+
 
        foreach my $hires ( @slides_hires ) {
 
@@ -557,7 +572,16 @@ sub load_subtitles {
 sub edit_subtitles {
        print $to_mplayer qq|pause\n|;
        focus_term;
-       system( qq|vi "$subtitles.yaml"| ) == 0 and load_subtitles;
+       my $line = 1;
+       my $jump_to = 1;
+       open( my $fh, '<', "$subtitles.yaml" ) || die $1;
+       while(<$fh>) {
+               last if /^-\s([\d\.]+)/ && $1 > $pos;
+               $jump_to = $line - 1 if /^---/;
+               $line++;
+       }
+       close($fh);
+       system( qq|vi +$jump_to "$subtitles.yaml"| ) == 0 and load_subtitles;
        focus_mplayer;
 }
 
@@ -757,7 +781,16 @@ sub from_mplayer {
 
 }
 
-push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
+my @mplayer_prop = ( qw/metadata video_codec video_bitrate width height fps/ );
+warn "XXX $movie\n";
+if ( my $l = `oggLength $movie` ) {
+       $l = $l / 1000;
+       $prop->{length} = $l;
+       warn "$movie length ", fmt_mmss( $l );
+}
+push @mplayer_prop, 'length' unless $prop->{length};
+
+push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } @mplayer_prop;
 
 my $t = time;
 my $line;