[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29923] trunk/blender/source/blender: last fix still could give corrupt sound, rather then updating the sound info just add and remove the sound handle.

[Campbell Barton]

Revision: 29923
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29923
Author:   campbellbarton
Date:     2010-07-04 12:51:10 +0200 (Sun, 04 Jul 2010)

Log Message:
-----------
last fix still could give corrupt sound, rather then updating the sound info just add and remove the sound handle.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-04 10:22:31 UTC (rev 29922)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-04 10:51:10 UTC (rev 29923)
@@ -549,8 +549,8 @@
 		if(seq->type==SEQ_META) {
 			seqm= seq->seqbase.first;
 			if(seqm) {
-				min= 1000000;
-				max= -1000000;
+				min=  MAXFRAME * 2;
+				max= -MAXFRAME * 2;
 				while(seqm) {
 					if(seqm->startdisp < min) min= seqm->startdisp;
 					if(seqm->enddisp > max) max= seqm->enddisp;

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2010-07-04 10:22:31 UTC (rev 29922)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2010-07-04 10:51:10 UTC (rev 29923)
@@ -2678,12 +2678,17 @@
 		return OPERATOR_CANCELLED;
 	}
 
+	sound_remove_scene_sound(scene, seq_act->scene_sound);
+	sound_remove_scene_sound(scene, seq_other->scene_sound);
+
+	seq_act->scene_sound= NULL;
+	seq_other->scene_sound= NULL;
+
 	calc_sequence(scene, seq_act);
 	calc_sequence(scene, seq_other);
 
-	/* sound needs to be moved */
-	if(seq_act->scene_sound) calc_sequence_disp(scene, seq_act);
-	if(seq_other->scene_sound) calc_sequence_disp(scene, seq_other);
+	if(seq_act->sound)		sound_add_scene_sound(scene, seq_act, seq_act->startdisp, seq_act->enddisp, seq_act->startofs + seq_act->anim_startofs);
+	if(seq_other->sound)	sound_add_scene_sound(scene, seq_other, seq_other->startdisp, seq_other->enddisp, seq_other->startofs + seq_other->anim_startofs);
 
 	WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);