Feed rework and fixes to westley and composite

[mlt] / src / modules / data_fx.properties

diff --git a/src/modules/data_fx.properties b/src/modules/data_fx.properties
index bcfac2097f3ab43b5df1661b55b1d65b7c47ff20..369cd4860c7653fc62c31a5e2ca3853721bee3ea 100644 (file)
--- a/src/modules/data_fx.properties
+++ b/src/modules/data_fx.properties
@@ -94,16 +94,19 @@ location.properties.length[1]=filter[1].composite.out
 location.composite.start=0,80:230x30
 location.filter[0]=watermark
 location.filter[0].resource=colour:0x6c010100
-location.filter[0].composite.start=0%,0%:100%x100%:10
-location.filter[0].composite.key[5]=0%,0%:100%x100%:100
+location.filter[0].composite.start=-100%,0%:100%x100%:100
+location.filter[0].composite.key[25]=0%,0%:100%x100%:100
+location.filter[0].composite.titles=1
 location.filter[1]=watermark
 location.filter[1].resource=pango:
-location.filter[1].producer.markup=Shotcut
+location.filter[1].producer.markup=
 location.filter[1].producer.font=San 24
-location.filter[1].composite.start=0%,0%:100%x100%:10
-location.filter[1].composite.key[8]=0%,0%:100%x100%:100
+location.filter[1].composite.start=0%,0%:100%x100%:0
+location.filter[1].composite.key[24]=0%,0%:100%x100%:0
+location.filter[1].composite.key[49]=0%,0%:100%x100%:100
 location.filter[1].composite.titles=1
-#location.filter[1].composite.halign=right
+location.filter[1].composite.halign=right
+location.filter[1].composite.valign=center
 
 courtesy=region
 courtesy.description=Titles
@@ -115,16 +118,20 @@ courtesy.properties.length[1]=filter[1].composite.out
 courtesy.composite.start=0,115:230x30
 courtesy.filter[0]=watermark
 courtesy.filter[0].resource=colour:0x6c010100
-courtesy.filter[0].composite.start=0%,0%:100%x100%:10
-courtesy.filter[0].composite.key[5]=0%,0%:100%x100%:100
+courtesy.filter[0].composite.start=-100%,0%:100%x100%:0
+courtesy.filter[0].composite.key[12]=-100%,0%:100%x100%:0
+courtesy.filter[0].composite.key[37]=0%,0%:100%x100%:100
+courtesy.filter[0].composite.titles=1
 courtesy.filter[1]=watermark
 courtesy.filter[1].resource=pango:
 courtesy.filter[1].producer.markup=ETV Exclusive
 courtesy.filter[1].producer.font=San 24
-courtesy.filter[1].composite.start=1%,1%:99%x99%:10
-courtesy.filter[1].composite.key[8]=1%,1%:99%x99%:100
+courtesy.filter[1].composite.start=0%,0%:100%x100%:0
+courtesy.filter[1].composite.key[37]=0%,0%:100%x100%:0
+courtesy.filter[1].composite.key[61]=0%,0%:100%x100%:100
 courtesy.filter[1].composite.titles=1
-#exclusive.filter[1].composite.halign=right
+courtesy.filter[1].composite.halign=right
+courtesy.filter[1].composite.valign=right
 
 exclusive=region
 exclusive.description=Titles
@@ -135,34 +142,38 @@ exclusive.composite.start=0,115:230x30
 exclusive.filter[0]=watermark
 exclusive.filter[0].resource=colour:0x6c010100
 exclusive.filter[0].composite.start=0%,0%:100%x100%:10
-exclusive.filter[0].composite.key[5]=0%,0%:100%x100%:100
+exclusive.filter[0].composite.key[25]=0%,0%:100%x100%:100
+exclusive.filter[0].composite.titles=1
 exclusive.filter[1]=watermark
 exclusive.filter[1].resource=pango:
 exclusive.filter[1].producer.markup=ETV Exclusive
 exclusive.filter[1].producer.font=San 24
-exclusive.filter[1].composite.start=1%,1%:99%x99%:10
-exclusive.filter[1].composite.key[8]=1%,1%:99%x99%:100
+exclusive.filter[1].composite.start=0%,0%:100%x100%:10
+exclusive.filter[1].composite.key[25]=0%,0%:100%x100%:100
 exclusive.filter[1].composite.titles=1
