[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46304] trunk/blender: Fixes for

[Joerg Mueller]

Revision: 46304
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46304
Author:   nexyon
Date:     2012-05-04 23:28:27 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Fixes for
* [#31285] VSE: audio pitch change delays audio
* [#31260] VSE Trimmed audio plays when overlaped

Modified Paths:
--------------
    trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c

Modified: trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp	2012-05-04 22:34:04 UTC (rev 46303)
+++ trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp	2012-05-04 23:28:27 UTC (rev 46304)
@@ -154,6 +154,7 @@
 		if(seekpos < 0)
 			seekpos = 0;
 		seekpos += m_entry->m_skip;
+		m_handle->setPitch(1.0f);
 		m_handle->seek(seekpos);
 		if(position < m_entry->m_begin)
 			m_handle->pause();

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-05-04 22:34:04 UTC (rev 46303)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2012-05-04 23:28:27 UTC (rev 46304)
@@ -2657,19 +2657,6 @@
 	/* properties */
 }
 
-static void seq_paste_add_sound(Scene *scene, Sequence *seq)
-{
-	if (seq->type == SEQ_META) {
-		Sequence *iseq;
-		for (iseq = seq->seqbase.first; iseq; iseq = iseq->next) {
-			seq_paste_add_sound(scene, iseq);
-		}
-	}
-	else if (seq->type == SEQ_SOUND) {
-		seq->scene_sound = sound_add_scene_sound_defaults(scene, seq);
-	}
-}
-
 static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
@@ -2698,9 +2685,6 @@
 	/* make sure the pasted strips have unique names between them */
 	for (; iseq; iseq = iseq->next) {
 		seq_recursive_apply(iseq, apply_unique_name_cb, scene);
-
-		/* restore valid sound_scene for newly added strips */
-		seq_paste_add_sound(scene, iseq);
 	}
 
 	WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);