Remaining audio handling switched to stacks; Minor corrections to compositing and...

[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..85edcbe28184d5f51ce038f08e6fed80d144da6b 100644 (file)
--- a/src/modules/feeds/PAL/etv.properties
+++ b/src/modules/feeds/PAL/etv.properties
@@ -15,7 +15,7 @@
 
 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
@@ -27,7 +27,7 @@ location=region
 .filter[0].resource=colour:0x6c010100
 .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%
@@ -37,10 +37,9 @@ location=region
 
 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
@@ -50,7 +49,7 @@ courtesy=region
 .filter[0].resource=colour:0x6c010100
 .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%
@@ -60,10 +59,9 @@ courtesy=region
 
 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
@@ -71,7 +69,7 @@ exclusive=region
 .filter[0].resource=colour:0x6c010100
 .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
@@ -91,7 +89,7 @@ file_shot=region
 .filter[0].resource=colour:0x6c010100
 .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
@@ -112,7 +110,7 @@ special=region
 .filter[0].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100
 .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
@@ -123,10 +121,9 @@ special=region
 
 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
 .filter[0]=watermark
@@ -134,7 +131,7 @@ ticker=region
 .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 +141,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
@@ -163,8 +160,7 @@ super=region
 .filter[0].composite.geometry=0,0:100%:100%:70
 .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 +170,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