summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2009-10-17 08:36:56 +0000
committerPetter Reinholdtsen <pere@hungry.com>2009-10-17 08:36:56 +0000
commit168953e0172e3d7241654b4e7611e09e89860f62 (patch)
tree7b9c5e2a0baf1018862cbf445a6123173904096c
parent6643d8420d3af74d787f95112cff2493a8e05220 (diff)
More info on missing events. Kill vlc on exit.
-rwxr-xr-xfrikanalen/bin/scheduler12
1 files changed, 9 insertions, 3 deletions
diff --git a/frikanalen/bin/scheduler b/frikanalen/bin/scheduler
index 4ec9a36..61a03c2 100755
--- a/frikanalen/bin/scheduler
+++ b/frikanalen/bin/scheduler
@@ -51,7 +51,8 @@ for my $url (@{$listref}) {
if ($res->is_success) {
push @events, $event;
} else {
- print "error: Missing $ogvurl, not scheduling\n";
+ my $title = $event->{'title'};
+ print "error: Missing $ogvurl ($title), not scheduling\n";
}
} else {
print "Empty event: ", Dumper($event);
@@ -60,9 +61,13 @@ for my $url (@{$listref}) {
}
my $vlc = vlc_start();
+
+# Stop vlc on exit
+$SIG{EXIT} = sub { kill $vlc->{pid}; };
+
@events = sort start_order @events;
-my $seq = -1;
-while (++$seq < scalar @events) {
+my $seq = 0;
+while ($seq < scalar @events) {
my $event = $events[$seq];
my $now = time();
my $start = $event->{'start'};
@@ -82,6 +87,7 @@ while (++$seq < scalar @events) {
# something showing.
process_event($vlc, $event);
}
+ $seq++;
}
sub show_program {