Convert , to / delimiter in data_show templates.

[mlt] / src / modules / feeds / PAL / etv.properties

diff --git a/src/modules/feeds/PAL/etv.properties b/src/modules/feeds/PAL/etv.properties
index 25bc45c0f31ac231ee742f5008590bd37ef1c499..c8a00f3e782ae2fab48026ee7d343ee54cd654ed 100644 (file)
--- a/src/modules/feeds/PAL/etv.properties
+++ b/src/modules/feeds/PAL/etv.properties
@@ -15,67 +15,68 @@
 
 location=region
 .description=Titles
-.properties.markup=filter[1].producer.markup
+.properties.markup=filter[1].producer.text
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,80:230x30:0;12=,:x:100
+.composite.geometry=0/14%:32%x5%:0;12=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010100
+.filter[0].resource=colour:0x6c0101ff
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=
+.filter[1].producer.text=
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
-.filter[1].composite.geometry=0,0:95%x100%
+.filter[1].composite.geometry=0/0:95%x100%
 .filter[1].composite.titles=1
 .filter[1].composite.halign=right
 .filter[1].composite.valign=center
 
 courtesy=region
 .description=Courtesy
-.properties.markup=filter[1].producer.markup
+.properties.markup=filter[1].producer.text
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
-.type.markup=text
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,115:230x30:0;12=,:x:100
+.composite.geometry=0/20%:32%x5%:0;12=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010100
+.filter[0].resource=colour:0x6c0101ff
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=ETV Exclusive
+.filter[1].producer.text=
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
-.filter[1].composite.geometry=0,0:95%x100%
+.filter[1].composite.geometry=0/0:95%x100%
 .filter[1].composite.titles=1
 .filter[1].composite.halign=right
 .filter[1].composite.valign=centre
 
 exclusive=region
 .description=Exclusive
-.properties.markup=filter[1].producer.markup
+.properties.markup=filter[1].producer.text
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
-.type.markup=text
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=-230,115:230x30;12=0
+.composite.geometry=-32%/20%:32%x5%;12=0
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010100
+.filter[0].resource=colour:0x6c0101ff
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=ETV Exclusive
+.filter[1].producer.text=ETV Exclusive
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
 .filter[1].producer.weight=700
-.filter[1].composite.geometry=0,0:95%x100%
+.filter[1].composite.geometry=0/0:95%x100%
 .filter[1].composite.titles=1
 .filter[1].composite.halign=right
 .filter[1].composite.valign=centre
@@ -86,12 +87,13 @@ file_shot=region
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .properties.length[0]=composite.out
-.composite.geometry=590,160:80x25:0;12=,:x:100
+.composite.geometry=82%/28%:11%x4%:0;12=/:x:100
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010100
+.filter[0].resource=colour:0x6c0101ff
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=File Shot
+.filter[1].producer.text=File Shot
 .filter[1].producer.font=Sans
 .filter[1].producer.size=18
 .filter[1].producer.weight=700
@@ -106,35 +108,35 @@ special=region
 .properties.size=filter[1].producer.size
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=465,375:255x35
+.composite.geometry=65%/65%:35%x6%
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010101
-.filter[0].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100
+.filter[0].resource=colour:0x6c0101ff
+.filter[0].composite.geometry=100%/0%:100%x100%:0;12=0%/0%:x:100
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=Special
+.filter[1].producer.text=Special
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
 .filter[1].producer.weight=700
-.filter[1].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100
+.filter[1].composite.geometry=100%/0%:100%x100%:0;12=0%/0%:x:100
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=centre
 
 ticker=region
 .description=Tickertape
-.properties.markup=filter[1].producer.markup
+.properties.markup=filter[1].producer.text
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
-.type.markup=text
 .properties.length[0]=filter[1].composite.out
-.composite.geometry=0,500:722x75
+.composite.geometry=0/87%:101%x13%
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010100
+.filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=Ticker - provided for reference
+.filter[1].producer.text=Ticker - provided for reference
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
 .filter[1].producer.weight=700
@@ -144,8 +146,8 @@ ticker=region
 
 super=region
 .description=Transcription
-.properties.0=filter[1].producer.markup
-.properties.1=filter[2].producer.markup
+.properties.0=filter[1].producer.text
+.properties.1=filter[2].producer.text
 .properties.align=filter[1].composite.valign
 .properties.weight=filter[1].producer.weight
 .properties.f0=filter[1].producer.font
@@ -154,17 +156,17 @@ super=region
 .properties.s1=filter[2].producer.size
 .properties.length[0]=composite.out
 .period=2
-.composite.geometry=0,410:720x90:0;25=,:x:100
+.composite.geometry=0/71%:100%x16%:0;25=/:x:100
 .composite.luma=%luma01.pgm
 .composite.luma_invert=1
 .composite.softness=.3
 .filter[0]=watermark
 .filter[0].resource=colour:0xbbbbbbff
-.filter[0].composite.geometry=0,0:100%:100%:70
+.filter[0].composite.geometry=0/0:100%:100%:70
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.encoding=iso8859-1
-.filter[1].producer.markup=
+.filter[1].producer.text=
 .filter[1].producer.font=Sans
 .filter[1].producer.size=32
 .filter[1].producer.weight=700
@@ -174,8 +176,7 @@ super=region
 .filter[1].composite.valign=top
 .filter[2]=watermark
 .filter[2].resource=pango:
-.filter[2].producer.encoding=iso8859-1
-.filter[2].producer.markup=
+.filter[2].producer.text=
 .filter[2].producer.font=Sans
 .filter[2].producer.size=32
 .filter[2].producer.fgcolour=0x6c0101ff