changed handling of channel logos, width and height are now mandatory

This commit is contained in:
louis
2014-11-21 19:19:59 +01:00
parent e7abb8557e
commit a34a824527
21 changed files with 26 additions and 95 deletions

View File

@@ -13,7 +13,7 @@
<header>
<area x="1%" y="0" width="64%" height="10%" layer="2">
<drawtext condition="{whatsonnow}||{whatsonnext}" x="5" valign="center" font="{vdrOsd}" fontsize="80%" color="{clrWhite}" text="{title}" />
<drawimage name="logo" condition="{whatson}" imagetype="channellogo" path="{channelid}" x="0" height="100%" align="left" valign="center" />
<drawimage name="logo" condition="{whatson}" imagetype="channellogo" path="{channelid}" x="0" width="15%" height="100%" align="left" valign="center" />
<drawtext condition="{whatson}" x="{width(logo)}+20" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrWhite}" text="{channelnumber} - {channelname}" />
</area>
</header>
@@ -78,7 +78,7 @@
</areascroll>
<!-- element whatsonnow -->
<area condition="not{separator}++{whatsonnow}" x="5" width="8%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="94%" valign="center" />
</area>
<area condition="not{separator}++{whatsonnow}++not{current}" x="9%" width="18%" layer="3">
<drawtext x="0" y="5%" font="{vdrOsd}" fontsize="40%" color="{clrFontMenuItem}" text="{start} - {stop}" />
@@ -104,7 +104,7 @@
</area>
<!-- element whatsonnext -->
<area condition="not{separator}++{whatsonnext}" x="5" width="8%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" height="100%" valign="center" />
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="94%" valign="center" />
</area>
<area condition="not{separator}++{whatsonnext}++not{current}" x="9%" width="18%" layer="3">
<drawtext x="0" y="5%" font="{vdrOsd}" fontsize="40%" color="{clrFontMenuItem}" text="{start} - {stop}" />