[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29088] trunk/blender: == Sequencer ==

[Peter Schlaile]

Revision: 29088
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29088
Author:   schlaile
Date:     2010-05-30 21:33:26 +0200 (Sun, 30 May 2010)

Log Message:
-----------
== Sequencer ==

This fixes loading of hard trimmed audio files in readfile
and adds trim options to N-keys for audio files.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2010-05-30 19:29:58 UTC (rev 29087)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2010-05-30 19:33:26 UTC (rev 29088)
@@ -457,6 +457,7 @@
             row = layout.row(align=True)
             sub = row.row()
             sub.scale_x = 2.0
+           
             if not context.screen.animation_playing:
                 sub.operator("screen.animation_play", text="", icon='PLAY')
             else:
@@ -666,7 +667,12 @@
 
         layout.prop(strip, "volume")
 
+        col = layout.column(align=True)
+        col.label(text="Trim Duration:")
+        col.prop(strip, "animation_start_offset", text="Start")
+        col.prop(strip, "animation_end_offset", text="End")
 
+
 class SEQUENCER_PT_scene(SequencerButtonsPanel):
     bl_label = "Scene"
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-05-30 19:29:58 UTC (rev 29087)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-05-30 19:33:26 UTC (rev 29088)
@@ -4174,7 +4174,7 @@
 				if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
 				if(seq->scene) {
 					seq->scene= newlibadr(fd, sce->id.lib, seq->scene);
-					seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs);
+					seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs);
 				}
 				if(seq->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera);
 				if(seq->sound) {
@@ -4185,7 +4185,7 @@
 						seq->sound= newlibadr(fd, sce->id.lib, seq->sound);
 					if (seq->sound) {
 						seq->sound->id.us++;
-						seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs);
+						seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs);
 					}
 				}
 				seq->anim= 0;