Fixed out of sequence in program generation

3 files changed, 6 insertions, 7 deletions

diff --git a/frikanalen/bin/cron_update_stream_videos.sh b/frikanalen/bin/cron_update_stream_videos.sh
index 0b9a8db..531cd8d 100755
--- a/frikanalen/bin/cron_update_stream_videos.sh
+++ b/frikanalen/bin/cron_update_stream_videos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-workdir="/stream/frikanalen-bin"
+workdir="/home/jarle/svn/frikanalen-bin"
 
 cd ${workdir}
 if  [[ `pwd` == ${workdir} ]]
diff --git a/frikanalen/bin/fk-stream.sh b/frikanalen/bin/fk-stream.sh
index a24ff03..47cb828 100755
--- a/frikanalen/bin/fk-stream.sh
+++ b/frikanalen/bin/fk-stream.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-workdir="/stream/frikanalen-bin"
+workdir="/home/jarle/svn/frikanalen-bin/"
 
 cd ${workdir}
 
-if  [[ `pwd` == ${workdir} ]]
-then
 ./scheduler -s http://voip.nuug.no:8000/frikanalen.ogv > fk.log 2>&1
-fi
diff --git a/frikanalen/bin/scheduler b/frikanalen/bin/scheduler
index 0db03b3..2df090a 100755
--- a/frikanalen/bin/scheduler
+++ b/frikanalen/bin/scheduler
@@ -262,7 +262,9 @@ if ($opts{'g'}) {
 my $seq = 0;
 
 if ( $opts{"s"} ) {
-  my $programogv = generate_program();
+  my $now = time();
+  my $programogv = generate_program("fjas",$seq);
+  $programgenerationtime = (time() - $now) * 2;
   ezstream_start($opts{"s"}) ;
   while ($seq < scalar @events) {
     my $event = $events[$seq];
@@ -396,7 +398,7 @@ sub schedule_stream {
       my $nowstring = strftime("%H:%M:%S", localtime(time()));
       print "Generate pause screen for $seq (now $nowstring)\n";
       my $start = time();
-      my $programogv = generate_program();
+      my $programogv = generate_program("fjas",$seq);
       my $stop = time();
       $nowstring = strftime("%H:%M:%S", localtime(time()));
       print "Done generating pause screen DV (now $nowstring)\n";