From 4b9e177a1021cafb798ea6c8f41422487b141fd2 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Fri, 25 May 2007 06:17:30 +0000 Subject: [PATCH] fix some demos broken by old changes git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@971 d19143bc-622f-0410-bfdd-b5b2a6649095 --- demo/README | 2 +- demo/mlt_attributes | 2 +- demo/mlt_intro | 13 +++++-------- demo/mlt_jcut | 8 ++++---- demo/mlt_lcut | 10 +++++----- docs/inigo.txt | 4 ++-- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/demo/README b/demo/README index bcfcafa..a9a5a08 100644 --- a/demo/README +++ b/demo/README @@ -90,7 +90,7 @@ Audio Stuff A music bed sound track can be mixed with a video. The sound track of the video clip has a "floating" amplitude normalisation filter applied. - Typically, audio nornmalisation applies a constant gain factor across the + Typically, audio normalisation applies a constant gain factor across the entire duration of an audio segment from a single source where the gain factor is automatically determined by anaylsing the maximum "power" or peak levels. However, in news production, a popular requirement is to diff --git a/demo/mlt_attributes b/demo/mlt_attributes index c181480..e4fffb5 100644 --- a/demo/mlt_attributes +++ b/demo/mlt_attributes @@ -3,5 +3,5 @@ meta.attr.location=1 meta.attr.location.markup="Location" \ meta.attr.exclusive=1 meta.attr.exclusive.markup="Exclusive" \ meta.attr.special=1 meta.attr.special.markup="Special" \ meta.attr.super=1 meta.attr.super.0="Line 1" meta.attr.super.1="Line 2" \ --filter data_show:%etv.properties \ +-filter data_show \ $* diff --git a/demo/mlt_intro b/demo/mlt_intro index 82f6d86..4b00848 100644 --- a/demo/mlt_intro +++ b/demo/mlt_intro @@ -1,12 +1,9 @@ inigo \ -watermark1.png out=124 \ +music1.ogg in=100 out=224 \ -track \ --blank 74 \ +watermark1.png out=124 \ clip3.mpeg \ --track \ -music1.ogg in=100 out=224 \ --transition luma resource=luma1.pgm softness=0.2 in=100 out=124 a_track=0 b_track=1 \ --transition mix:1 in=0 out=124 a_track=0 b_track=1 \ --transition mix:1 in=0 out=99 a_track=1 b_track=2 \ --transition mix:-1 in=100 out=124 a_track=1 b_track=2 reverse=1 \ +-mix 25 \ +-mixer luma resource=luma1.pgm softness=0.2 \ +-transition mix:-1 in=100 out=124 \ $* diff --git a/demo/mlt_jcut b/demo/mlt_jcut index fd0b4a3..a5d844e 100644 --- a/demo/mlt_jcut +++ b/demo/mlt_jcut @@ -1,10 +1,10 @@ inigo \ -clip1.dv out=99 \ --track \ -blank 49 \ clip2.dv in=100 \ +-track \ +clip1.dv out=99 \ -transition \ -mix start=0 end=1 in=49 out=50 a_track=0 b_track=1 \ +mix start=0 end=1 in=49 out=50 a_track=1 b_track=0 \ -transition \ -mix:1 in=51 out=99 a_track=0 b_track=1 \ +mix:1 in=51 out=99 a_track=1 b_track=0 \ $* diff --git a/demo/mlt_lcut b/demo/mlt_lcut index 1b8485b..45f81dd 100644 --- a/demo/mlt_lcut +++ b/demo/mlt_lcut @@ -1,12 +1,12 @@ inigo \ +clip1.dv out=100 \ +-track \ -blank 49 \ clip2.dv in=100 \ --track \ -clip1.dv in=0 out=100 \ -transition \ -luma in=50 out=55 a_track=0 b_track=1 reverse=1 \ +luma in=50 out=55 a_track=0 b_track=1 \ -transition \ -mix:1 in=50 out=98 a_track=0 b_track=1 \ +mix:1 in=50 out=98 a_track=1 b_track=0 \ -transition \ -mix start=1 end=0 in=99 out=100 a_track=0 b_track=1 \ +mix start=1 end=0 in=99 out=100 a_track=1 b_track=0 \ $* diff --git a/docs/inigo.txt b/docs/inigo.txt index 7672093..b18af6c 100644 --- a/docs/inigo.txt +++ b/docs/inigo.txt @@ -199,7 +199,7 @@ Attached Filters: Mixes: - The -mix switch provides the simplest means to introducer transitions between + The -mix switch provides the simplest means to introduce transitions between adjacent clips. For example: @@ -208,7 +208,7 @@ Mixes: would provide both an audio and video transition between clip1 and clip2. - This functionality supercedes the enforced use of the -track and -transtition + This functionality supercedes the enforced use of the -track and -transition switches from earlier versions of inigo and makes life a lot easier :-). These can be used in combination, so you can for example do a fade from black -- 1.7.4.4