From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 13 Oct 2009 15:30:50 +0000 (+0200)
Subject: warn about mising slides hints in subtities
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=ce1f1ef642815981cb4797b9bfa0b23f0d9bf6a0;p=HTML5TV.git

warn about mising slides hints in subtities
---

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index a1c89c3..a12309e 100755
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -165,6 +165,8 @@ sub html5tv {
 
 	my ( $slide_width, $slide_height );
 
+	my @slides_hires = glob 'www/media/s/hires/p*.jpg';
+
 	foreach my $factor ( 4, 2, 1 ) {
 		my $w = $prop->{width}  / $factor;
 		my $h = $prop->{height} / $factor;
@@ -175,7 +177,7 @@ sub html5tv {
 			mkdir $path;
 			warn "created $path\n";
 
-			foreach my $hires ( glob 'www/media/s/hires/p*.jpg' ) {
+			foreach my $hires ( @slides_hires ) {
 
 				my $file = $hires;
 				$file =~ s{^.+/(p\d+\.\w)}{$path/$1};
@@ -232,22 +234,22 @@ sub html5tv {
 		)
 	;
 
-	my $index = 1;
-
 	sub customEvents_sorted {
-		sort { $a->{startTime} <=> $b->{startTime} }
-		@{ $html5tv->{sync}->{customEvents} }
-	}
-		
 
-	foreach my $e (
+		if ( ref $html5tv->{sync}->{customEvents} ne 'ARRAY' ) {
+			my $max = 
+			warn "ERROR: no slide markers [1] .. [", scalar @slides_hires, "] in subtitles\n";
+			return;
+		}
+
 		sort { $a->{startTime} <=> $b->{startTime} }
 		@{ $html5tv->{sync}->{customEvents} }
-	) {
-		$e->{args}->{index} = $index++;
-		warn "e = ", dump $e;
 	}
 
+	my $index = 1;
+
+	$_->{args}->{index} = $index++ foreach customEvents_sorted;
+
 	warn "last customEvent $index\n";
 
 	$html5tv->{subtitles_table}
@@ -276,7 +278,7 @@ sub html5tv {
 		}
 	}
 
-	warn "html5tv ", dump $html5tv;
+	warn "# html5tv ", dump $html5tv;
 
 	my $sync_path = 'www/media/video.js';
 	write_file $sync_path, "var html5tv = " . to_json($html5tv) . " ;\n";