fixed slow ff and rew

4 files changed, 48 insertions, 47 deletions

diff --git a/coreengine/listelements.c b/coreengine/listelements.c
index 0e25dc7..aee73ff 100644
--- a/coreengine/listelements.c
+++ b/coreengine/listelements.c
@@ -1856,7 +1856,6 @@ cCeMenuRecordings::cCeMenuRecordings(void) {
 }
 
 cCeMenuRecordings::~cCeMenuRecordings(void) {
-    delete recording;
 }
 
 void cCeMenuRecordings::SetTokenContainer(void) {
diff --git a/coreengine/viewelementsdisplayreplay.c b/coreengine/viewelementsdisplayreplay.c
index bdc12aa..a8b98ae 100644
--- a/coreengine/viewelementsdisplayreplay.c
+++ b/coreengine/viewelementsdisplayreplay.c
@@ -485,45 +485,47 @@ bool cVeDrControlIcons::Parse(bool force) {
             isPause = true;
         }
     } else if (forward) {
-        if (!play) {
-            isPause = true;
-        }
         if (speed == 1) {
-            isFF1x = true;
-            if (!play)
+            if (play)
+                isFF1x = true;
+            else
                 isSlowFF1x = true;
         } else if (speed == 2) {
-            isFF2x = true;
-            if (!play)
+            if (play)
+                isFF2x = true;
+            else
                 isSlowFF2x = true;
         } else if (speed == 3) {
-            isFF3x = true;
-            if (!play)
+            if (play)
+                isFF3x = true;
+            else
                 isSlowFF3x = true;
         } else {
-            isFF = true;
-            if (!play)
+            if (play)
+                isFF = true;
+            else
                 isSlowFF = true;
         }
     } else {
-        if (!play) {
-            isPause = true;
-        }
         if (speed == 1) {
-            isRew1x = true;
-            if (!play)
+            if (play)
+                isRew1x = true;
+            else
                 isSlowRew1x = true;
         } else if (speed == 2) {
-            isRew2x = true;
-            if (!play)
+            if (play)
+                isRew2x = true;
+            else
                 isSlowRew2x = true;
         } else if (speed == 3) {
-            isRew3x = true;
-            if (!play)
+            if (play)
+                isRew3x = true;
+            else
                 isSlowRew3x = true;
         } else {
-            isRew = true;
-            if (!play)
+            if (play)
+                isRew = true;
+            else
                 isSlowRew = true;
         }
     }
diff --git a/skins/estuary4vdr/xmlfiles/displayreplay.xml b/skins/estuary4vdr/xmlfiles/displayreplay.xml
index c9e74c2..b4c7473 100644
--- a/skins/estuary4vdr/xmlfiles/displayreplay.xml
+++ b/skins/estuary4vdr/xmlfiles/displayreplay.xml
@@ -117,10 +117,10 @@
     <controlicons>
         <area x="30%" y="90%" width="40%" height="7%" layer="3">
             <drawimage condition="not{rewind} ++ not{rewind1x} ++ not{rewind2x} ++ not{rewind3x}" imagetype="icon" path="rec_rew_inactive" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{rewind}" imagetype="icon" path="rec_rew_active" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{rewind1x}" imagetype="icon" path="rec_rew_x1" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{rewind2x}" imagetype="icon" path="rec_rew_x2" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{rewind3x}" imagetype="icon" path="rec_rew_x3" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{rewind} || {slowrewind}" imagetype="icon" path="rec_rew_active" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{rewind1x} || {slowrewind1x}" imagetype="icon" path="rec_rew_x1" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{rewind2x} || {slowrewind2x}" imagetype="icon" path="rec_rew_x2" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{rewind3x} || {slowrewind3x}" imagetype="icon" path="rec_rew_x3" x="{areawidth}/2 - 2*{areaheight} - 6" y="0" width="{areaheight}" height="{areaheight}"/>
             
             <drawimage condition="not{pause}" imagetype="icon" path="rec_pause_inactive" x="{areawidth}/2 - {areaheight} - 2" y="0" width="{areaheight}" height="{areaheight}"/>
             <drawimage condition="{pause}" imagetype="icon" path="rec_pause_active" x="{areawidth}/2 - {areaheight} - 2" y="0" width="{areaheight}" height="{areaheight}"/>
