Add element timeShiftTimes to displayreplay

In displayreplay the tokens recstart, playbacktime and timeshiftrest
added to display start time, actual playback time and the rest of
the actual recording in timeshiftmode.

skins/estuary4vdr/globals.xml

@@ -242,6 +242,27 @@
             <trans lang="hu_HU">Időzítő kereső</trans>
             <trans lang="it_IT">Cerca timer</trans>
         </token>
+        <token name="tr(start)">
+            <trans lang="en_EN">start</trans>
+            <trans lang="de_DE">Beginn</trans>
+            <trans lang="fi_FI">Alkaa</trans>
+            <trans lang="hu_HU">Rajt</trans>
+            <trans lang="it_IT">Inizio</trans>
+        </token>
+        <token name="tr(rest)">
+            <trans lang="en_EN">rest</trans>
+            <trans lang="de_DE">Rest</trans>
+            <trans lang="fi_FI">Loput</trans>
+            <trans lang="hu_HU">Maradék</trans>
+            <trans lang="it_IT">Riposo</trans>
+        </token>
+        <token name="tr(playback)">
+            <trans lang="en_EN">playback</trans>
+            <trans lang="de_DE">Wiedergabe</trans>
+            <trans lang="fi_FI">Toisto</trans>
+            <trans lang="hu_HU">Lejátszás</trans>
+            <trans lang="it_IT">Riproduzione</trans>
+        </token>
         <token name="tr(end)">
             <trans lang="en_EN">end</trans>
             <trans lang="de_DE">Ende</trans>

skins/estuary4vdr/xmlfiles/displayreplay.xml

@@ -16,15 +16,15 @@
     </backgroundmodeonly>
 
     <datetime>
-        <area x="75%" y="75%" width="13%" height="6%" layer="2">
+        <area x="85%" y="75%" width="14%" height="6%" layer="2">
             <drawtext align="right" y="0" fontsize="{areaheight}*{replaydatetimesize}/100" font="{regular}" color="{fontdefault}" text="{daynameshort} {day}.{monthnameshort}" />
         </area>
     </datetime>
 
     <time>
-        <area x="89%" y="75%" width="11%" height="6%" layer="2">
-            <drawtext name="clock" x="0" y="0" fontsize="{areaheight}*{replaydatetimesize}/100" font="{regular}" color="{fontdefault}" text="{hour}:{printf('%02d', min)}" />
-            <drawtext name="clocksec" x="{posx(clock)} + {width(clock)}" y="{height(clock)} - {height(clocksec)} - 1" fontsize="{areaheight}*{replaydatetimesize}*0.8/100" font="{regular}" color="{fontdefault}" text=":{printf('%02d', sec)}" />
+        <area x="80%" y="80%" width="19%" height="5%" layer="2">
+            <drawtext name="clocksec" align="right" y="{height(clock)} - {height(clocksec)} - 1" fontsize="{areaheight}*{replaydatetimesize}*0.8/100" font="{regular}" color="{fontdefault}" text=":{printf('%02d', sec)}" />
+	    <drawtext name="clock" x="{posx(clocksec)} - {width(clock)}" y="0" fontsize="{areaheight}*{replaydatetimesize}/100" font="{regular}" color="{fontdefault}" text="{hour}:{printf('%02d', min)}" />
         </area>
     </time>
 
@@ -38,7 +38,7 @@
     </scrapercontent>
 
     <rectitle>
-        <area condition="{timeshift}" x="12%" y="75%" width="63%" height="6%" layer="2">
+        <area condition="{timeshift}" x="12%" y="75%" width="73%" height="6%" layer="2">
             <drawtext name="eventtime" align="right" y="0" fontsize="{areaheight}*{replaytitlesize}/100" font="{bold}" color="{fontactive}" text= "{eventstart} - {eventstop}" />
             <drawtext name="title" x="0" y="0" width="{areawidth} - {width(eventtime)} - 2" fontsize="{areaheight}*{replaytitlesize}/100" font="{regular}" color="{fontdefault}" text="{rectitle}" />
             <drawtext condition="isset{title} ++ isset{recsubtitle}" x="{width(title)}" y="0" width="{areawidth} - {width(title)} - {width(eventtime)} - 2" fontsize="{areaheight}*{replaytitlesize}/100" font="{regular}" color="{fontdefault}" text=" - {recsubtitle}" />
@@ -73,29 +73,46 @@
     </recinfo>
 
     <currenttime>
-        <area x="12%" y="86%" width="15%" height="5%" layer="2">
+        <area condition="not{timeshift}" x="12%" y="87%" width="15%" height="5%" layer="2">
             <drawtext x="0" y="0" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" font="{regular}" color="{fontdefault}" text="{reccurrent}" />
         </area>
+        <area condition="{timeshift}" x="12%" y="90%" width="15%" height="5%" layer="2">
+            <drawtext x="0" y="0" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" font="{regular}" color="{fontdefault}" text="({reccurrent})" />
+        </area>
     </currenttime>
 
     <totaltime>
