summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2016-05-27 17:51:11 +0200
committerlouis <louis.braun@gmx.de>2016-05-27 17:51:11 +0200
commit9611f9b01153fabaad1038e2cf8ece6adc7486ae (patch)
tree1f0203244120c7c643f2ed9f333ccf1d7a1de948
parente3a1577c7c6f3a1e7af36b36b36cc477b69d276c (diff)
downloadvdr-plugin-skindesigner-9611f9b01153fabaad1038e2cf8ece6adc7486ae.tar.gz
vdr-plugin-skindesigner-9611f9b01153fabaad1038e2cf8ece6adc7486ae.tar.bz2
added fading and shifting for displaytracks
-rw-r--r--coreengine/viewdisplaytracks.c6
-rw-r--r--coreengine/viewlist.c1
-rw-r--r--dtd/displayaudiotracks.dtd6
-rw-r--r--skins/estuary4vdr/xmlfiles/displayaudiotracks.xml4
4 files changed, 14 insertions, 3 deletions
diff --git a/coreengine/viewdisplaytracks.c b/coreengine/viewdisplaytracks.c
index 97fee2d..067d2d6 100644
--- a/coreengine/viewdisplaytracks.c
+++ b/coreengine/viewdisplaytracks.c
@@ -110,11 +110,15 @@ void cViewTracks::SetCurrentTrack(int index) {
void cViewTracks::Flush(bool animFlush) {
if (init) {
sdOsd.LockFlush();
+ if (viewList) {
+ viewList->Draw();
+ viewList->StartAnimation();
+ }
Render((int)eVeDisplayTracks::background);
}
if (change) {
Render((int)eVeDisplayTracks::header);
- if (viewList)
+ if (viewList && !init)
viewList->Draw();
change = false;
}
diff --git a/coreengine/viewlist.c b/coreengine/viewlist.c
index 1ed5432..bda1abb 100644
--- a/coreengine/viewlist.c
+++ b/coreengine/viewlist.c
@@ -937,6 +937,7 @@ void cViewListAudioTracks::PreCache(void) {
void cViewListAudioTracks::SetNumtracks(int numTracks) {
this->numTracks = numTracks;
+ this->numElements = numTracks;
tokenContainer->Clear();
tokenContainer->AddIntToken(0, numTracks);
}
diff --git a/dtd/displayaudiotracks.dtd b/dtd/displayaudiotracks.dtd
index e4abd21..0b8f913 100644
--- a/dtd/displayaudiotracks.dtd
+++ b/dtd/displayaudiotracks.dtd
@@ -40,6 +40,12 @@
width CDATA #REQUIRED
height CDATA #REQUIRED
align (left|top|center|bottom|right) #IMPLIED
+ fadetime CDATA #IMPLIED
+ shifttime CDATA #IMPLIED
+ shifttype CDATA #IMPLIED
+ shiftmode CDATA #IMPLIED
+ startx CDATA #IMPLIED
+ starty CDATA #IMPLIED
menuitemwidth CDATA #IMPLIED
numlistelements CDATA #REQUIRED
orientation CDATA #REQUIRED
diff --git a/skins/estuary4vdr/xmlfiles/displayaudiotracks.xml b/skins/estuary4vdr/xmlfiles/displayaudiotracks.xml
index a1ec4e1..decb3e8 100644
--- a/skins/estuary4vdr/xmlfiles/displayaudiotracks.xml
+++ b/skins/estuary4vdr/xmlfiles/displayaudiotracks.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE displayaudiotracks SYSTEM "../../../dtd/displayaudiotracks.dtd">
-<displayaudiotracks x="35%" y="0" width="30%" height="100%" fadetime="0">
+<displayaudiotracks x="35%" y="0" width="30%" height="100%" fadetime="{fadetime}" shifttime="{shifttime}" shiftmode="slowed" shifttype="bottom">
<background>
<area x="0" y="{areaheight} - {numtracks} * {areaheight} / 15 - {areaheight} / 15" width="100%" height="{areaheight} / 15 + {areaheight} / 15 * {numtracks}" layer="1">
<fill color="{replayback}" />
@@ -18,7 +18,7 @@
</area>
</header>
- <menuitems x="0" y="{areaheight} - {numelements} * {areaheight} / 15" orientation="vertical" width="100%" height="{numelements} * {areaheight} / 15" align="top" numlistelements="{numelements}">
+ <menuitems x="0" y="{areaheight} - {numelements} * {areaheight} / 15" orientation="vertical" width="100%" height="{numelements} * {areaheight} / 15" align="top" numlistelements="{numelements}" fadetime="{fadetime}" shifttime="{shifttime}" shiftmode="slowed" shifttype="bottom">
<listelement>
<!-- Background -->
<area x="1%" width="98%" layer="2">