Fixes for

* [#31285] VSE: audio pitch change delays audio
* [#31260] VSE Trimmed audio plays when overlaped

2 files changed, 1 insertions, 16 deletions

diff --git a/intern/audaspace/intern/AUD_SequencerHandle.cpp b/intern/audaspace/intern/AUD_SequencerHandle.cpp
index d13efb9683b..f4bfae6cee7 100644
--- a/intern/audaspace/intern/AUD_SequencerHandle.cpp
+++ b/intern/audaspace/intern/AUD_SequencerHandle.cpp
@@ -154,6 +154,7 @@ void AUD_SequencerHandle::seek(float position)
 		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();
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 5766099aabb..b021c233f8c 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -2657,19 +2657,6 @@ void SEQUENCER_OT_copy(wmOperatorType *ot)
 	/* 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 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
 	/* 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);