frodovdr
/
vdr-plugin-skindesigner
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed slow ff and rew

This commit is contained in:
louis 2016-10-03 15:20:36 +02:00
parent 0ef5487e6f
commit 2378bc8c4e
4 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
coreengine/listelements.c
View File

@ -1856,7 +1856,6 @@ cCeMenuRecordings::cCeMenuRecordings(void) {
} }
cCeMenuRecordings::~cCeMenuRecordings(void) { cCeMenuRecordings::~cCeMenuRecordings(void) {
delete recording;
} }
void cCeMenuRecordings::SetTokenContainer(void) { void cCeMenuRecordings::SetTokenContainer(void) {

30
coreengine/viewelementsdisplayreplay.c
View File

@ -485,45 +485,47 @@ bool cVeDrControlIcons::Parse(bool force) {
isPause = true; isPause = true;
} }
} else if (forward) { } else if (forward) {
if (!play) {
isPause = true;
}
if (speed == 1) { if (speed == 1) {
if (play)
isFF1x = true; isFF1x = true;
if (!play) else
isSlowFF1x = true; isSlowFF1x = true;
} else if (speed == 2) { } else if (speed == 2) {
if (play)
isFF2x = true; isFF2x = true;
if (!play) else
isSlowFF2x = true; isSlowFF2x = true;
} else if (speed == 3) { } else if (speed == 3) {
if (play)
isFF3x = true; isFF3x = true;
if (!play) else
isSlowFF3x = true; isSlowFF3x = true;
} else { } else {
if (play)
isFF = true; isFF = true;
if (!play) else
isSlowFF = true; isSlowFF = true;
} }
} else { } else {
if (!play) {
isPause = true;
}
if (speed == 1) { if (speed == 1) {
if (play)
isRew1x = true; isRew1x = true;
if (!play) else
isSlowRew1x = true; isSlowRew1x = true;
} else if (speed == 2) { } else if (speed == 2) {
if (play)
isRew2x = true; isRew2x = true;
if (!play) else
isSlowRew2x = true; isSlowRew2x = true;
} else if (speed == 3) { } else if (speed == 3) {
if (play)
isRew3x = true; isRew3x = true;
if (!play) else
isSlowRew3x = true; isSlowRew3x = true;
} else { } else {
if (play)
isRew = true; isRew = true;
if (!play) else
isSlowRew = true; isSlowRew = true;
} }
} }

32
skins/estuary4vdr/xmlfiles/displayreplay.xml
View File

@ -117,10 +117,10 @@
<controlicons> <controlicons>
<area x="30%" y="90%" width="40%" height="7%" layer="3"> <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="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="{rewind} || {slowrewind}" 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="{rewind1x} || {slowrewind1x}" 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="{rewind2x} || {slowrewind2x}" 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="{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="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}"/> <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="{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="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="{forward} || {slowforward}" 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="{forward1x} || {slowforward1x}" 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="{forward2x} || {slowforward2x}" 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="{forward3x} || {slowforward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth}/2 + {areaheight} + 6" y="0" width="{areaheight}" height="{areaheight}"/>
</area> </area>
</controlicons> </controlicons>
<controliconsmodeonly> <controliconsmodeonly>
<area x="85%" y="85%" width="15%" height="15%" layer="2"> <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="{rewind} || {slowrewind}" 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="{rewind1x} || {slowrewind1x}" 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="{rewind2x} || {slowrewind2x}" 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="{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="{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="{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="{forward} || {slowforward}" 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="{forward1x} || {slowforward1x}" 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="{forward2x} || {slowforward2x}" 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="{forward3x} || {slowforward3x}" imagetype="icon" path="rec_fwd_x3" x="{areawidth} - {areaheight}" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
</area> </area>
</controliconsmodeonly> </controliconsmodeonly>

16
skinskeleton/xmlfiles/displayreplay.xml
View File

@ -116,19 +116,19 @@
<!-- Available Variables controlicons and controliconsmodeonly: <!-- Available Variables controlicons and controliconsmodeonly:
{play} true if recording is played currently {play} true if recording is played currently
{pause} true if recording is paused {pause} true if recording is paused
{forward} true if slow or fast forwarding {forward} true if fast forwarding
{slowforward} true if slow forwarding {slowforward} true if slow forwarding
{forward1x} true if slow or fast forwarding 1x (with 3 trickspeeds) {forward1x} true if fast forwarding 1x (with 3 trickspeeds)
{forward2x} true if slow or fast forwarding 2x (with 3 trickspeeds) {forward2x} true if fast forwarding 2x (with 3 trickspeeds)
{forward3x} true if slow or fast forwarding 3x (with 3 trickspeeds) {forward3x} true if fast forwarding 3x (with 3 trickspeeds)
{slowforward1x} true if slow forwarding 1x (with 3 trickspeeds) {slowforward1x} true if slow forwarding 1x (with 3 trickspeeds)
{slowforward2x} true if slow forwarding 2x (with 3 trickspeeds) {slowforward2x} true if slow forwarding 2x (with 3 trickspeeds)
{slowforward3x} true if slow forwarding 3x (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 {slowrewind} true if slow rewinding
{rewind1x} true if slow or fast rewinding 1x (with 3 trickspeeds) {rewind1x} true if fast rewinding 1x (with 3 trickspeeds)
{rewind2x} true if slow or fast rewinding 2x (with 3 trickspeeds) {rewind2x} true if fast rewinding 2x (with 3 trickspeeds)
{rewind3x} true if slow or fast rewinding 3x (with 3 trickspeeds) {rewind3x} true if fast rewinding 3x (with 3 trickspeeds)
{slowrewind1x} true if slow rewinding 1x (with 3 trickspeeds) {slowrewind1x} true if slow rewinding 1x (with 3 trickspeeds)
{slowrewind2x} true if slow rewinding 2x (with 3 trickspeeds) {slowrewind2x} true if slow rewinding 2x (with 3 trickspeeds)
{slowrewind3x} true if slow rewinding 3x (with 3 trickspeeds) {slowrewind3x} true if slow rewinding 3x (with 3 trickspeeds)