From f109c2fc7c7ed195003d9deb20710b49d86f12c8 Mon Sep 17 00:00:00 2001
From: Ole Kristian Lien <ole.k.lien@gmail.com>
Date: Thu, 10 Dec 2009 04:36:13 +0000
Subject: =?UTF-8?q?Fungerende=20intro-outro.=20:)=20Litt=20lese=20stoff=20?=
 =?UTF-8?q?og=20sm=C3=A5=20fikser.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/intro | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'tools/intro')

diff --git a/tools/intro b/tools/intro
index 9b08b23..52e6572 100755
--- a/tools/intro
+++ b/tools/intro
@@ -4,11 +4,11 @@
 # Author:  Ole Kristian Lien
 # License: GNU General Public License
 #
-# Generate intro-file to a video
+# Generate intro-file with fade in/out from csv-file
 
 EXT=`echo "$1"|awk -F . '{print $NF}'`
 BASENAME=`basename $1 .$EXT`
-COUNT="10"
+COUNT="1"
 
 LOGO=`./csv $2 $1 logo`
 WHAT=`./csv $2 $1 what`
@@ -25,34 +25,26 @@ fi
 
 # LOGO
 ./image_logo $1 intro-$COUNT white $LOGO
-COUNT=`expr $COUNT + 1`
-./image_logo $1 intro-$COUNT white $LOGO
-COUNT=`expr $COUNT + 1`
-./image_logo $1 intro-$COUNT white $LOGO
+./fade $BASENAME-intro-$COUNT.png 3 white
+rm $BASENAME-intro-$COUNT.png
 COUNT=`expr $COUNT + 1`
 
 # SLIDE 1
 ./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
-COUNT=`expr $COUNT + 1`
-./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
-COUNT=`expr $COUNT + 1`
-./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
+./fade $BASENAME-intro-$COUNT.png 3 white
+rm $BASENAME-intro-$COUNT.png
 COUNT=`expr $COUNT + 1`
 
 # SLIDE 2
 ./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
-COUNT=`expr $COUNT + 1`
-./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
-COUNT=`expr $COUNT + 1`
-./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
+./fade $BASENAME-intro-$COUNT.png 3 white
+rm $BASENAME-intro-$COUNT.png
 COUNT=`expr $COUNT + 1`
 
 # LICENSE
 cp $LICENSE.png $BASENAME-intro-$COUNT.png
-COUNT=`expr $COUNT + 1`
-cp $LICENSE.png $BASENAME-intro-$COUNT.png
-COUNT=`expr $COUNT + 1`
-cp $LICENSE.png $BASENAME-intro-$COUNT.png
+./fade $BASENAME-intro-$COUNT.png 3 white
+rm $BASENAME-intro-$COUNT.png
 
 ./image2video $1 intro
 rm $BASENAME-intro-*.png
-- 
cgit v1.2.3