X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=ea04217518f2089ffb2a741925dde93860c4a8ca;hb=f0422ed330506fd1a382afb625f886bcf7158822;hp=56b162e8664aa952ea734bfbe46e27239dc11774;hpb=e94c6ad740fc4fb40ca32ea3e1a95b6bd9a1c73b;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 56b162e..ea04217 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -9,7 +9,7 @@ set -e
 PROG_NAME=$(basename $0)
 
 # Set default values
-main_layer="Layer 558"
+bg_layer_name="background"
 
 # Pour conversion vidéo:
 fps=8
@@ -17,6 +17,7 @@ fps=8
 debug=0
 trames=1
 SED=sed
+FFMPEG_OPTS="-hide_banner -loglevel error -y"
 
 # -limit memory 5000mb -limit disk 5gb
 IM_OPS=""
@@ -161,16 +162,21 @@ if [ ${trames} -eq 1 ]; then
     ${SED} -i -e /label:,.*/d ${layers}
 
     # Extract global frame size:
-    size=$(get_size "${main_layer}")
+    size=$(get_size "${bg_layer_name}")
 
-    log_dbg "CANVAS SIZE=${size}"
+    log_dbg "Background size: ${size}"
+
+    if [ x"${size}" = x"" ]; then
+        echo "Error: background layer not found"
+        exit 1
+    fi
+
+    # Remove background line:
+    ${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
 
     # Create background frame:
     convert -size ${size} xc:none ${dest}/background.png
 
-    # Remove first line (Layer 558):
-    ${SED} -i -e '1d' ${layers}
-
     # Will start at frame 2 at first loop iteration
     f=1
 
@@ -220,5 +226,5 @@ fi
 
 if which ffmpeg 1> /dev/null 2>&1; then
     # Conversion vidéo:
-    ffmpeg -y -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
+    ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
 fi