Convert , to / delimiter in data_show templates.

diff --git a/src/modules/feeds/NTSC/data_fx.properties b/src/modules/feeds/NTSC/data_fx.properties
index 6f0ead6de60470762f4b605589d37c07b6a1e4b5..8e6a9496047a4ec2f8c3b1989827b843dcfc8f91 100644 (file)
--- a/src/modules/feeds/NTSC/data_fx.properties
+++ b/src/modules/feeds/NTSC/data_fx.properties
@@ -24,15 +24,15 @@ titles=region
 .period=2
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=5%,70%:90%x20%
+.composite.geometry=5%/70%:90%x20%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
-.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.geometry=0%/0%:100%x100%:0;5=0%/0%:100%x100%:40
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.geometry=0%/0%:100%x100%:0;8=0%/0%:100%x100%:100
 .filter[1].composite.titles=1
 
 #
@@ -46,15 +46,15 @@ top-titles=region
 .period=2
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=5%,5%:90%x20%
+.composite.geometry=5%/5%:90%x20%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
-.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.geometry=0%/0%:100%x100%:0;5=0%/0%:100%x100%:40
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.geometry=0%/0%:100%x100%:0;8=0%/0%:100%x100%:100
 .filter[1].composite.halign=centre
 .filter[1].composite.titles=1
 
@@ -67,15 +67,15 @@ tickertape=region
 .properties.markup=filter[1].producer.markup
 .type.markup=text
 .properties.length[0]=filter[1].composite.out
-.composite.geometry=0%,93%:100%x7%
+.composite.geometry=0%/93%:100%x7%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
-.filter[0].composite.geometry=0%,0%:100%x100%:100
+.filter[0].composite.geometry=0%/0%:100%x100%:100
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=100%,0%:300%x100%:100;-1=-300%,0%:300%x100%:100
+.filter[1].composite.geometry=100%/0%:300%x100%:100;-1=-300%/0%:300%x100%:100
 .filter[1].producer.font=San 32
 .filter[1].composite.titles=1
 

diff --git a/src/modules/feeds/NTSC/etv.properties b/src/modules/feeds/NTSC/etv.properties
index 890948e3d6646d48b9dea39bba30012336ebb5cd..596854969a4ef5a7b43a722aab644a57bf0f5bfb 100644 (file)
--- a/src/modules/feeds/NTSC/etv.properties
+++ b/src/modules/feeds/NTSC/etv.properties
@@ -20,7 +20,7 @@ location=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,14%:32%x5%:0;15=,:x:100
+.composite.geometry=0/14%:32%x5%:0;15=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
@@ -31,7 +31,7 @@ location=region
 .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
@@ -43,7 +43,7 @@ courtesy=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,20%:32%x5%:0;15=,:x:100
+.composite.geometry=0/20%:32%x5%:0;15=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
@@ -54,7 +54,7 @@ courtesy=region
 .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
@@ -66,7 +66,7 @@ exclusive=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=-32%,20%:32%x5%;15=0
+.composite.geometry=-32%/20%:32%x5%;15=0
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.distort=1
@@ -76,7 +76,7 @@ exclusive=region
 .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
@@ -87,7 +87,7 @@ file_shot=region
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .properties.length[0]=composite.out
-.composite.geometry=82%,28%:11%x4%:0;15=,:x:100
+.composite.geometry=82%/28%:11%x4%:0;15=/:x:100
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.distort=1
@@ -108,10 +108,10 @@ special=region
 .properties.size=filter[1].producer.size
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=65%,65%:35%x6%
+.composite.geometry=65%/65%:35%x6%
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
-.filter[0].composite.geometry=100%,0%:100%x100%:0;15=0%,0%:x:100
+.filter[0].composite.geometry=100%/0%:100%x100%:0;15=0%/0%:x:100
 .filter[0].composite.distort=1
 .filter[1]=watermark
 .filter[1].resource=pango:
@@ -119,7 +119,7 @@ special=region
 .filter[1].producer.font=Sans
 .filter[1].producer.size=24
 .filter[1].producer.weight=700
-.filter[1].composite.geometry=100%,0%:100%x100%:0;15=0%,0%:x:100
+.filter[1].composite.geometry=100%/0%:100%x100%:0;15=0%/0%:x:100
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
 .filter[1].composite.valign=centre
@@ -130,7 +130,7 @@ ticker=region
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .properties.length[0]=filter[1].composite.out
-.composite.geometry=0,87%:101%x13%
+.composite.geometry=0/87%:101%x13%
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.titles=1
@@ -156,13 +156,13 @@ super=region
 .properties.s1=filter[2].producer.size
 .properties.length[0]=composite.out
 .period=2
-.composite.geometry=0,71%:100%x16%:0;30=,:x:100
+.composite.geometry=0/71%:100%x16%:0;30=/: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:

diff --git a/src/modules/feeds/NTSC/obscure.properties b/src/modules/feeds/NTSC/obscure.properties
index 7eba160d5f61cfe72aa5405b01f7926535a247d8..f42383192785aef73f578f7da9f8e658b2870707 100644 (file)
--- a/src/modules/feeds/NTSC/obscure.properties
+++ b/src/modules/feeds/NTSC/obscure.properties
@@ -22,5 +22,5 @@ obscure=region
 .resource=rectangle
 .composite.refresh=1
 .filter[0]=obscure
-.filter[0].start=0,0:100%x100%
+.filter[0].start=0/0:100%x100%
 

