Merge pull request #37 from jliljebl/luma-lift-gain-gamma

[mlt] / demo / demo

diff --git a/demo/demo b/demo/demo
index 105861e31f46ad496a0da318812af76a327c064c..8ebe737ad23484159571351559422d6680df9ff1 100755 (executable)
--- a/demo/demo
+++ b/demo/demo
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+export MLT_PROFILE=dv_pal
+export LC_NUMERIC=C
+
 function show_consumers( )
 {
        awk -F '\t' '{ printf( "%d. %s\n", ++ i, $1 ); }' < consumers.ini
@@ -47,8 +50,6 @@ function get_demo( )
        fi
 }
 
-cd ..; . setenv; cd -
-
 while [ 1 ]
 do
 
@@ -87,11 +88,11 @@ do
        
                if [ "$usable" = "0" -a "$demo" != "" ]
                then
-                       if [ "$MLT_CONSUMER" == "westley:" ]
-                       then    export WESTLEY_CONSUMER="westley:$demo.westley"
-                                       bash $demo -consumer $WESTLEY_CONSUMER
-                                       inigo +$demo.txt out=100 $demo.westley $demo.westley -filter watermark:watermark1.png composite.fill=true
-                       elif [ "$MLT_CONSUMER" == "westley" ]
+                       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%
+                       elif [ "$MLT_CONSUMER" == "xml" ]
                        then    bash $demo -consumer $MLT_CONSUMER | less
                        else    bash $demo -consumer $MLT_CONSUMER
                        fi