X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Ffeeds%2FPAL%2Fetv.properties;h=07be453bbcb8d438a8041db61eef1be789f3823a;hb=97e801a4bf29374230eb4025997e7ddde0650ac2;hp=96a6d0784910b82bd5ab9db938422331a907d994;hpb=63a15d0f37455a89cbfc4cd6aa1795cb9668cba2;p=melted

diff --git a/src/modules/feeds/PAL/etv.properties b/src/modules/feeds/PAL/etv.properties
index 96a6d07..07be453 100644
--- a/src/modules/feeds/PAL/etv.properties
+++ b/src/modules/feeds/PAL/etv.properties
@@ -15,18 +15,22 @@
 
 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;24=,:x:100
+.composite.geometry=0,80:230x30: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.font=Sans 24
+.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.titles=1
 .filter[1].composite.halign=right
@@ -34,19 +38,22 @@ location=region
 
 courtesy=region
 .description=Courtesy
-.properties.markup=filter[1].producer.markup
-.type.markup=text
+.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,115:230x30:0;37=,:x:100
+.composite.geometry=0,115:230x30: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.font=Sans 24
+.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.titles=1
 .filter[1].composite.halign=right
@@ -54,19 +61,21 @@ courtesy=region
 
 exclusive=region
 .description=Exclusive
-.properties.markup=filter[1].producer.markup
-.type.markup=text
+.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,115:230x30:0;37=,:x:100
-.composite.luma=%luma01.pgm
-.composite.softness=.3
+.composite.geometry=-230,115:230x30;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.font=Sans Bold 24
+.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.titles=1
 .filter[1].composite.halign=right
@@ -75,14 +84,19 @@ exclusive=region
 file_shot=region
 .description=Titles
 .period=2
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .properties.length[0]=composite.out
-.composite.geometry=590,160:80x25:0;25=,:x:100
+.composite.geometry=590,160:80x25: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.font=Sans Bold 18
+.filter[1].producer.text=File Shot
+.filter[1].producer.font=Sans
+.filter[1].producer.size=18
+.filter[1].producer.weight=700
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=centre
@@ -90,43 +104,56 @@ file_shot=region
 special=region
 .description=Special
 .period=2
+.properties.font=filter[1].producer.font
+.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
 .filter[0]=watermark
-.filter[0].resource=colour:0x6c010101
-.filter[0].composite.geometry=100%,0%:100%x100%:0;24=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.font=Sans Bold 24
-.filter[1].composite.geometry=100%,0%:100%x100%:0;24=0%,0%:x:100
+.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.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=centre
 
 ticker=region
 .description=Tickertape
-.properties.markup=filter[1].producer.markup
-.type.markup=text
+.properties.markup=filter[1].producer.text
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .properties.length[0]=filter[1].composite.out
 .composite.geometry=0,500:722x75
 .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.font=Sans Bold 24
+.filter[1].producer.text=Ticker - provided for reference
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
+.filter[1].producer.weight=700
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=centre
 
 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
+.properties.s0=filter[1].producer.size
+.properties.f1=filter[2].producer.font
+.properties.s1=filter[2].producer.size
 .properties.length[0]=composite.out
 .period=2
 .composite.geometry=0,410:720x90:0;25=,:x:100
@@ -136,18 +163,22 @@ super=region
 .filter[0]=watermark
 .filter[0].resource=colour:0xbbbbbbff
 .filter[0].composite.geometry=0,0:100%:100%:70
+.filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
-.filter[1].producer.markup=
-.filter[1].producer.font=Sans Bold 32
+.filter[1].producer.text=
+.filter[1].producer.font=Sans
+.filter[1].producer.size=32
+.filter[1].producer.weight=700
 .filter[1].producer.fgcolour=0x6c0101ff
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=top
 .filter[2]=watermark
 .filter[2].resource=pango:
-.filter[2].producer.markup=
-.filter[2].producer.font=Sans 32
+.filter[2].producer.text=
+.filter[2].producer.font=Sans
+.filter[2].producer.size=32
 .filter[2].producer.fgcolour=0x6c0101ff
 .filter[2].composite.titles=1
 .filter[2].composite.halign=centre