make takanashi quick slide add (without edl markers) correct

This allows us to add slides without number in-between slides we want
to trigger since we are now finding correct last slide number and
verifing that we didn't make edl markers

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 07a6c11..5330b56 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -568,11 +568,19 @@ if ( -e "$media_dir/presentation.txt" ) {
 
 
 sub add_subtitle {
-       if ( ! @subtitles || $subtitles[ $#subtitles ]->[2] =~ m{\[(\d+)\]} ) {
+
+       my $last_slide;
+       foreach ( 0 .. $#subtitles ) {
+               my $i = $#subtitles - $_;
+               $last_slide = $1 if $subtitles[$i]->[2] =~ m/\[(\d+)\]/;
+               last if $last_slide;
+       }
+
+       if ( $last_slide && $subtitles[ $#subtitles ]->[2] ne '-' || ! @subtitles ) {
 
                # quick add next slide for Takahashi method presentations
                # with a lot of transitions
-               my $nr = $1 + 1;
+               my $nr = $last_slide + 1;
                my $text = "[$nr]";
                $text .= ' ' . $slide_titles[ $nr - 1 ] if defined $slide_titles[ $nr - 1 ];
                warn "add slide $text";
@@ -584,7 +592,7 @@ sub add_subtitle {
 
        print $to_mplayer qq|pause\n|;
 
-       warn "subtitles ", dump( @subtitles );
+       warn "subtitles ", dump( @subtitles ), "\nnext: [", $last_slide + 1, "]\n";
 
        focus_term;