diff --git a/src/modules/feeds/PAL/border.properties b/src/modules/feeds/PAL/border.properties
index e02ab35700a612a530e026474a669eacf7cab605..5acf2898b453a26640cb9860c3c80177b4d09d53 100644 (file)
--- a/src/modules/feeds/PAL/border.properties
+++ b/src/modules/feeds/PAL/border.properties
@@ -4,7 +4,7 @@ border_left=watermark
 .reverse=1
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,0:100%x100%;25=2.5%,17.5%:45%x45%
+.composite.geometry=0/0:100%x100%;25=2.5%/17.5%:45%x45%
 .composite.halign=c
 .composite.valign=c
 .composite.fill=1
@@ -15,7 +15,7 @@ border_right=watermark
 .reverse=1
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,0:100%x100%;25=52.5%,17.5%:45%x45%
+.composite.geometry=0/0:100%x100%;25=52.5%/17.5%:45%x45%
 .composite.halign=c
 .composite.valign=c
 .composite.fill=1

diff --git a/src/modules/feeds/PAL/data_fx.properties b/src/modules/feeds/PAL/data_fx.properties
index b526229d8f1e31089dd6c3bbdd5e29b92497a1f3..97e87da51d6c4bb46476ed40b23001752dd45e45 100644 (file)
--- a/src/modules/feeds/PAL/data_fx.properties
+++ b/src/modules/feeds/PAL/data_fx.properties
@@ -24,15 +24,15 @@ titles=region
 .period=2
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=5%,70%:90%x20%
+.composite.geometry=5%/70%:90%x20%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
-.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.geometry=0%/0%:100%x100%:0;5=0%/0%:100%x100%:40
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.geometry=0%/0%:100%x100%:0;8=0%/0%:100%x100%:100
 .filter[1].composite.titles=1
 
 #
@@ -46,15 +46,15 @@ top-titles=region
 .period=2
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=5%,5%:90%x20%
+.composite.geometry=5%/5%:90%x20%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
-.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.geometry=0%/0%:100%x100%:0;5=0%/0%:100%x100%:40
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.geometry=0%/0%:100%x100%:0;8=0%/0%:100%x100%:100
 .filter[1].composite.titles=1
 
 #
@@ -66,14 +66,14 @@ tickertape=region
 .properties.markup=filter[1].producer.markup
 .type.markup=text
 .properties.length[0]=filter[1].composite.out
-.composite.geometry=0%,93%:100%x7%
+.composite.geometry=0%/93%:100%x7%
 .filter[0]=watermark
 .filter[0].resource=colour:0x000000ff
 .filter[0].composite.titles=1
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Shotcut
-.filter[1].composite.geometry=100%,0%:300%x100%:100;-1=-300%,0%:300%x100%:100
+.filter[1].composite.geometry=100%/0%:300%x100%:100;-1=-300%/0%:300%x100%:100
 .filter[1].producer.font=San 32
 .filter[1].composite.titles=1
 

diff --git a/src/modules/feeds/PAL/etv.properties b/src/modules/feeds/PAL/etv.properties
index b2e911b69ff8f6fbbec4a7502ee1f01692fac4fc..c8a00f3e782ae2fab48026ee7d343ee54cd654ed 100644 (file)
--- a/src/modules/feeds/PAL/etv.properties
+++ b/src/modules/feeds/PAL/etv.properties
@@ -20,7 +20,7 @@ location=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,14%:32%x5%:0;12=,:x:100
+.composite.geometry=0/14%:32%x5%:0;12=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
@@ -31,7 +31,7 @@ location=region
 .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
@@ -43,7 +43,7 @@ courtesy=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=0,20%:32%x5%:0;12=,:x:100
+.composite.geometry=0/20%:32%x5%:0;12=/:x:100
 .composite.luma=%luma01.pgm
 .composite.softness=.3
 .filter[0]=watermark
@@ -54,7 +54,7 @@ courtesy=region
 .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
@@ -66,7 +66,7 @@ exclusive=region
 .properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
-.composite.geometry=-32%,20%:32%x5%;12=0
+.composite.geometry=-32%/20%:32%x5%;12=0
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.distort=1
@@ -76,7 +76,7 @@ exclusive=region
 .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
@@ -87,7 +87,7 @@ file_shot=region
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .properties.length[0]=composite.out
-.composite.geometry=82%,28%:11%x4%:0;12=,:x:100
+.composite.geometry=82%/28%:11%x4%:0;12=/:x:100
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.distort=1
@@ -108,10 +108,10 @@ special=region
 .properties.size=filter[1].producer.size
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
-.composite.geometry=65%,65%:35%x6%
+.composite.geometry=65%/65%:35%x6%
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
-.filter[0].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100
+.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:
@@ -119,7 +119,7 @@ special=region
 .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
@@ -130,7 +130,7 @@ ticker=region
 .properties.font=filter[1].producer.font
 .properties.size=filter[1].producer.size
 .properties.length[0]=filter[1].composite.out
-.composite.geometry=0,87%:101%x13%
+.composite.geometry=0/87%:101%x13%
 .filter[0]=watermark
 .filter[0].resource=colour:0x6c0101ff
 .filter[0].composite.titles=1
@@ -156,13 +156,13 @@ super=region
 .properties.s1=filter[2].producer.size
 .properties.length[0]=composite.out
 .period=2
-.composite.geometry=0,71%:100%x16%: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: