* RECORDS: New database 31

- support video directory per recorder (REQUEST #4306 )
(this directory should now defined with vdrlist/vdredit)
* RECORDS: calc cut marks, display length of by cut recording
* update-xxv: add file check, avoid missing upgrade-xxv-db.sql
* update locale de

6 files changed, 26 insertions, 20 deletions

diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index c8ff2bf..21af151 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -37,7 +37,7 @@
                  <?% FOREACH frame = files %?>
             		  <?% x = ( frame ) / 25 %?>
                  <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" ><?% END %?>
-                  <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs d=x %?>" />
+                  <img class="recording" src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs d=x %?>" />
                   <?% IF allowplay %?></a><?% END %?>
                 <?% IF (loop.count) mod 5 == 0 && loop.count != loop.size %?>
  	    					</td>
@@ -163,6 +163,7 @@
 			          <?% date.format(data.StartTime,"%A, %x",locale) %?>&nbsp;
                 &nbsp;&nbsp;&nbsp;<?% date.format(data.StartTime,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(data.StopTime,"%H:%M",locale) %?>
                 <?% PROCESS dur d=data.Duration %?>
+                <?% IF ( data.cutlength + 10 ) <  data.Duration %?>&nbsp;<?% gettext("By cut") %?> : <?% PROCESS hfs d=data.cutlength %?><?% END %?>
                 <?% IF data.Channel %?>
 								<br /><?% gettext('Channel') %?> : <?% data.Channel %?>
 								<?% END %?>
@@ -216,8 +217,8 @@
 							</tr>						
                             <tr>
                                 <td colspan="2">
-                                <?% gettext('Lifetime') %?>&nbsp;:&nbsp;<?% data.Lifetime %?>,&nbsp;
-                                <?% gettext('Priority') %?>&nbsp;:&nbsp;<?% data.Prio %?>
+                                <?% gettext('Lifetime') %?>&nbsp;:&nbsp;<?% data.lifetime %?>,&nbsp;
+                                <?% gettext('Priority') %?>&nbsp;:&nbsp;<?% data.priority %?>
                                 </td>
                             </tr>
                         </table>
diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl
index 7b48a2d..c32b067 100644
--- a/skins/deltab/rlist.tmpl
+++ b/skins/deltab/rlist.tmpl
@@ -19,14 +19,14 @@
     <?% Stunden = d div 60 %?>
     <?% Minuten = d mod 60 %?>
     <?% Sekunden = ( d * 60 ) mod 60 %?>
-    <br />Dauer: <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
+    <br />Dauer: <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?>
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur # d in Sekunden %?>
     <?% 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') %?> 
+    <?% Stunden %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
 <?% END %?>
 <?% ######################################################################## %?>
 <?% total = 0 %?>
@@ -39,7 +39,7 @@
         <td></td>
         <?% END %?>
         <td></td>
-        <td class="description" style="padding: 0;">
+        <td colspan="2" class="description" style="padding: 0;">
         		<?% IF total > 0;
                     sec  = total mod 60;
                     min  = total div 60 mod 60;
@@ -56,8 +56,7 @@
     					<br /><?% gettext("available capacity") %?> : 
 						<?% IF hourf > 0 %?><?% hourf FILTER format('%02d') %?>:<?% END %?><?% minf FILTER format('%02d') %?>:<?% secf FILTER format('%02d')%?>
    			    <?% END %?>
-		</td>
-        <td></td>
+  		</td>
     </tr>
 
 <?% END %?>
@@ -143,7 +142,9 @@
         </td>
         <td>
             <a href="?cmd=rdisplay&amp;data=<?% id %?>" title="<?% title %?>">
-            <?% start%?>&nbsp;<?% PROCESS dur d=duration %?>
+            <?% start%?><br />
+            <?% gettext("Duration") %?> : <?% PROCESS dur d=duration %?>
+            <?% IF ( cutlength + 10 ) <  duration %?><br /><?% gettext("By cut") %?> : <?% PROCESS dur d=cutlength %?><?% END %?>
             </a>
         </td>
         <td>
@@ -193,6 +194,7 @@
           isrecording=zeile.10;
           description=zeile.11;
           preview=zeile.12;
+          cutlength=zeile.13;
           foldertitle=fulltitle.split('&#x7e;').last;
           IF foldertitle == " ";  foldertitle=fulltitle.split('&#x7e;').last(2).join(" "); END;
           PROCESS item;
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index 2017edb..3ea09c8 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -225,7 +225,7 @@
 								<td>
 			          <?% date.format(data.StartTime,"%A, %x",locale) %?>&nbsp;
                 &nbsp;&nbsp;&nbsp;<?% date.format(data.StartTime,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(data.StopTime,"%H:%M",locale) %?>
-                <?% PROCESS dur d=data.Duration %?>
+                <?% PROCESS dur d=data.Duration %?><?% IF ( data.cutlength + 10 ) <  data.Duration %?>&nbsp;(<?% PROCESS hfs d=data.cutlength %?>)<?% END %?>
                 <?% IF data.Channel %?>
 								<br /><?% gettext('Channel') %?> : <?% data.Channel %?>
 								<?% END %?>
@@ -277,8 +277,8 @@
 							</tr>
                             <tr>
                                 <td>
-                                <?% gettext('Lifetime') %?>&nbsp;:&nbsp;<?% data.Lifetime %?>,&nbsp;
-                                <?% gettext('Priority') %?>&nbsp;:&nbsp;<?% data.Prio %?>
+                                <?% gettext('Lifetime') %?>&nbsp;:&nbsp;<?% data.lifetime %?>,&nbsp;
+                                <?% gettext('Priority') %?>&nbsp;:&nbsp;<?% data.priority %?>
                                 </td>
                                 <td class="push">
                                 <?% PROCESS RowButtons %?>
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl
index f9d1c50..c03a343 100644
--- a/skins/stone/rlist.tmpl
+++ b/skins/stone/rlist.tmpl
@@ -21,7 +21,7 @@
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
-    <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> 
+    <?% Stunden div 1 %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?>
 <?% END %?>
 <?% ######################################################################## %?>
 <?% total = 0 %?>
@@ -167,7 +167,7 @@
     	             <?% END %?>
                     <td class="push" style="vertical-align:middle; text-align:left;" >
                         <a href="javascript:popup('rdisplay','<?% id %?>',620,670,0)" class="fieldinline">
-                        <font class="description"><?% start %?><br /><?% PROCESS dur d=duration %?></font>
+                        <font class="description"><?% start %?><br /><?% PROCESS dur d=duration %?><?% IF ( cutlength + 10 ) <  duration %?>&nbsp;(<?% PROCESS dur d=cutlength %?>)<?% END %?></font>
                         </a>
                     </td>
                     <td class="push">
@@ -193,7 +193,6 @@
     <?% gettext("Stored recordings") %?>
     <?% IF search.defined %?> : "<?% search %?>" 
     <?% END %?>
-    &nbsp;<small>(<?% param.usage %?>)</small>
 </h1>
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
@@ -214,6 +213,7 @@
           isrecording=zeile.10;
           description=zeile.11;
           preview=zeile.12;
+          cutlength=zeile.13;
           foldertitle=fulltitle.split('&#x7e;').last;
           IF foldertitle == " ";  foldertitle=fulltitle.split('&#x7e;').last(2).join(" "); END;
     -%?>
diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl
index 7d731be..22c725e 100644
--- a/skins/stone_flat/rlist.tmpl
+++ b/skins/stone_flat/rlist.tmpl
@@ -135,7 +135,7 @@
                 <?% IF folder <= 1 %?>
                 <a href="javascript:popup('rdisplay','<?% id %?>',620,670,0)" class="fieldinline description">
                     <?% start %?><br />
-                    <?% PROCESS dur d=duration %?>
+                    <?% PROCESS dur d=duration %?><?% IF ( cutlength + 10 ) <  duration %?>&nbsp;(<?% PROCESS dur d=cutlength %?>)<?% END %?>
                 </a>
                 <br />
                 <?% INCLUDE widgets/tooltip.inc cmd="rdisplay" linkid=id ttp_offset=-300 %?>
@@ -178,6 +178,7 @@
           isrecording=zeile.10;
           description=zeile.11;
           preview=zeile.12;
+          cutlength=zeile.13;
           foldertitle=fulltitle.split('&#x7e;').last;
           IF foldertitle == " ";  foldertitle=fulltitle.split('&#x7e;').last(2).join(" "); END;
           PROCESS ItemAsFlat;
diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl
index 774f3f2..2ede60f 100644
--- a/skins/xstyle/rdisplay.tmpl
+++ b/skins/xstyle/rdisplay.tmpl
@@ -63,7 +63,7 @@
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
-    <?% gettext('Duration') %?> : <?% Stunden div 1 %?>:<?% Minuten div 1 | format('%02d') %?>:<?% Sekunden div 1 | format('%02d') %?>
+    <?% Stunden div 1 %?>:<?% Minuten div 1 | format('%02d') %?>:<?% Sekunden div 1 | format('%02d') %?>
 <?% END %?>
 <?% END %?>
 
@@ -145,7 +145,9 @@
             <td>&nbsp;</td>
             <td><?% date.format(data.StartTime,"%A, %x",locale) %?>&nbsp;
                 &nbsp;&nbsp;&nbsp;<?% date.format(data.StartTime,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(data.StopTime,"%H:%M",locale) %?>&nbsp;
-                 (<?% PROCESS dur d=data.Duration IF data.Duration > (60*5)%?>)</td>
+                 (<?% gettext('Duration') %?> : <?% PROCESS dur d=data.Duration %?>
+                  <?% IF ( data.cutlength + 10 ) <  data.Duration %?>&nbsp;<?% gettext("By cut") %?> : <?% PROCESS dur d=data.cutlength %?><?% END %?>
+                 )
         </tr>
         <tr>
             <td>&nbsp;</td>
@@ -189,13 +191,13 @@
         <tr>
             <td>&nbsp;</td>
             <td>
-            <?% gettext('Lifetime') %?> : <?% data.Lifetime %?>
+            <?% gettext('Lifetime') %?> : <?% data.lifetime %?>
             </td>
         </tr>
         <tr>
             <td>&nbsp;</td>
             <td>
-            <?% gettext('Priority') %?> : <?% data.Prio %?>
+            <?% gettext('Priority') %?> : <?% data.priority %?>
             </td>
         </tr>
         </table>