* added operators SEQUENCER_OT_lock, unlock, reload, refresh_all, view_all, view_selected.

* sequencer transform now does overlap checks.
* removed old transform functions from sequencer_edit.c
* shuffle_seq moved to kernel, now moves strips to the end of the last sequence of itschannel (if all channels are used). 2.4x would remove the strip.
* most of the 'Strip' menu items now call their operators in the header menu, some for view and select too.

2 files changed, 84 insertions, 15 deletions

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 01effda2e30..11f8dfdf330 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -935,9 +935,9 @@ static void do_gammacross_effect_byte(float facf0, float facf1,
 	char *rt1, *rt2, *rt;
 	
 	xo= x;
-	rt1= (char *)rect1;
-	rt2= (char *)rect2;
-	rt= (char *)out;
+	rt1= (signed char *)rect1;
+	rt2= (signed char *)rect2;
+	rt= (signed char *)out;
 
 	fac2= (int)(256.0*facf0);
 	fac1= 256-fac2;
@@ -2772,7 +2772,7 @@ static void store_icu_yrange_speed(struct Sequence * seq,
 	}	
 }
 
-void sequence_effect_speed_rebuild_map(Scene *scene, Sequence * seq, int force)
+void sequence_effect_speed_rebuild_map(Sequence * seq, int force)
 {
 	float facf0 = seq->facf0;
 	//float ctime, div;
diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c
index 7f17fcfc710..37d8cb1aae6 100644
--- a/source/blender/blenkernel/intern/sequence.c
+++ b/source/blender/blenkernel/intern/sequence.c
@@ -2074,7 +2074,7 @@ static TStripElem* do_handle_speed_effect(Scene *scene, Sequence * seq, int cfra
 	TStripElem * se1 = 0;
 	TStripElem * se2 = 0;
 	
-	sequence_effect_speed_rebuild_map(scene, seq, 0);
+	sequence_effect_speed_rebuild_map(seq, 0);
 	
 	f_cfra = seq->start + s->frameMap[nr];
 	
@@ -2865,16 +2865,13 @@ void free_imbuf_seq_except(Scene *scene, int cfra)
 	SEQ_END
 }
 
-void free_imbuf_seq(Scene *scene)
+void free_imbuf_seq(ListBase * seqbase)
 {
-	Editing *ed= scene->ed;
 	Sequence *seq;
 	TStripElem *se;
 	int a;
-
-	if(ed==NULL) return;
-
-	SEQ_BEGIN(ed, seq) {
+	
+	for(seq= seqbase->first; seq; seq= seq->next) {
 		if(seq->strip) {
 			for(a = 0, se = seq->strip->tstripdata; 
 			    a < seq->strip->len && se; a++, se++) {
@@ -2901,11 +2898,14 @@ void free_imbuf_seq(Scene *scene)
 			if(seq->type==SEQ_MOVIE)
 				free_anim_seq(seq);
 			if(seq->type==SEQ_SPEED) {
-				sequence_effect_speed_rebuild_map(scene, seq, 1);
+				sequence_effect_speed_rebuild_map(seq, 1);
 			}
 		}
+		if(seq->type==SEQ_META) {
+			free_imbuf_seq(&seq->seqbase);
+		}
 	}
-	SEQ_END
+	
 }
 
 static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *changed_seq, int len_change, int ibuf_change)
@@ -2947,7 +2947,7 @@ static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *chan
 			if(seq->type == SEQ_MOVIE)
 				free_anim_seq(seq);
 			if(seq->type == SEQ_SPEED) {
-				sequence_effect_speed_rebuild_map(scene, seq, 1);
+				sequence_effect_speed_rebuild_map(seq, 1);
 			}
 		}
 		
@@ -2981,7 +2981,7 @@ void free_imbuf_seq_with_ipo(Scene *scene, struct Ipo *ipo)
 		if(seq->ipo == ipo) {
 			update_changed_seq_and_deps(scene, seq, 0, 1);
 			if(seq->type == SEQ_SPEED) {
-				sequence_effect_speed_rebuild_map(scene, seq, 1);
+				sequence_effect_speed_rebuild_map(seq, 1);
 			}
 		}
 	}
@@ -3197,3 +3197,72 @@ int seq_tx_test(Sequence * seq)
 {
 	return (seq->type < SEQ_EFFECT) || (get_sequence_effect_num_inputs(seq->type) == 0);
 }
+
+int seq_test_overlap(ListBase * seqbasep, Sequence *test)
+{
+	Sequence *seq;
+
+	seq= seqbasep->first;
+	while(seq) {
+		if(seq!=test) {
+			if(test->machine==seq->machine) {
+				if( (test->enddisp <= seq->startdisp) || (test->startdisp >= seq->enddisp) );
+				else return 1;
+			}
+		}
+		seq= seq->next;
+	}
+	return 0;
+}
+
+
+static void seq_translate(Sequence *seq, int delta)
+{
+	seq->start += delta;
+	if(seq->type==SEQ_META) {
+		Sequence *seq_child;
+		for(seq_child= seq->seqbase.first; seq_child; seq_child= seq_child->next) {
+			seq_translate(seq_child, delta);
+		}
+	}
+
+	calc_sequence_disp(seq);
+}
+
+/* return 0 if there werent enough space */
+int shuffle_seq(ListBase * seqbasep, Sequence *test)
+{
+	int orig_machine= test->machine;
+	test->machine++;
+	calc_sequence(test);
+	while( seq_test_overlap(seqbasep, test) ) {
+		if(test->machine >= MAXSEQ) {
+			break;
+		}
+		test->machine++;
+		calc_sequence(test); // XXX - I dont think this is needed since were only moving vertically, Campbell.
+	}
+
+	
+	if(test->machine >= MAXSEQ) {
+		/* Blender 2.4x would remove the strip.
+		 * nicer to move it to the end */
+
+		Sequence *seq;
+		int new_frame= test->enddisp;
+
+		for(seq= seqbasep->first; seq; seq= seq->next) {
+			if (seq->machine == orig_machine)
+				new_frame = MAX2(new_frame, seq->enddisp);
+		}
+
+		test->machine= orig_machine;
+		new_frame = new_frame + (test->start-test->startdisp); /* adjust by the startdisp */
+		seq_translate(test, new_frame - test->start);
+
+		calc_sequence(test);
+		return 0;
+	} else {
+		return 1;
+	}
+}