From 35fadb3a6f3b3c7463abc8b68178a96216cda921 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 20 Jan 2008 08:02:35 +0000
Subject: * AUTOTIMER: Fix show matched title * Tools: refactoring date
 function * Skins stone/stone_flat/deltab - rdisplay failed on short
 recordings (Illegal division by zero)

---
 skins/deltab/rdisplay.tmpl     | 36 ++++++++++++++++++++----------------
 skins/deltab/rlist.tmpl        |  4 ----
 skins/stone/rdisplay.tmpl      | 40 ++++++++++++++++++++++------------------
 skins/stone/rlist.tmpl         |  2 --
 skins/stone_flat/rdisplay.tmpl | 36 ++++++++++++++++++++----------------
 skins/stone_flat/rlist.tmpl    |  2 --
 6 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index ff8c4ec..2a7594e 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -34,10 +34,8 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <br /><?% gettext("Duration") %?>: <?% PROCESS hfs %?>
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK image %?>
 						<?% IF files.size %?>
@@ -69,24 +67,30 @@
     <tr>
         <?%- 
              multi=1;
-             window = 900;
-             ticks = 0;
-             WHILE ticks <= 3 or ticks >= 8;
-               ticks = (data.Duration div window) + 1;
-               IF ticks >= 8;
-                 window = window * 2; 
-               ELSIF ticks <= 3;
-                 IF    window == 900;window = 600;
-                 ELSIF window == 600;window = 300;
-                 ELSIF window == 300;window = 150;
-                 ELSIF window == 150;window = 60;
-                 ELSE; window = window / 2; 
+             IF data.Duration;
+               window = 900;
+               ticks = 0;
+               WHILE (ticks <= 3 or ticks >= 8) && window > 15;
+                 ticks = (data.Duration div window) + 1;
+                 IF ticks >= 8;
+                   window = window * 2; 
+                 ELSIF ticks <= 3;
+                   IF    window == 900;window = 600;
+                   ELSIF window == 600;window = 300;
+                   ELSIF window == 300;window = 150;
+                   ELSIF window == 150;window = 60;
+                   ELSE; window = window / 2; 
+                   END;
                  END;
                END;
              END;
              
-             IF window <= 15;
-             multi=60;
+             IF window <= 300;
+              multi=60;
+             END;
+             IF window <= 15 or ticks < 1;
+              ticks = 1;
+              window = 15;
              END;
              cols = 0; 
              WHILE cols < ticks; 
diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl
index 748bbed..644ba35 100644
--- a/skins/deltab/rlist.tmpl
+++ b/skins/deltab/rlist.tmpl
@@ -21,22 +21,18 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK durMin # d in Minuten%?>
-<?% IF d > 1 %?>
     <?% Stunden = d div 60 %?>
     <?% Minuten = d mod 60 %?>
     <?% Sekunden = ( d * 60 ) mod 60 %?>
     <br />Dauer: <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
     <br />Dauer: <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% total = 0 %?>
 <?% BLOCK printsumme %?>
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index d2a19b7..5565423 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -40,10 +40,8 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <br /><?% gettext("Duration") %?>: <?% PROCESS hfs %?>
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK image %?>
 <?% IF files.size %?>
@@ -122,24 +120,30 @@
     <tr>
         <?%- 
              multi=1;
-             window = 900;
-             ticks = 0;
-             WHILE ticks <= 3 or ticks >= 8;
-               ticks = (data.Duration div window) + 1;
-               IF ticks >= 8;
-                 window = window * 2; 
-               ELSIF ticks <= 3;
-                 IF    window == 900;window = 600;
-                 ELSIF window == 600;window = 300;
-                 ELSIF window == 300;window = 150;
-                 ELSIF window == 150;window = 60;
-                 ELSE; window = window / 2; 
+             IF data.Duration;
+               window = 900;
+               ticks = 0;
+               WHILE (ticks <= 3 or ticks >= 8) && window > 15;
+                 ticks = (data.Duration div window) + 1;
+                 IF ticks >= 8;
+                   window = window * 2; 
+                 ELSIF ticks <= 3;
+                   IF    window == 900;window = 600;
+                   ELSIF window == 600;window = 300;
+                   ELSIF window == 300;window = 150;
+                   ELSIF window == 150;window = 60;
+                   ELSE; window = window / 2; 
+                   END;
                  END;
                END;
              END;
-             
-             IF window <= 15;
-             multi=60;
+
+             IF window <= 300;
+              multi=60;
+             END;
+             IF window <= 15 or ticks < 1;
+              ticks = 1;
+              window = 15;
              END;
              cols = 0; 
              WHILE cols < ticks; 
@@ -174,7 +178,7 @@
 	        c = -1;
 	        ml = data.Marks.split(',');
           totaltime = ticks * window * 3;
-		      IF ml.size > 1;
+          IF ml.size > 1;
 		FOREACH marker = ml;
                 b = c;
                 c = c + 1;
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl
index 98c6d72..038978a 100644
--- a/skins/stone/rlist.tmpl
+++ b/skins/stone/rlist.tmpl
@@ -23,13 +23,11 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
     <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% total = 0 %?>
 <?% BLOCK printsumme %?>
diff --git a/skins/stone_flat/rdisplay.tmpl b/skins/stone_flat/rdisplay.tmpl
index 7a2e323..78d3017 100644
--- a/skins/stone_flat/rdisplay.tmpl
+++ b/skins/stone_flat/rdisplay.tmpl
@@ -40,10 +40,8 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <br /><?% gettext("Duration") %?>: <?% PROCESS hfs %?>
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK image %?>
 <?% IF files.size %?>
@@ -123,24 +121,30 @@
     <tr>
         <?%- 
              multi=1;
-             window = 900;
-             ticks = 0;
-             WHILE ticks <= 3 or ticks >= 8;
-               ticks = (data.Duration div window) + 1;
-               IF ticks >= 8;
-                 window = window * 2; 
-               ELSIF ticks <= 3;
-                 IF    window == 900;window = 600;
-                 ELSIF window == 600;window = 300;
-                 ELSIF window == 300;window = 150;
-                 ELSIF window == 150;window = 60;
-                 ELSE; window = window / 2; 
+             IF data.Duration;
+               window = 900;
+               ticks = 0;
+               WHILE (ticks <= 3 or ticks >= 8) && window > 15;
+                 ticks = (data.Duration div window) + 1;
+                 IF ticks >= 8;
+                   window = window * 2; 
+                 ELSIF ticks <= 3;
+                   IF    window == 900;window = 600;
+                   ELSIF window == 600;window = 300;
+                   ELSIF window == 300;window = 150;
+                   ELSIF window == 150;window = 60;
+                   ELSE; window = window / 2; 
+                   END;
                  END;
                END;
              END;
              
-             IF window <= 15;
-             multi=60;
+             IF window <= 300;
+              multi=60;
+             END;
+             IF window <= 15 or ticks < 1;
+              ticks = 1;
+              window = 15;
              END;
              cols = 0; 
              WHILE cols < ticks; 
diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl
index 2d9922a..5a09633 100644
--- a/skins/stone_flat/rlist.tmpl
+++ b/skins/stone_flat/rlist.tmpl
@@ -25,13 +25,11 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
-<?% IF d > 1 %?>
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
     <?% Stunden %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
 <?% END %?>
-<?% END %?>
 <?% ######################################################################## %?>
 <?% total = 0 %?>
 <?% BLOCK printsumme %?>
-- 
cgit v1.2.3