Use '/' for coordinate delimiter instead of period.

Period is a decimal separator in some locales.

diff --git a/demo/README b/demo/README
index 56dcd820402615f2d2e1f3feabb3f2f5005be279..5e2fe08a5bc94ebb7f29dddc11da66212e549696 100644 (file)
--- a/demo/README
+++ b/demo/README
@@ -13,12 +13,15 @@ you to choose a consumer. A consumer is like a viewer, but it could also
 write to a stream/file. The "SDL" consumer is the popular Simple DirectMedia
 Layer audio and video output. The "xml" consumer generates an XML
 representation of the service network. That can be played directly due to the
-XML producer plugin. See docs/mlt-xml.txt for more information. The
-"MainConcept DV" consumer refers to the proprietary MLT plugin required to
-use MLT with MainConcept DV, DVCPro, and MPEG codecs. "/dev/dv1394/0" refers
-to a device file for transmitting DV over FireWire using the Linux dv1394 kernel
-module. The "BlueFish444" consumer is another proprietary plugin to use
-the BlueFish444 manufactured SDI video/audio output cards with MLT.
+XML producer plugin. See docs/mlt-xml.txt for more information. "/dev/dv1394/0"
+refers to a device file for transmitting DV over FireWire using the Linux
+dv1394 kernel module.
+
+These examples assume the numeric locale LC_NUMERIC decimal separator is a
+period. Therefore, the demo script sets LC_NUMERIC=C for you, but if you are
+running these manually or learning from them, remember to use the appropriate
+separator for your locale.
+
 
 And now the demos...
 