@@ -129,25 +129,25 @@
             <drawimage condition="{play}" imagetype="icon" path="rec_play_active" x="{areawidth}/2 + 2" y="0" width="{areaheight}" height="{areaheight}"/>
 
             <drawimage condition="not{forward} ++ not{forward1x} ++ not{forward2x} ++ not{forward3x}" imagetype="icon" path="rec_fwd_inactive" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{forward}" imagetype="icon" path="rec_fwd_active" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{forward1x}" imagetype="icon" path="rec_fwd_x1" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{forward2x}" imagetype="icon" path="rec_fwd_x2" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
-            <drawimage condition="{forward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{forward} || {slowforward}" imagetype="icon" path="rec_fwd_active" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{forward1x} || {slowforward1x}" imagetype="icon" path="rec_fwd_x1" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{forward2x} || {slowforward2x}" imagetype="icon" path="rec_fwd_x2" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
+            <drawimage condition="{forward3x} || {slowforward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
         </area>
     </controlicons>
 
     <controliconsmodeonly>
         <area x="85%" y="85%" width="15%" height="15%" layer="2">
-            <drawimage condition="{rewind}" imagetype="icon" path="rec_rew_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{rewind1x}" imagetype="icon" path="rec_rew_x1" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{rewind2x}" imagetype="icon" path="rec_rew_x2" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{rewind3x}" imagetype="icon" path="rec_rew_x3" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{rewind} || {slowrewind}" imagetype="icon" path="rec_rew_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{rewind1x} || {slowrewind1x}" imagetype="icon" path="rec_rew_x1" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{rewind2x} || {slowrewind2x}" imagetype="icon" path="rec_rew_x2" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{rewind3x} || {slowrewind3x}" imagetype="icon" path="rec_rew_x3" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
             <drawimage condition="{pause}++not{forward1x}" imagetype="icon" path="rec_pause_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
             <drawimage condition="{play}" imagetype="icon" path="rec_play_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{forward}" imagetype="icon" path="rec_fwd_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{forward1x}" imagetype="icon" path="rec_fwd_x1" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{forward2x}" imagetype="icon" path="rec_fwd_x2" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawimage condition="{forward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{forward} || {slowforward}" imagetype="icon" path="rec_fwd_active" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{forward1x} || {slowforward1x}" imagetype="icon" path="rec_fwd_x1" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{forward2x} || {slowforward2x}" imagetype="icon" path="rec_fwd_x2" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            <drawimage condition="{forward3x} || {slowforward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
         </area>
     </controliconsmodeonly>
 
diff --git a/skinskeleton/xmlfiles/displayreplay.xml b/skinskeleton/xmlfiles/displayreplay.xml
index 04cdac8..758960b 100644
--- a/skinskeleton/xmlfiles/displayreplay.xml
+++ b/skinskeleton/xmlfiles/displayreplay.xml
@@ -116,19 +116,19 @@
     <!-- Available Variables controlicons and controliconsmodeonly:
     {play}              true if recording is played currently
     {pause}             true if recording is paused
-    {forward}           true if slow or fast forwarding
+    {forward}           true if fast forwarding
     {slowforward}       true if slow forwarding
-    {forward1x}         true if slow or fast forwarding 1x (with 3 trickspeeds)
-    {forward2x}         true if slow or fast forwarding 2x (with 3 trickspeeds)
-    {forward3x}         true if slow or fast forwarding 3x (with 3 trickspeeds)
+    {forward1x}         true if fast forwarding 1x (with 3 trickspeeds)
+    {forward2x}         true if fast forwarding 2x (with 3 trickspeeds)
+    {forward3x}         true if fast forwarding 3x (with 3 trickspeeds)
     {slowforward1x}     true if slow forwarding 1x (with 3 trickspeeds)
     {slowforward2x}     true if slow forwarding 2x (with 3 trickspeeds)
     {slowforward3x}     true if slow forwarding 3x (with 3 trickspeeds)
-    {rewind}            true if slow or fast rewinding 
+    {rewind}            true if fast rewinding 
     {slowrewind}        true if slow rewinding
-    {rewind1x}          true if slow or fast rewinding 1x (with 3 trickspeeds)
-    {rewind2x}          true if slow or fast rewinding 2x (with 3 trickspeeds)
-    {rewind3x}          true if slow or fast rewinding 3x (with 3 trickspeeds)
+    {rewind1x}          true if fast rewinding 1x (with 3 trickspeeds)
+    {rewind2x}          true if fast rewinding 2x (with 3 trickspeeds)
+    {rewind3x}          true if fast rewinding 3x (with 3 trickspeeds)
     {slowrewind1x}      true if slow rewinding 1x (with 3 trickspeeds)
     {slowrewind2x}      true if slow rewinding 2x (with 3 trickspeeds)
     {slowrewind3x}      true if slow rewinding 3x (with 3 trickspeeds)