-        <area x="80%" y="86%" width="19%" height="5%" layer="2">
-            <drawtext condition="not{timeshift}" align="right" y="0" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" font="{regular}" color="{fontdefault}" text="{rectotal}" />
-            <drawtext condition="{timeshift}" align="right" y="0" font="{regular}" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" color="{fontdefault}" text="{timeshifttotal} ({rectotal})" />
+        <area condition="not{timeshift}" x="80%" y="87%" width="19%" height="5%" layer="2">
+            <drawtext align="right" y="0" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" font="{regular}" color="{fontdefault}" text="{rectotal}" />
+        </area>
+        <area condition="{timeshift}" x="80%" y="90%" width="19%" height="5%" layer="2">
+            <drawtext align="right" y="0" font="{regular}" fontsize="{areaheight}*{replaycurrenttotaltimesize}/100" color="{fontdefault}" text="{timeshifttotal} ({rectotal})" />
         </area>
     </totaltime>
 
+    <timeshifttimes>
+        <area condition="{timeshift}" x="12%" y="81%" width="19%" height="5%" layer="2">
+            <drawtext align="left" y="0" fontsize="{areaheight}*{replayendtimesize}/100" font="{regular}" color="{fontdefault}" text="{tr(start)}: {recstart}" />
+        </area>
+        <area condition="{timeshift}" x="40%" y="81%" width="20%" height="5%" layer="2">
+            <drawtext name="rest" align="center" y="0" fontsize="{areaheight}*{replayendtimesize}/100" font="{regular}" color="{fontdefault}" text="TS {tr(rest)}: -{timeshiftrest}" />
+        </area>
+        <area condition="{timeshift}" x="12%" y="87%" width="19%" height="5%" layer="2">
+            <drawtext align="left" y="0" fontsize="{areaheight}*{replayendtimesize}/100" font="{regular}" color="{fontdefault}" text="{tr(playback)}: {playbacktime}" />
+        </area>
+    </timeshifttimes>
+
     <endtime>
-        <area x="80%" y="90%" width="19%" height="5%" layer="2">
+	    <area condition="{timeshift}" x="80%" y="87%" width="19%" height="5%" layer="2">
             <drawtext align="right" y="0" fontsize="{areaheight}*{replayendtimesize}/100" font="{regular}" color="{fontdefault}" text="{tr(end)}: {recend}" />
         </area>
     </endtime>
 
     <progressbar>
-        <area background="true" x="12%" y="83%" width="87%" height="3%" layer="2">
+        <area background="true" x="12%" y="84%" width="87%" height="3%" layer="2">
             <fill color="{progressbarback}" />
         </area>
-        <area x="12%" y="83%" width="87%" height="3%" layer="3">
+        <area x="12%" y="84%" width="87%" height="3%" layer="3">
             <drawrectangle condition="not{timeshift}" x="0" y="0" width="{areawidth}*{current}/{total}" height="100%" color="{progressbar}" />
             <drawrectangle condition="{timeshift}" x="0" y="{areaheight}*0.2" width="{total}/{timeshifttotal}*{areawidth}" height="{areaheight}*0.6" color="{progressbartimeshift}" />
             <drawrectangle condition="{timeshift}" x="0" y="0" width="{current}/{timeshifttotal}*{areawidth}" height="{areaheight}" color="{progressbar}" />
@@ -103,7 +120,7 @@
     </progressbar>
 
     <cutmarks>
-        <area condition="not{timeshift}" x="12%" y="83%" width="87%" height="3%" layer="4">
+        <area condition="not{timeshift}" x="12%" y="84%" width="87%" height="3%" layer="4">
             <loop name="marks" x="0" y="0" orientation="absolute">
                 <!-- draw mark -->
                 <drawrectangle x="{marks[position]}/{marks[total]}*{areawidth}-2" y="0" width="4" height="100%" color="{cutmark}" />
@@ -115,6 +132,18 @@
                 <drawrectangle condition="{marks[startmark]}" x="{marks[position]}/{marks[total]}*{areawidth}" y="30%" width="{marks[endposition]}/{marks[total]}*{areawidth} - {marks[position]}/{marks[total]}*{areawidth}" height="40%" color="{cutmark}" />
             </loop>
         </area>
+        <area condition="{timeshift}" x="12%" y="84%" width="87%" height="3%" layer="4">
+            <loop name="marks" x="0" y="0" orientation="absolute">
+                <!-- draw mark -->
+                <drawrectangle x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}-2" y="0" width="4" height="100%" color="{cutmark}" />
+                <drawrectangle condition="{marks[startmark]}" x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}" y="0" width="5" height="2" color="{cutmark}" />
+                <drawrectangle condition="{marks[startmark]}" x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}" y="{areaheight}-2" width="5" height="2" color="{cutmark}" />
+                <drawrectangle condition="not{marks[startmark]}" x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}-5" y="0" width="5" height="2" color="{cutmark}" />
+                <drawrectangle condition="not{marks[startmark]}" x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}-5" y="{areaheight}-2" width="5" height="2" color="{cutmark}" />
+                <!-- draw bar to next mark if mark is startmark-->
+                <drawrectangle condition="{marks[startmark]}" x="{marks[position]}/{marks[timeshifttotal]}*{areawidth}" y="30%" width="{marks[endposition]}/{marks[timeshifttotal]}*{areawidth} - {marks[position]}/{marks[timeshifttotal]}*{areawidth}" height="40%" color="{cutmark}" />
+            </loop>
+        </area>
     </cutmarks>
 
     <controlicons>