[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60453] trunk/blender: Fix [#36422] Trimmed audio files (hard cut only) in a metastrip have their trim removed

[Bastien Montagne]

Revision: 60453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60453
Author:   mont29
Date:     2013-09-30 20:53:53 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
Fix [#36422] Trimmed audio files (hard cut only) in a metastrip have their trim removed

Meta sound update (seq_update_sound_bounds_recursive_rec) was not taking into account hard trim (anim_startofs) when setting sound's start, while default sound strip update (sound_move_scene_sound_defaults) did... This could use some refactor, though, with a single func used in both cases, to avoid such issue.

Also added soft trim to sound panel, only hard one was available.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-09-30 20:52:57 UTC (rev 60452)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2013-09-30 20:53:53 UTC (rev 60453)
@@ -685,11 +685,16 @@
         layout.prop(strip, "pan")
 
         col = layout.column(align=True)
-        col.label(text="Trim Duration:")
+        col.label(text="Trim Duration (hard):")
         col.prop(strip, "animation_offset_start", text="Start")
         col.prop(strip, "animation_offset_end", text="End")
 
+        col = layout.column(align=True)
+        col.label(text="Trim Duration (soft):")
+        col.prop(strip, "frame_offset_start", text="Start")
+        col.prop(strip, "frame_offset_end", text="End")
 
+
 class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel):
     bl_label = "Scene"
 

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-09-30 20:52:57 UTC (rev 60452)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-09-30 20:53:53 UTC (rev 60453)
@@ -632,7 +632,7 @@
 					endofs = seq->start + seq->len - end;
 
 				sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs,
-				                       seq->start + seq->len - endofs, startofs);
+				                       seq->start + seq->len - endofs, startofs + seq->anim_startofs);
 			}
 		}
 	}
@@ -664,8 +664,9 @@
 	if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 		BKE_sequencer_update_sound_bounds(scene, seq);
 	}
-	else if (seq->type == SEQ_TYPE_META)
+	else if (seq->type == SEQ_TYPE_META) {
 		seq_update_sound_bounds_recursive(scene, seq);
+	}
 }
 
 void BKE_sequence_calc(Scene *scene, Sequence *seq)