diff --git a/demo/demo b/demo/demo
index a2557ad6805a093d38c0c2c9d2c32b4535c969ba..8ebe737ad23484159571351559422d6680df9ff1 100755 (executable)
--- a/demo/demo
+++ b/demo/demo
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 export MLT_PROFILE=dv_pal
+export LC_NUMERIC=C
 
 function show_consumers( )
 {
@@ -90,7 +91,7 @@ do
                        if [ "$MLT_CONSUMER" == "xml:" ]
                        then    export XML_CONSUMER="xml:$demo.mlt"
                                        bash $demo -consumer $XML_CONSUMER
-                                       melt +$demo.txt out=100 $demo.mlt $demo.mlt -filter watermark:watermark1.png composite.fill=1 composite.geometry=85%,5%:10%x10%
+                                       melt +$demo.txt out=100 $demo.mlt $demo.mlt -filter watermark:watermark1.png composite.fill=1 composite.geometry=85%/5%:10%x10%
                        elif [ "$MLT_CONSUMER" == "xml" ]
                        then    bash $demo -consumer $MLT_CONSUMER | less
                        else    bash $demo -consumer $MLT_CONSUMER

diff --git a/demo/mlt_bouncy b/demo/mlt_bouncy
index e973288e9432fe390b191d542390d8d8ea75c4cb..f28d5e8cbe80f08c9bd0849946420eb8faad2f20 100644 (file)
--- a/demo/mlt_bouncy
+++ b/demo/mlt_bouncy
@@ -2,9 +2,9 @@ melt \
 clip3.dv \
 -filter \
 watermark:clip1.dv \
-composite.start=10%,10%:20%x20% \
-composite.key[33]=30%,70%:25%x25% \
-composite.key[66]=70%,30%:15%x15% \
-composite.end=70%,70%:20%x20% \
+composite.start=10%/10%:20%x20% \
+composite.key[33]=30%/70%:25%x25% \
+composite.key[66]=70%/30%:15%x15% \
+composite.end=70%/70%:20%x20% \
 composite.out=100 \
 $*

diff --git a/demo/mlt_bouncy_ball b/demo/mlt_bouncy_ball
index d138392b98f920044ce5392e13f025d72228a5a0..d634a97269139e1ee07cd8305711f46e4afa66dd 100644 (file)
--- a/demo/mlt_bouncy_ball
+++ b/demo/mlt_bouncy_ball
@@ -4,7 +4,7 @@ clip3.dv \
 clip1.dv \
 -transition \
 region:circle \
-composite.geometry="10%,10%:20%x20%;33=30%,70%:25%x25%;66=70%,30%:15%x15%;-1=70%,70%:20%x20%" \
+composite.geometry="10%,10%:20%x20%;33=30%/70%:25%x25%;66=70%/30%:15%x15%;-1=70%/70%:20%x20%" \
 composite.out=100 \
 composite.softness=0.1 \
 a_track=0 \

diff --git a/demo/mlt_composite_transition b/demo/mlt_composite_transition
index 73a5f49885903c9485cc2f8dd61ccaef6c00ed3e..8493ef4103346b5209562376f5b61e604942dd9b 100644 (file)
--- a/demo/mlt_composite_transition
+++ b/demo/mlt_composite_transition
@@ -2,6 +2,6 @@ melt \
 clip1.dv out=74 \
 -track \
 -blank 49 clip2.mpeg \
--transition composite:57%,10%:33%x33% end=0%,0%:100%x100% progressive=1 distort=true in=50 out=74 a_track=0 b_track=1 \
+-transition composite:57%/10%:33%x33% end=0%/0%:100%x100% progressive=1 distort=true in=50 out=74 a_track=0 b_track=1 \
 -transition mix:-1 in=50 out=74 a_track=0 b_track=1 \
 $*

diff --git a/demo/mlt_my_name_is b/demo/mlt_my_name_is
index 15d57fc15b99561b23ca183a0fbe6783016b167e..e631de5b3edea0e89e911cab7c7248817beb2e31 100644 (file)
--- a/demo/mlt_my_name_is
+++ b/demo/mlt_my_name_is
@@ -4,7 +4,7 @@ clip3.dv \
 "+My name is Inigo Montoya.txt" out=99 -blank 49 "+Prepare to die!.txt" out=99 \
 -track \
 -blank 74 "+You killed my father.txt" out=74 \
--transition composite:50%,20%:5%x4% end=10%,20%:80%x12% distort=1 halign=centre valign=centre in=0 out=99 a_track=0 b_track=1 \
--transition composite:0%,70%:100%x10% end=100%,70%:100%x10% in=75 out=149 a_track=0 b_track=2 \
--transition composite:25%,25%:50%x50%! in=150 out=249 a_track=0 b_track=1 \
+-transition composite:50%/20%:5%x4% end=10%/20%:80%x12% distort=1 halign=centre valign=centre in=0 out=99 a_track=0 b_track=1 \
+-transition composite:0%/70%:100%x10% end=100%/70%:100%x10% in=75 out=149 a_track=0 b_track=2 \
+-transition composite:25%/25%:50%x50%! in=150 out=249 a_track=0 b_track=1 \
 $*

diff --git a/demo/mlt_news b/demo/mlt_news
index 6b6187e166f5b6e7e42d3b776ea8923176118f51..fd8277ba8ec2a5d4dbc81b5ca45aec87f534e53d 100644 (file)
--- a/demo/mlt_news
+++ b/demo/mlt_news
@@ -10,9 +10,9 @@ pango: text=" Breaking News
 pango: text=" Breaking News                 
  MLT Rocks the World" bgcolour=0xff000080 out=349 \
 -transition mix:0.5 always_active=1 a_track=0 b_track=2 \
--transition composite geometry=50%,15%:37.5%x40% a_track=0 b_track=1 in=0 out=174 \
--transition composite geometry=10%,15%:37.5%x40% a_track=0 b_track=2 in=0 out=199 \
--transition composite geometry="50%,15%:37.5%x40%;-1=0%,0%:100%x100%" a_track=0 b_track=1 in=175 out=199 distort=1 \
--transition composite geometry=10%,65%:90%x20% a_track=0 b_track=3 in=0 out=199 \
--transition composite geometry=10%,65%:90%x20% a_track=1 b_track=3 in=200 out=499 \
+-transition composite geometry=50%/15%:37.5%x40% a_track=0 b_track=1 in=0 out=174 \
+-transition composite geometry=10%/15%:37.5%x40% a_track=0 b_track=2 in=0 out=199 \
+-transition composite geometry="50%/15%:37.5%x40%;-1=0%/0%:100%x100%" a_track=0 b_track=1 in=175 out=199 distort=1 \
+-transition composite geometry=10%/65%:90%x20% a_track=0 b_track=3 in=0 out=199 \
+-transition composite geometry=10%/65%:90%x20% a_track=1 b_track=3 in=200 out=499 \
 $*

diff --git a/demo/mlt_obscure b/demo/mlt_obscure
index 2cc0764894f92d923a88284709a31a646cef7c50..31ec6f56cd0d54768368df950410e9dfc3d0182a 100644 (file)
--- a/demo/mlt_obscure
+++ b/demo/mlt_obscure
@@ -1,5 +1,5 @@
 melt \
 clip2.mpeg \
--filter obscure:25%,25%:25%x25%:10x10 in=0 out=68 \
--filter region:circle.png filter=obscure composite.start=55%,25%:12%x50% in=68 out=200 \
+-filter obscure:25%/25%:25%x25%:10x10 in=0 out=68 \
+-filter region:circle.png filter=obscure composite.start=55%/25%:12%x50% in=68 out=200 \
 $*

diff --git a/demo/mlt_push b/demo/mlt_push
index c327d4a944ac2969a8e2e7f8e29529c2bfb59248..b115cf1eb2d5ed8a9d545eebd169b80aa2f9222d 100644 (file)
--- a/demo/mlt_push
+++ b/demo/mlt_push
@@ -7,12 +7,12 @@ clip3.dv in=200 out=275 \
 clip2.dv in=200 \
 -transition \
 composite in=50 out=75 a_track=0 b_track=1 \
-start=0,0:100%x100%:100 \
-end=100%,0:100%x100%:100 \
+start=0/0:100%x100%:100 \
+end=100%/0:100%x100%:100 \
 -transition \
 composite in=50 out=75 a_track=0 b_track=2 \
-start=-100%,0:100%x100%:100 \
-end=0,0:100%x100%:100 \
+start=-100%/0:100%x100%:100 \
+end=0/0:100%x100%:100 \
 -transition \
 mix:-1 in=50 out=75 a_track=1 b_track=2 \
 $*

diff --git a/demo/mlt_slideshow2 b/demo/mlt_slideshow2
index 1068fdfad098cdc7c291e17357a045cf5fa2ad77..9b0dc4e2a394a60361c630fb0cb58ea49303d0f1 100644 (file)
--- a/demo/mlt_slideshow2
+++ b/demo/mlt_slideshow2
@@ -1,7 +1,7 @@
 melt \
 photos/.all.jpg ttl=75 \
 -attach crop center=1 \
--attach affine transition.cycle=225 transition.geometry="0=0,0:100%x100%;74=-100,-100:120%x120%;75=-60,-60:110%x110%;149=0:0:110%x110%;150=0,-60:110%x110%;224=-60,0:110%x110%" \
+-attach affine transition.cycle=225 transition.geometry="0=0/0:100%x100%;74=-100/-100:120%x120%;75=-60/-60:110%x110%;149=0/0:110%x110%;150=0/-60:110%x110%;224=-60/0:110%x110%" \
 -filter luma cycle=75 duration=25 \
 -track music1.ogg \
 -transition mix \

diff --git a/demo/mlt_slideshow_black b/demo/mlt_slideshow_black
index bfca0e3ec87472581c912ac2a228f310edae7548..cc1f18680c3621d055aad0378bd7ea451fb57751 100644 (file)
--- a/demo/mlt_slideshow_black
+++ b/demo/mlt_slideshow_black
@@ -1,3 +1,3 @@
 melt photos/.all.jpg ttl=100 \
--filter watermark:colour:black reverse=1 composite.geometry="15%,15%:10%,10%;0.1625=0,0:100%x100%;-.1625=;-1=70%,70%:10%x10%" composite.mirror_off=1 composite.cycle=100 composite.fill=1 composite.valign=c composite.halign=c \
+-filter watermark:colour:black reverse=1 composite.geometry="15%/15%:10%/10%;0.1625=0/0:100%x100%;-.1625=;-1=70%/70%:10%x10%" composite.mirror_off=1 composite.cycle=100 composite.fill=1 composite.valign=c composite.halign=c \
 $*

diff --git a/demo/mlt_squeeze b/demo/mlt_squeeze
index 7674b244f5c0909ff8cb34bee3db349591e43b33..ee973e0b4e7b46581957860a89f093a89409a783 100644 (file)
--- a/demo/mlt_squeeze
+++ b/demo/mlt_squeeze
@@ -3,7 +3,7 @@ clip1.dv out=124 clip2.dv out=149 clip3.dv in=75 out=224 clip1.dv \
 -track \
 -blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \
 -group progressive=1 distort=1 \
--transition composite geometry="0%,0%:100%x100%;25=50%,0%:5%x100%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=100 out=149 \
--transition composite geometry="0%,0%:100%x100%;25=0%,50%:100%x5%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=250 out=299 \
--transition composite geometry="0%,0%:100%x100%;25=100%,0%:5%x100%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=400 out=449 \
+-transition composite geometry="0%/0%:100%x100%;25=50%/0%:5%x100%;-1=0%/0%:100%x100%" a_track=1 b_track=0 in=100 out=149 \
+-transition composite geometry="0%/0%:100%x100%;25=0%/50%:100%x5%;-1=0%/0%:100%x100%" a_track=1 b_track=0 in=250 out=299 \
+-transition composite geometry="0%/0%:100%x100%;25=100%/0%:5%x100%;-1=0%/0%:100%x100%" a_track=1 b_track=0 in=400 out=449 \
 $*

diff --git a/demo/mlt_squeeze_box b/demo/mlt_squeeze_box
index ff52b0498b7d8d8dd7d2dcc9768ddb4183848ead..a3bf9b526dccf01e345dddf8547e5435c8ee72ad 100644 (file)
--- a/demo/mlt_squeeze_box
+++ b/demo/mlt_squeeze_box
@@ -3,7 +3,7 @@ clip1.dv out=124 clip2.dv out=149 clip3.dv in=75 out=224 clip1.dv \
 -track \
 -blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \
 -group progressive=1 \
--transition composite:0%,0%:100%x100% key[25]=50%,0%:5%x100% end=0%,0%:100%x100% a_track=1 b_track=0 in=100 out=149 \
--transition composite:0%,0%:100%x100% key[25]=0%,50%:100%x5% end=0%,0%:100%x100% a_track=1 b_track=0 in=250 out=299 \
--transition composite:0%,0%:100%x100% key[25]=100%,0%:5%x100% end=0%,0%:100%x100% a_track=1 b_track=0 in=400 out=449 \
+-transition composite:0%/0%:100%x100% key[25]=50%/0%:5%x100% end=0%/0%:100%x100% a_track=1 b_track=0 in=100 out=149 \
+-transition composite:0%/0%:100%x100% key[25]=0%/50%:100%x5% end=0%/0%:100%x100% a_track=1 b_track=0 in=250 out=299 \
+-transition composite:0%/0%:100%x100% key[25]=100%/0%:5%x100% end=0%/0%:100%x100% a_track=1 b_track=0 in=400 out=449 \
 $*

diff --git a/demo/mlt_swf_variables b/demo/mlt_swf_variables
index 520146eea6c19eed1c9cbddbc485de34c11ea221..a7b97e0022f764abf90fd7526b8862a98112be79 100644 (file)
--- a/demo/mlt_swf_variables
+++ b/demo/mlt_swf_variables
@@ -1,5 +1,5 @@
 melt clip1.dv \
 -track txtField.swf variables="title=My Title&subtitle=The Subtitle" out=120 \
--transition composite geometry="0,0:100%x100%:80%;100=0,0:100%x100%:80%;119=0,0:100%x100%:0" \
+-transition composite geometry="0/0:100%x100%:80%;100=0/0:100%x100%:80%;119=0/0:100%x100%:0" \
 a_track=0 b_track=1 out=120 progressive=1 \
 $*

diff --git a/demo/mlt_ticker b/demo/mlt_ticker
index 1ffe513019e35f9d32c999c4fa65208491c68f35..47db797e8ea249dfbc4f92bca13a8a93076136da 100644 (file)
--- a/demo/mlt_ticker
+++ b/demo/mlt_ticker
@@ -7,9 +7,9 @@ colour:black out=299 \
 out=299 \
 -transition \
 composite a_track=0 b_track=1 out=299 distort=1 \
-start=0,70%:100%x64:100 \
+start=0/70%:100%x64:100 \
 -transition \
 composite a_track=0 b_track=2 out=299 titles=1 \
-start=100%,70%:999%x20% \
-end=-299%,70%:999%x20% \
+start=100%/70%:999%x20% \
+end=-299%/70%:999%x20% \
 $*

diff --git a/demo/mlt_title_over_gfx b/demo/mlt_title_over_gfx
index c643ef7aa2a0c7aa5a64124a6da4751a861bf828..bde102f10f64a97b672370ca1a671e082dee1e44 100644 (file)
--- a/demo/mlt_title_over_gfx
+++ b/demo/mlt_title_over_gfx
@@ -5,21 +5,21 @@ melt \
 -track \
        clip1.dv \
 -transition \
-       composite start=30%,20%:40%x60% \
+       composite start=30%/20%:40%x60% \
                in=50 \
                out=199 \
                a_track=0 \
                b_track=1 \
                distort=1 \
 -transition \
-       composite:0%,75%:100%x20%:0 \
+       composite:0%/75%:100%x20%:0 \
                in=50 \
                out=199 \
                a_track=2 \
                b_track=0 \
-               key[24]=0%,75%:100%x20%:100 \
-               key[-25]=0%,75%:100%x20%:100 \
+               key[24]=0%/75%:100%x20%:100 \
+               key[-25]=0%/75%:100%x20%:100 \
                luma=luma1.pgm \
-               end=0%,75%:100%x20%:0 \
+               end=0%/75%:100%x20%:0 \
                distort=1 \
 $*

diff --git a/demo/mlt_titleshadow_watermark b/demo/mlt_titleshadow_watermark
index a87a1a8d53823b4f6f6941629a4224f8c36a763e..4063a9bfeb9dcf1e6d739ad597c116227edde07e 100644 (file)
--- a/demo/mlt_titleshadow_watermark
+++ b/demo/mlt_titleshadow_watermark
@@ -4,7 +4,7 @@ melt \
 -track watermark1.png out=1000 \
 -track clip3.dv \
 -filter greyscale track=2 \
--transition composite:21%,11%:100%x100%:50 end=61%,41%:100%x100% out=99 a_track=3 b_track=1 \
--transition composite:20%,10%:100%x100% end=60%,40%:100%x100% out=99 a_track=3 b_track=0 \
--transition composite:85%,80%:10%x10%:30 out=1000 a_track=3 b_track=2 \
+-transition composite:21%/11%:100%x100%:50 end=61%/41%:100%x100% out=99 a_track=3 b_track=1 \
+-transition composite:20%/10%:100%x100% end=60%/40%:100%x100% out=99 a_track=3 b_track=0 \
+-transition composite:85%/80%:10%x10%:30 out=1000 a_track=3 b_track=2 \
 $*

diff --git a/demo/mlt_voiceover b/demo/mlt_voiceover
index 50a27cdb199348c92b6c023942c8e3ae5c3e6e90..e523d2fa8c8fd6a1235479bfdf24914cfe657185 100644 (file)
--- a/demo/mlt_voiceover
+++ b/demo/mlt_voiceover
@@ -27,7 +27,7 @@ melt \
        a_track=2 \
        b_track=1 \
 -transition \
-       composite:0%,80%:100%x20% \
+       composite:0%/80%:100%x20% \
        distort=1 \
        in=100 \
        out=299 \

diff --git a/demo/mlt_watermark b/demo/mlt_watermark
index 2e5d5efb14e6807bdc308bf8b1c959e73d85fa58..1cb350db377c352bab22b2fbbb10724056ab9223 100644 (file)
--- a/demo/mlt_watermark
+++ b/demo/mlt_watermark
@@ -2,5 +2,5 @@ melt \
 clip2.dv out=1000 \
 -track \
 watermark1.png out=1000 \
--transition composite fill=1 in=0 out=1000 a_track=0 b_track=1 geometry=85%,5%:10%x10% \
+-transition composite fill=1 in=0 out=1000 a_track=0 b_track=1 geometry=85%/5%:10%x10% \
 $*

diff --git a/demo/pango.mlt b/demo/pango.mlt
index 9c1a9a9fb7c10a752019a8c04f91b0ebae5ddd97..41852fd9e1f977b5e45db918b231fda409b74d0e 100644 (file)
--- a/demo/pango.mlt
+++ b/demo/pango.mlt
@@ -11,8 +11,8 @@
     <property name="fgcolour">0xffffddff</property>
     <property name="bgcolour">0x8c101080</property>
     <property name="pad">8</property>
-    <property name="text"><![CDATA[Ã\8a¾úlÃ\89äºÃ\89Ã\92 qà ö»ÉÉ<
-HíÃ\89à ~Ã\89Ã\92+à eôÒ`ò­÷ +y«ÉKÉ §ÉÉWð~É]]></property>
+    <property name="text"><![CDATA[Ã\8a¾úlÃ\89äºÃ\89Ã\92 qà ö»ÉÉ<
+HíÃ\89à ~Ã\89Ã\92+à eôÒ`ò­÷ +y«ÉKÉ §ÉÉWð~É]]></property>
   </producer>
   <tractor>
     <multitrack>
@@ -23,10 +23,10 @@ HíÉà~ÉÒ+àeôÒ`ò­÷ +y«ÉKÉ §ÉÉWð~É]]></property>
       <property name="mlt_service">composite</property>
       <property name="a_track">1</property>
       <property name="b_track">0</property>
-      <property name="start">-70%,65%:100%x35%:0</property>
-      <property name="key[25]">0,65%:100%x35%:100</property>
-      <property name="key[125]">0,65%:100%x35%:100</property>
-      <property name="end">0,65%:100%x35%:0</property>
+      <property name="start">-70%/65%:100%x35%:0</property>
+      <property name="key[25]">0/65%:100%x35%:100</property>
+      <property name="key[125]">0/65%:100%x35%:100</property>
+      <property name="end">0/65%:100%x35%:0</property>
       <property name="halign">centre</property>
       <property name="valign">centre</property>
     </transition>

diff --git a/docs/framework.txt b/docs/framework.txt
index f42d18b170cae491c12063a39e314a86bd879394..56610fd5b23d46d58daf1bad1de2a390eb761d63 100644 (file)
--- a/docs/framework.txt
+++ b/docs/framework.txt
@@ -709,7 +709,7 @@ Multiple Tracks and Transitions:
            mlt_multitrack multitrack = mlt_tractor_multitrack( tractor );
        
            // Create a composite transition
-           mlt_transition transition = mlt_factory_transition( "composite", "10%,10%:15%x15%" );
+           mlt_transition transition = mlt_factory_transition( "composite", "10%/10%:15%x15%" );
        
            // Create track 0
            mlt_producer track0 = create_playlist( argc, argv );

diff --git a/docs/services.txt b/docs/services.txt
index dd263c797f45218d1e5031d83013b3fdab7a13c6..89ef07447fc3c6d185baef7cbb9e2cfdccda4006 100644 (file)
--- a/docs/services.txt
+++ b/docs/services.txt
@@ -828,9 +828,9 @@ Filters
                
            Initialisation Properties
            
-               string start - in the format X,Y:WxH[:PWxPY]
+               string start - in the format X/Y:WxH[:PWxPY]
                             - PWxPY is the size of the averaging region in pixels.
-               string end - in the format X,Y:WxH[:PWxPY]
+               string end - in the format X/Y:WxH[:PWxPY]
                int in - in point
                int out - out point
 
@@ -1135,14 +1135,14 @@ Transitions
 
                Deprecated Properties
 
-               string start - a geometry specification as X,Y:WxH[!][:mix]
+               string start - a geometry specification as X/Y:WxH[!][:mix]
                             - X, Y, W, H are assumed to pixel units unless they
                               have the suffix '%'
                             - '!' is a shortcut to specify distort, see below.
                             - mix is always a 2 digit percentage, defaults to 100.
-                            - default is "85%,5%:10%x10%"
+                            - default is "85%/5%:10%x10%"
                string end - the ending size and position.
-               string key[F] - X,Y:WxH[:mix] - set a key frame for geometry between
+               string key[F] - X/Y:WxH[:mix] - set a key frame for geometry between
                                the in and out. F is a frame number and can be
                                negative to make it relative to the out point.
 

diff --git a/src/framework/mlt_geometry.c b/src/framework/mlt_geometry.c
index f1398be07e7af3a67db8643964b8bb4020db246f..89230b038023dd3fd8eaa0fba6a6dbbd77b1fdad 100644 (file)
--- a/src/framework/mlt_geometry.c
+++ b/src/framework/mlt_geometry.c
@@ -198,8 +198,9 @@ static void mlt_geometry_clean( mlt_geometry self )
 }
 
 // Parse the geometry specification for a given length and normalised width/height (-1 for default)
-// data is constructed as: [frame=]X,Y:WxH[:mix][;[frame=]X,Y:WxH[:mix]]*
+// data is constructed as: [frame=]X/Y:WxH[:mix][!][;[frame=]X/Y:WxH[:mix][!]]*
 // and X, Y, W and H can have trailing % chars to indicate percentage of normalised size
+// Append a pair's value with ! to enable distort.
 int mlt_geometry_parse( mlt_geometry self, char *data, int length, int nw, int nh )
 {
        int i = 0;
@@ -636,7 +637,7 @@ char *mlt_geometry_serialise_cut( mlt_geometry self, int in, int out )
 
                        if ( item.f[0] ) 
                                sprintf( temp + strlen( temp ), "%.0f", item.x );
-                       strcat( temp, "," );
+                       strcat( temp, "/" );
                        if ( item.f[1] ) 
                                sprintf( temp + strlen( temp ), "%.0f", item.y );
                        strcat( temp, ":" );

diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c
index d2413b318a386807cc4ab28e5ef959afb121f53f..41e7f2edf9aa70ec9986255f65fb60b1f97f0ce4 100644 (file)
--- a/src/modules/core/filter_obscure.c
+++ b/src/modules/core/filter_obscure.c
@@ -282,7 +282,7 @@ mlt_filter filter_obscure_init( mlt_profile profile, mlt_service_type type, cons
        {
                mlt_properties properties = MLT_FILTER_PROPERTIES( this );
                this->process = filter_process;
-               mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" );
+               mlt_properties_set( properties, "start", arg != NULL ? arg : "0%/0%:100%x100%" );
                mlt_properties_set( properties, "end", "" );
        }
        return this;

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index f69ee2ff051064fb6db22941c61be9af26ac001a..43e6e9820362512fb56c141a8599ced305d5b3a8 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -1321,7 +1321,7 @@ mlt_transition transition_composite_init( mlt_profile profile, mlt_service_type
                this->process = composite_process;
                
                // Default starting motion and zoom
-               mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" );
+               mlt_properties_set( properties, "start", arg != NULL ? arg : "0/0:100%x100%" );
                
                // Default factory
                mlt_properties_set( properties, "factory", mlt_environment( "MLT_PRODUCER" ) );

diff --git a/src/modules/core/transition_region.c b/src/modules/core/transition_region.c
index cf147b20d855ec3f79ab4b6cb6b39a6059fe1d9c..afab7f63b0cfa61e686f9f07fa088b2660a4e8cd 100644 (file)
--- a/src/modules/core/transition_region.c
+++ b/src/modules/core/transition_region.c
@@ -68,7 +68,7 @@ static int create_instance( mlt_transition this, char *name, char *value, int co
                sprintf( key, "%s.", name );
 
                // Just in case, let's assume that the filter here has a composite
-               //mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "composite.geometry", "0%,0%:100%x100%" );
+               //mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "composite.geometry", "0%/0%:100%x100%" );
                //mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "composite.fill", 1 );
 
                // Pass all the key properties on the filter down

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index 0fc74591679bad33508fa61142f842159fc6d060..822868e25d49e9d896e570c5b90cde2a03bf2320 100644 (file)
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -43,7 +43,7 @@ hist: $(TARGET)
 
 
 test2: $(TARGET)
-       melt colour:black -filter watermark:"+mello.txt" composite.geometry="0,0:10%x10%;99=90%,90%" composite.out=99 -filter crop_detect -filter motion_est -filter vismv
+       melt colour:black -filter watermark:"+mello.txt" composite.geometry="0/0:10%x10%;99=90%/90%" composite.out=99 -filter crop_detect -filter motion_est -filter vismv
 
 realtime: $(TARGET)
        ~/mlt-devel/mlt/src/melt/melt -filter motion_est -filter vismv -consumer sdl rescale=none /media/cdrecorder/BBC.The.Private.Life.Of.Plants.Pt5.Living.Together.DivX505.AC3.www.MVGroup.org.uk.avi in=30000

diff --git a/src/modules/motion_est/filter_autotrack_rectangle.c b/src/modules/motion_est/filter_autotrack_rectangle.c
index e57aa9dfc1fec8dd2b2caa09df338b844db2f299..b5b0022f448d4c805601449523471ed66017a02c 100644 (file)
--- a/src/modules/motion_est/filter_autotrack_rectangle.c
+++ b/src/modules/motion_est/filter_autotrack_rectangle.c
@@ -189,7 +189,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 
                // Because filter_obscure needs to be rewritten to use mlt_geometry
                char geom[100];
-               sprintf( geom, "%d,%d:%dx%d", (int)boundry.x, (int)boundry.y, (int)boundry.w, (int)boundry.h );
+               sprintf( geom, "%d/%d:%dx%d", (int)boundry.x, (int)boundry.y, (int)boundry.w, (int)boundry.h );
                mlt_properties_set( MLT_FILTER_PROPERTIES( obscure ), "start", geom );
                mlt_properties_set( MLT_FILTER_PROPERTIES( obscure ), "end", geom );
        }
@@ -331,7 +331,7 @@ mlt_filter filter_autotrack_rectangle_init( mlt_profile profile, mlt_service_typ
                if( arg != NULL ) 
                        mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "geometry", arg );
                else
-                       mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "geometry", "100,100:100x100" );
+                       mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "geometry", "100/100:100x100" );
 
                // create an instance of the motion_est and obscure filter
                mlt_filter motion_est = mlt_factory_filter( profile, "motion_est", NULL );

diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index b07cea31cee285b31e7f4e5ee1715d8f6101d21a..1fa9cf3199a4cf95d1abcf5e14941a616ac0ab7f 100644 (file)
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -568,7 +568,7 @@ mlt_transition transition_affine_init( mlt_profile profile, mlt_service_type typ
        if ( transition != NULL )
        {
                mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "distort", 0 );
-               mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "geometry", "0,0:100%x100%" );
+               mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "geometry", "0/0:100%x100%" );
                // Inform apps and framework that this is a video only transition
                mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "_transition_type", 1 );
                transition->process = transition_process;

diff --git a/src/tests/hello.c b/src/tests/hello.c
index b5df6df922ce90a28f2b375e403307986a0feb15..f258b609f6f459c97a4e38f5c1c9d392a5d921b2 100644 (file)
--- a/src/tests/hello.c
+++ b/src/tests/hello.c
@@ -46,7 +46,7 @@ mlt_producer create_tracks( int argc, char **argv )
        mlt_tractor tractor = mlt_field_tractor( field );
 
        // Obtain a composite transition
-       mlt_transition transition = mlt_factory_transition( "composite", "10%,10%:15%x15%" );
+       mlt_transition transition = mlt_factory_transition( "composite", "10%/10%:15%x15%" );
 
        // Create track 0
        mlt_producer track0 = create_playlist( argc, argv );