-#exclusive.filter[1].composite.halign=right
-
-shot=region
-shot.description=Titles
-shot.period=2
-shot.properties.length[0]=filter[0].composite.out
-shot.properties.length[1]=filter[1].composite.out
-shot.composite.start=590,160:80x25
-shot.filter[0]=watermark
-shot.filter[0].resource=colour:0x6c010100
-shot.filter[0].composite.start=0%,0%:100%x100%:10
-shot.filter[0].composite.key[5]=0%,0%:100%x100%:100
-shot.filter[1]=watermark
-shot.filter[1].resource=pango:
-shot.filter[1].producer.markup=File Shot
-shot.filter[1].producer.font=San 20
-shot.filter[1].composite.start=1%,1%:99%x99%:15
-shot.filter[1].composite.key[8]=1%,1%:99%x99%:100
-shot.filter[1].composite.titles=0
-#shot.filter[1].composite.halign=centre
+exclusive.filter[1].composite.halign=right
+exclusive.filter[1].composite.valign=right
+
+file_shot=region
+file_shot.description=Titles
+file_shot.period=2
+file_shot.properties.length[0]=filter[0].composite.out
+file_shot.properties.length[1]=filter[1].composite.out
+file_shot.composite.start=590,160:80x25
+file_shot.filter[0]=watermark
+file_shot.filter[0].resource=colour:0x6c010100
+file_shot.filter[0].composite.start=0%,0%:100%x100%:10
+file_shot.filter[0].composite.key[25]=0%,0%:100%x100%:100
+file_shot.filter[0].composite.titles=1
+file_shot.filter[1]=watermark
+file_shot.filter[1].resource=pango:
+file_shot.filter[1].producer.markup=File Shot
+file_shot.filter[1].producer.font=San 20
+file_shot.filter[1].composite.start=1%,1%:99%x99%:15
+file_shot.filter[1].composite.key[25]=1%,1%:99%x99%:100
+file_shot.filter[1].composite.titles=0
+file_shot.filter[1].composite.halign=centre
+file_shot.filter[1].composite.valign=centre
 
 special=region
 special.description=Titles
@@ -172,16 +183,20 @@ special.properties.length[1]=filter[1].composite.out
 special.composite.start=465,375:255x35
 special.filter[0]=watermark
 special.filter[0].resource=colour:0x6c010100
-special.filter[0].composite.start=0%,0%:100%x100%:10
-special.filter[0].composite.key[5]=0%,0%:100%x100%:100
+special.filter[0].composite.start=100%,0%:100%x100%:0
+special.filter[1].composite.key[49]=100%,0%:100%x100%:0
+special.filter[0].composite.key[74]=0%,0%:100%x100%:100
+special.filter[0].composite.titles=1
 special.filter[1]=watermark
 special.filter[1].resource=pango:
 special.filter[1].producer.markup=Special
 special.filter[1].producer.font=San 24
-special.filter[1].composite.start=1%,1%:99%x99%:10
-special.filter[1].composite.key[8]=1%,1%:99%x99%:100
+special.filter[1].composite.start=100%,0%:100%x100%:0
+special.filter[1].composite.key[49]=100%,0%:100%x100%:0
+special.filter[1].composite.key[74]=0%,0%:100%x100%:100
 special.filter[1].composite.titles=1
-#special.filter[1].composite.halign=centre
+special.filter[1].composite.halign=centre
+special.filter[1].composite.valign=centre
 
 name=region
 name.description=Titles
@@ -194,16 +209,18 @@ name.composite.start=0,410:720x45
 name.filter[0]=watermark
 name.filter[0].resource=colour:0xbbbbbb00
 name.filter[0].composite.start=0%,0%:100%x100%:10
-name.filter[0].composite.key[5]=0%,0%:100%x100%:100
+name.filter[0].composite.key[25]=0%,0%:100%x100%:100
+name.filter[0].composite.titles=1
 name.filter[1]=watermark
 name.filter[1].resource=pango:
-name.filter[1].producer.markup=Shotcut
+name.filter[1].producer.markup=
 name.filter[1].producer.font=San 32
