X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=df952fa66031326d3aae5517d2d2bccdc610cf6f;hb=665faf610a826459b8edafbbf419e10273465ce8;hp=9fbd121556d65c83f9f6c38bc87c9f6c688958c9;hpb=4945ffa46ea1d5339e877de183b25cda5ed4f8e8;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 9fbd121..df952fa 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -57,11 +57,12 @@ function get_label()
     echo "${token}"
 }
 
-# Arg1: line
+# Arg1: label
 function get_frame_id()
 {
-    frame=$(echo "${1}" | grep -e "label:[0-9]\+" | ${SED} "s/.*label:\([0-9]\+\).*,geometry.*/\1/g")
-    echo "${frame}"
+    local token
+    token=$(echo "${1}" | grep -e "^[0-9]\+" | ${SED} "s/^\([0-9]\+\).*/\1/g")
+    echo "${token}"
 }
 
 # Arg1: line
@@ -72,37 +73,52 @@ function get_scene_id()
     echo "${token}"
 }
 
-# Arg1: line
+# Arg1: label
 function get_group_id()
 {
-    group=$(echo "${1}" | grep -e "label:groupe.*" | ${SED} "s/.*label:groupe-\(.*\),geometry.*/\1/g")
-    echo "${group}"
+    local token
+    token=$(echo "${1}" | grep -e "^groupe" | ${SED} "s/^groupe-\(.*\)/\1/g")
+    echo "${token}"
 }
 
-# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1
-# Arg1: line
+# Arg1: group name
+function get_group_ref()
+{
+    local token
+    token=$(echo "${1}" | grep -e "^ref" | ${SED} "s/^\(ref\).*/\1/g")
+    echo "${token}"
+}
+
+# Get duplicate from. Ex: "dup1-7 planXYZ,geometry..." will return 1
+# Arg1: label
 function get_dup_from()
 {
-    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup\([0-9]\+\)-.*,geometry.*/\1/g")
-    echo "${dup}"
+    local token
+    token=$(echo "${1}" | grep -e "^dup" | ${SED} "s/^dup\([0-9]\+\)-.*/\1/g")
+    echo "${token}"
 }
 
-# Get duplicate to. Ex: "label:dup1-7 planXYZ,geometry..." will return 7
-# Arg1: line
+# Get duplicate to. Ex: "dup1-7 planXYZ,geometry..." will return 7
+# Arg1: label
 function get_dup_to()
 {
-    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup[0-9]\+-\([0-9]\+\).*,geometry.*/\1/g")
-    echo "${dup}"
+    local token
+    token=$(echo "${1}" | grep -e "^dup" | ${SED} "s/^dup[0-9]\+-\([0-9]\+\).*/\1/g")
+    echo "${token}"
 }
 
 function generate_video()
 {
     if which ffmpeg 1> /dev/null 2>&1; then
         if [ -f ${dest}/${group}-f1.png ]; then
-            if [ ${dry_run} -eq 0 ]; then
-                # Conversion vidéo:
+            log_dbg "generate_video start"
+            if [ ${dry_run} -eq 1 ]; then
+                touch ${dest}/${group}.mp4
+            else
                 ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4
             fi
+
+            log_dbg "generate_video: end"
         fi
     fi
 }
@@ -202,9 +218,6 @@ if [ ${trames} -eq 1 ]; then
     # Remove background line:
     ${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
 
-    # Remove reference lines:
-    ${SED} -i -e /label:${ref_layer_prefix}.*/d ${layers}
-
     # Create background frame:
     convert -size ${size} xc:none ${dest}/background.png
 
@@ -217,20 +230,29 @@ if [ ${trames} -eq 1 ]; then
         scene=$(get_scene_id "${l}")
         label=$(get_label "${l}")
         p=$(get_pos "${l}")
-        nf=$(get_frame_id "${l}")
-        ng=$(get_group_id "${l}")
 
-        dup_from=$(get_dup_from "${l}")
-        dup_to=$(get_dup_to "${l}")
+        nf=$(get_frame_id "${label}")
+        ng=$(get_group_id "${label}")
+        dup_from=$(get_dup_from "${label}")
+        dup_to=$(get_dup_to "${label}")
 
         # Also indicate a new frame, but to be copied from..to:
         if [ x"${dup_from}" != x"" ]; then
             nf=${dup_from}
         fi
 
+        log_dbg "Layer ${scene}"
+        log_dbg "  nom: ${label}"
+        log_dbg "  pos: ${p}"
+
+        group_ref=$(get_group_ref "${group}")
+        log_dbg "  group_ref: ${group_ref}"
+
         # Only change group if ng is set...
         if [ x"${ng}" != x"" ]; then
-            generate_video
+            if [ x"${group_ref}" != x"ref" ]; then
+                generate_video
+            fi
 
             group="${ng}"
             log_dbg "New group: ${ng}"
@@ -243,9 +265,11 @@ if [ ${trames} -eq 1 ]; then
             continue
         fi
 
-        log_dbg "Layer ${scene}"
-        log_dbg "  nom: ${label}"
-        log_dbg "  pos: ${p}"
+        if [ x"${group_ref}" != x"" ]; then
+            # Ignore all images in groupe-ref:
+            log_dbg "  ignore (groupe-ref)"
+            continue
+        fi
 
         files="${files} -page ${p} ${src}[${scene}]"