news and squeeze added

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@237 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/demo/demo b/demo/demo
index 05332697560deab0ebe24816ad5b1e70e983f050..105861e31f46ad496a0da318812af76a327c064c 100755 (executable)
--- a/demo/demo
+++ b/demo/demo
@@ -14,7 +14,7 @@ function get_consumer( )
 function show_menu( )
 {
        sed 's/\t\+/\t/g' < demo.ini |
-       awk -F '\t' '{ printf( "%2d. %-30.30s", ++ i, $2 ); if ( i % 2 == 0 ) printf( "\n" ); }'
+       awk -F '\t' '{ printf( "%2d. %-30.30s", ++ i, $2 ); if ( i % 2 == 0 ) printf( "\n" ); } END { if ( i % 2 == 1 ) printf( "\n" ); }'
 }
 
 function check_dependencies( )

diff --git a/demo/demo.ini b/demo/demo.ini
index db49077ce94fc9a3ef8936f8ce8cec21cd0a3b6a..9bfd05b7e0735206994fd387a741c47dfcccb43c 100644 (file)
--- a/demo/demo.ini
+++ b/demo/demo.ini
@@ -16,6 +16,8 @@ mlt_title_over_gfx                    Title over graphic                                      watermark1.png,clip1.dv
 mlt_slideshow                          Slideshow                                                       Scotland
 mlt_bouncy                                     Bouncy, Bouncy                                          clip1.dv,clip3.dv
 mlt_bouncy_ball                                Bouncy, Bouncy Ball                                     clip1.mpeg,clip3.mpeg,circle.png
+mlt_news                                       Breaking News                                           clip1.mpeg,clip2.mpeg
+mlt_squeeze                                    Squeeze Transitions                                     clip1.dv,clip2.dv,clip3.dv
 mlt_jcut                                       J Cut                                                           clip1.dv,clip2.dv
 mlt_lcut                                       L Cut                                                           clip1.dv,clip2.dv
 mlt_fade_black                         Fade from/to black/silence                      clip3.mpeg

diff --git a/demo/mlt_news b/demo/mlt_news
new file mode 100644 (file)
index 0000000..e9a43ec
--- /dev/null
+++ b/demo/mlt_news
@@ -0,0 +1,19 @@
+inigo \
+colour:black out=199 \
+-track \
+hold:avformat:clip1.mpeg out=149 clip1.mpeg \
+-track \
+clip2.mpeg out=199 \
+-track \
+pango: text=" Breaking News                        
+ MLT Rocks India" bgcolour=0xff000080 out=149 \
+pango: text=" Breaking News                        
+ MLT Rocks the World" bgcolour=0xff000080 out=349 \
+-transition mix:1 a_track=0 b_track=2 in=0 out=149 \
+-transition mix:1 a_track=0 b_track=1 in=150 out=199 \
+-transition composite:50%,15%:40%x40% a_track=0 b_track=1 in=0 out=149 \
+-transition composite:10%,15%:40%x40% a_track=0 b_track=2 in=0 out=199 \
+-transition composite:50%,15%:40%x40% end=0,0:100%x100% a_track=0 b_track=1 distort=true in=149 out=199 \
+-transition composite:10%,65%:90%x20% a_track=0 b_track=3 in=0 out=199 \
+-transition composite:10%,65%:90%x20% a_track=1 b_track=3 in=200 out=499 \
+$*

diff --git a/demo/mlt_squeeze b/demo/mlt_squeeze
new file mode 100644 (file)
index 0000000..82e93ee
--- /dev/null
+++ b/demo/mlt_squeeze
@@ -0,0 +1,8 @@
+inigo \
+-blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \
+-track \
+clip1.dv out=124 clip2.dv out=149 clip3.dv in=75 out=224 clip1.dv \
+-transition composite:0%,0%:100%x100% key[25]=50%,0%:5%x100% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=100 out=149 \
+-transition composite:0%,0%:100%x100% key[25]=0%,50%:100%x5% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=250 out=299 \
+-transition composite:0%,0%:100%x100% key[25]=100%,0%:5%x100% key[26]=0%,0%:5%x100% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=400 out=449 \
+$*