-name.filter[1].producer.fgcolour=0x6c010100
-name.filter[1].composite.start=1%,1%:99%x99%:10
-name.filter[1].composite.key[8]=1%,1%:99%x99%:100
+name.filter[1].producer.fgcolour=0x6c0101ff
+name.filter[1].composite.start=0%,0%:100%x100%:10
+name.filter[1].composite.key[25]=0%,0%:100%x100%:100
 name.filter[1].composite.titles=1
-#name.filter[1].composite.halign=centre
+name.filter[1].composite.halign=centre
+name.filter[1].composite.valign=centre
 
 designation=region
 designation.description=Titles
@@ -216,16 +233,18 @@ designation.composite.start=0,455:720x45
 designation.filter[0]=watermark
 designation.filter[0].resource=colour:0xbbbbbb00
 designation.filter[0].composite.start=0%,0%:100%x100%:10
-designation.filter[0].composite.key[5]=0%,0%:100%x100%:100
+designation.filter[0].composite.key[25]=0%,0%:100%x100%:100
+designation.filter[0].composite.titles=1
 designation.filter[1]=watermark
 designation.filter[1].resource=pango:
-designation.filter[1].producer.markup=Shotcut
+designation.filter[1].producer.markup=
 designation.filter[1].producer.font=San 32
-designation.filter[1].producer.fgcolour=0x6c010100
-designation.filter[1].composite.start=1%,1%:99%x99%:10
-designation.filter[1].composite.key[8]=1%,1%:99%x99%:100
+designation.filter[1].producer.fgcolour=0x6c0101ff
+designation.filter[1].composite.start=0%,0%:100%x100%:10
+designation.filter[1].composite.key[25]=0%,0%:100%x100%:100
 designation.filter[1].composite.titles=1
-#designation.filter[1].composite.halign=centre
+designation.filter[1].composite.halign=centre
+designation.filter[1].composite.valign=centre
 
 ticker=region
 ticker.description=Tickertape
@@ -236,6 +255,7 @@ ticker.composite.start=0,500:722x75
 ticker.filter[0]=watermark
 ticker.filter[0].resource=colour:0x6c010100
 ticker.filter[0].composite.start=0%,0%:100%x100%:100
+ticker.filter[0].composite.titles=1
 ticker.filter[1]=watermark
 ticker.filter[1].resource=pango:
 ticker.filter[1].producer.markup=Ticker - provided for reference
@@ -243,5 +263,40 @@ ticker.filter[1].composite.start=0%,0%:100%x100%:100
 ticker.filter[1].composite.titles=0
 ticker.filter[1].producer.font=San 24
 ticker.filter[1].composite.halign=centre
-#ticker.filter[1].composite.valign=centre
+ticker.filter[1].composite.titles=1
+ticker.filter[1].composite.valign=centre
+
+super=region
+super.description=Transcription
+super.properties.0=filter[1].producer.markup
+super.properties.1=filter[2].producer.markup
+super.properties.length[0]=filter[0].composite.out
+super.properties.length[1]=filter[1].composite.out
+super.properties.length[2]=filter[2].composite.out
+super.composite.start=0,410:720x90
+super.filter[0]=watermark
+super.filter[0].resource=colour:0xbbbbbb00
+super.filter[0].composite.start=0%,0%:100%x100%:10
+super.filter[0].composite.key[25]=0%,0%:100%x100%:100
+super.filter[0].composite.titles=1
+super.filter[1]=watermark
+super.filter[1].resource=pango:
+super.filter[1].producer.markup=
+super.filter[1].producer.font=San 32
+super.filter[1].producer.fgcolour=0x6c0101ff
+super.filter[1].composite.start=0,0:100%x100%:10
+super.filter[1].composite.key[25]=0,0:100%x100%:100
+super.filter[1].composite.titles=1
+super.filter[1].composite.halign=centre
+super.filter[1].composite.valign=top
+super.filter[2]=watermark
+super.filter[2].resource=pango:
+super.filter[2].producer.markup=
+super.filter[2].producer.font=San 32
+super.filter[2].producer.fgcolour=0x6c0101ff
+super.filter[2].composite.start=0,0:100%x100%:10
+super.filter[2].composite.key[25]=0,0:100%x100%:100
+super.filter[2].composite.titles=1
+super.filter[2].composite.halign=centre
+super.filter[2].composite.valign=bottom