Code cleanup: BKE_ prefix for public sequencer functions

3 files changed, 50 insertions, 50 deletions

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9b91729b5d7..09099ca5d93 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -475,7 +475,7 @@ static void rna_Scene_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 static void rna_Scene_fps_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr))
 {
 	sound_update_fps(scene);
-	seq_update_sound_bounds_all(scene);
+	BKE_sequencer_update_sound_bounds_all(scene);
 }
 
 static void rna_Scene_listener_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr))
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 5c851550cc6..070c0e8febe 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -126,11 +126,11 @@ static void rna_SequenceEditor_elements_begin(CollectionPropertyIterator *iter,
 static void rna_Sequence_frame_change_update(Scene *scene, Sequence *seq)
 {
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
-	ListBase *seqbase = seq_seqbase(&ed->seqbase, seq);
-	calc_sequence_disp(scene, seq);
+	ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
-	if (seq_test_overlap(seqbase, seq)) {
-		shuffle_seq(seqbase, seq, scene); /* XXX - BROKEN!, uses context seqbasep */
+	if (BKE_sequence_test_overlap(seqbase, seq)) {
+		BKE_sequence_base_shuffle(seqbase, seq, scene); /* XXX - BROKEN!, uses context seqbasep */
 	}
 	BKE_sequencer_sort(scene);
 }
@@ -140,7 +140,7 @@ static void rna_Sequence_start_frame_set(PointerRNA *ptr, int value)
 	Sequence *seq = (Sequence *)ptr->data;
 	Scene *scene = (Scene *)ptr->id.data;
 	
-	seq_translate(scene, seq, value - seq->start);
+	BKE_sequence_translate(scene, seq, value - seq->start);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -149,8 +149,8 @@ static void rna_Sequence_start_frame_final_set(PointerRNA *ptr, int value)
 	Sequence *seq = (Sequence *)ptr->data;
 	Scene *scene = (Scene *)ptr->id.data;
 
-	seq_tx_set_final_left(seq, value);
-	seq_single_fix(seq);
+	BKE_sequence_tx_set_final_left(seq, value);
+	BKE_sequence_single_fix(seq);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -159,8 +159,8 @@ static void rna_Sequence_end_frame_final_set(PointerRNA *ptr, int value)
 	Sequence *seq = (Sequence *)ptr->data;
 	Scene *scene = (Scene *)ptr->id.data;
 
-	seq_tx_set_final_right(seq, value);
-	seq_single_fix(seq);
+	BKE_sequence_tx_set_final_right(seq, value);
+	BKE_sequence_single_fix(seq);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -171,7 +171,7 @@ static void rna_Sequence_anim_startofs_final_set(PointerRNA *ptr, int value)
 
 	seq->anim_startofs = MIN2(value, seq->len + seq->anim_startofs);
 
-	reload_sequence_new_file(scene, seq, FALSE);
+	BKE_sequence_reload_new_file(scene, seq, FALSE);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -182,7 +182,7 @@ static void rna_Sequence_anim_endofs_final_set(PointerRNA *ptr, int value)
 
 	seq->anim_endofs = MIN2(value, seq->len + seq->anim_endofs);
 
-	reload_sequence_new_file(scene, seq, FALSE);
+	BKE_sequence_reload_new_file(scene, seq, FALSE);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -191,21 +191,21 @@ static void rna_Sequence_frame_length_set(PointerRNA *ptr, int value)
 	Sequence *seq = (Sequence *)ptr->data;
 	Scene *scene = (Scene *)ptr->id.data;
 	
-	seq_tx_set_final_right(seq, seq->start + value);
+	BKE_sequence_tx_set_final_right(seq, seq->start + value);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
 static int rna_Sequence_frame_length_get(PointerRNA *ptr)
 {
 	Sequence *seq = (Sequence *)ptr->data;
-	return seq_tx_get_final_right(seq, 0) - seq_tx_get_final_left(seq, 0);
+	return BKE_sequence_tx_get_final_right(seq, 0) - BKE_sequence_tx_get_final_left(seq, 0);
 }
 
 static int rna_Sequence_frame_editable(PointerRNA *ptr)
 {
 	Sequence *seq = (Sequence *)ptr->data;
 	/* Effect sequences' start frame and length must be readonly! */
-	return (get_sequence_effect_num_inputs(seq->type)) ? 0 : PROP_EDITABLE;
+	return (BKE_sequence_effect_get_num_inputs(seq->type)) ? 0 : PROP_EDITABLE;
 }
 
 static void rna_Sequence_channel_set(PointerRNA *ptr, int value)
@@ -213,12 +213,12 @@ static void rna_Sequence_channel_set(PointerRNA *ptr, int value)
 	Sequence *seq = (Sequence *)ptr->data;
 	Scene *scene = (Scene *)ptr->id.data;
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
-	ListBase *seqbase = seq_seqbase(&ed->seqbase, seq);
+	ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq);
 
 	seq->machine = value;
 	
-	if (seq_test_overlap(seqbase, seq) ) {
-		shuffle_seq(seqbase, seq, scene);  /* XXX - BROKEN!, uses context seqbasep */
+	if (BKE_sequence_test_overlap(seqbase, seq) ) {
+		BKE_sequence_base_shuffle(seqbase, seq, scene);  /* XXX - BROKEN!, uses context seqbasep */
 	}
 	BKE_sequencer_sort(scene);
 }
@@ -312,7 +312,7 @@ static char *rna_SequenceTransform_path(PointerRNA *ptr)
 	data.transform = ptr->data;
 
 	/* irritating we need to search for our sequence! */
-	seqbase_recursive_apply(&ed->seqbase, transform_seq_cmp_cb, &data);
+	BKE_sequencer_base_recursive_apply(&ed->seqbase, transform_seq_cmp_cb, &data);
 	seq = data.seq;
 
 	if (seq && seq->name + 2)
@@ -343,7 +343,7 @@ static char *rna_SequenceCrop_path(PointerRNA *ptr)
 	data.crop = ptr->data;
 
 	/* irritating we need to search for our sequence! */
-	seqbase_recursive_apply(&ed->seqbase, crop_seq_cmp_cb, &data);
+	BKE_sequencer_base_recursive_apply(&ed->seqbase, crop_seq_cmp_cb, &data);
 	seq = data.seq;
 
 	if (seq && seq->name + 2)
@@ -380,7 +380,7 @@ static void rna_Sequence_name_set(PointerRNA *ptr, const char *value)
 	BLI_strncpy_utf8(seq->name + 2, value, sizeof(seq->name) - 2);
 	
 	/* make sure the name is unique */
-	seqbase_unique_name_recursive(&scene->ed->seqbase, seq);
+	BKE_seqence_base_unique_name_recursive(&scene->ed->seqbase, seq);
 	
 	/* fix all the animation data which may link to this */
 
@@ -557,7 +557,7 @@ static int rna_Sequence_input_count_get(PointerRNA *ptr)
 {
 	Sequence *seq = (Sequence *)(ptr->data);
 
-	return get_sequence_effect_num_inputs(seq->type);
+	return BKE_sequence_effect_get_num_inputs(seq->type);
 }
 
 #if 0
@@ -580,32 +580,32 @@ static void rna_Sequence_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *U
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 
 	if (ed)
-		free_imbuf_seq(scene, &ed->seqbase, FALSE, TRUE);
+		BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE, TRUE);
 }
 
 static void rna_Sequence_update_reopen_files(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 {
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 
-	free_imbuf_seq(scene, &ed->seqbase, FALSE, FALSE);
+	BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE, FALSE);
 
 	if (RNA_struct_is_a(ptr->type, &RNA_SoundSequence))
-		seq_update_sound_bounds(scene, ptr->data);
+		BKE_sequencer_update_sound_bounds(scene, ptr->data);
 }
 
 static void rna_Sequence_mute_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 
-	seq_update_muting(ed);
+	BKE_sequencer_update_muting(ed);
 	rna_Sequence_update(bmain, scene, ptr);
 }
 
 static void rna_Sequence_filepath_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	Sequence *seq = (Sequence *)(ptr->data);
-	reload_sequence_new_file(scene, seq, TRUE);
-	calc_sequence(scene, seq);
+	BKE_sequence_reload_new_file(scene, seq, TRUE);
+	BKE_sequence_calc(scene, seq);
 	rna_Sequence_update(bmain, scene, ptr);
 }
 
@@ -630,10 +630,10 @@ static void rna_Sequence_tcindex_update(Main *bmain, Scene *scene, PointerRNA *p
 	data.seq = NULL;
 	data.seq_proxy = ptr->data;
 
-	seqbase_recursive_apply(&ed->seqbase, seqproxy_seq_cmp_cb, &data);
+	BKE_sequencer_base_recursive_apply(&ed->seqbase, seqproxy_seq_cmp_cb, &data);
 	seq = data.seq;
 
-	reload_sequence_new_file(scene, seq, FALSE);
+	BKE_sequence_reload_new_file(scene, seq, FALSE);
 	rna_Sequence_frame_change_update(scene, seq);
 }
 
@@ -672,7 +672,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr)
 	data.color_balance = ptr->data;
 
 	/* irritating we need to search for our sequence! */
-	seqbase_recursive_apply(&ed->seqbase, colbalance_seq_cmp_cb, &data);
+	BKE_sequencer_base_recursive_apply(&ed->seqbase, colbalance_seq_cmp_cb, &data);
 	seq = data.seq;
 
 	if (seq && seq->name + 2)
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c
index 6c54b7c2cf3..549868e5ed0 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.c
+++ b/source/blender/makesrna/intern/rna_sequencer_api.c
@@ -68,7 +68,7 @@ static void rna_Sequence_swap_internal(Sequence *seq_self, ReportList *reports,
 {
 	const char *error_msg;
 	
-	if (seq_swap(seq_self, seq_other, &error_msg) == 0)
+	if (BKE_sequence_swap(seq_self, seq_other, &error_msg) == 0)
 		BKE_report(reports, RPT_ERROR, error_msg);
 }
 
@@ -79,11 +79,11 @@ static Sequence *alloc_generic_sequence(Editing *ed, const char *name, int start
 	Strip *strip;
 	StripElem *se;
 
-	seq = alloc_sequence(ed->seqbasep, start_frame, channel);
+	seq = BKE_sequence_alloc(ed->seqbasep, start_frame, channel);
 	seq->type = type;
 
 	BLI_strncpy(seq->name + 2, name, sizeof(seq->name) - 2);
-	seqbase_unique_name_recursive(&ed->seqbase, seq);
+	BKE_seqence_base_unique_name_recursive(&ed->seqbase, seq);
 
 	seq->strip = strip = MEM_callocN(sizeof(Strip), "strip");
 	seq->strip->us = 1;
@@ -111,7 +111,7 @@ static Sequence *rna_Sequences_new_clip(ID *id, Editing *ed,
 	seq->len =  BKE_movieclip_get_duration(clip);
 	id_us_plus((ID *)clip);
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -130,7 +130,7 @@ static Sequence *rna_Sequences_new_mask(ID *id, Editing *ed,
 	seq->len = BKE_mask_get_duration(mask);
 	id_us_plus((ID *)mask);
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -150,7 +150,7 @@ static Sequence *rna_Sequences_new_scene(ID *id, Editing *ed,
 	seq->scene_sound = sound_scene_add_scene_sound(scene, seq, start_frame, start_frame + seq->len, 0);
 	id_us_plus((ID *)sce_seq);
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -170,11 +170,11 @@ static Sequence *rna_Sequences_new_image(ID *id, Editing *ed, ReportList *report
 	if (seq->strip->stripdata->name[0] == '\0') {
 		BKE_report(reports, RPT_ERROR, "Sequences.new_image: unable to open image file");
 		BLI_remlink(&ed->seqbase, seq);
-		seq_free_sequence(scene, seq);
+		BKE_sequence_free(scene, seq);
 		return NULL;
 	}
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -200,7 +200,7 @@ static Sequence *rna_Sequences_new_movie(ID *id, Editing *ed, ReportList *report
 	seq->anim_preseek = IMB_anim_get_preseek(an);
 	seq->len = IMB_anim_get_duration(an, IMB_TC_RECORD_RUN);
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -227,7 +227,7 @@ static Sequence *rna_Sequences_new_sound(ID *id, Editing *ed, Main *bmain, Repor
 
 	seq->scene_sound = sound_add_scene_sound(scene, seq, start_frame, start_frame + seq->len, 0);
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -251,7 +251,7 @@ static Sequence *rna_Sequences_new_effect(ID *id, Editing *ed, ReportList *repor
 	Sequence *seq;
 	struct SeqEffectHandle sh;
 
-	switch (get_sequence_effect_num_inputs(type)) {
+	switch (BKE_sequence_effect_get_num_inputs(type)) {
 		case 0:
 			if (end_frame <= start_frame) {
 				BKE_report(reports, RPT_ERROR,
@@ -282,13 +282,13 @@ static Sequence *rna_Sequences_new_effect(ID *id, Editing *ed, ReportList *repor
 			break;
 		default:
 			BKE_report(reports, RPT_ERROR,
-			           "Sequences.new_effect: get_sequence_effect_num_inputs() > 3 (should never happen)");
+			           "Sequences.new_effect: BKE_sequence_effect_get_num_inputs() > 3 (should never happen)");
 			return NULL;
 	}
 
 	seq = alloc_generic_sequence(ed, name, start_frame, channel, type, NULL);
 
-	sh = get_sequence_effect(seq);
+	sh = BKE_sequence_get_effect(seq);
 
 	seq->seq1 = seq1;
 	seq->seq2 = seq2;
@@ -298,12 +298,12 @@ static Sequence *rna_Sequences_new_effect(ID *id, Editing *ed, ReportList *repor
 
 	if (!seq1) { /* effect has no deps */
 		seq->len = 1;
-		seq_tx_set_final_right(seq, end_frame);
+		BKE_sequence_tx_set_final_right(seq, end_frame);
 	}
 
 	seq->flag |= SEQ_USE_EFFECT_DEFAULT_FADE;
 
-	calc_sequence(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -315,7 +315,7 @@ static void rna_Sequences_remove(ID *id, Editing *ed, Sequence *seq)
 	Scene *scene = (Scene *)id;
 
 	BLI_remlink(&ed->seqbase, seq);
-	seq_free_sequence(scene, seq);
+	BKE_sequence_free(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 }
@@ -330,7 +330,7 @@ static StripElem *rna_SequenceElements_push(ID *id, Sequence *seq, const char *f
 	BLI_strncpy(se->name, filename, sizeof(se->name));
 	seq->len++;
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 
@@ -370,7 +370,7 @@ static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports,
 	MEM_freeN(seq->strip->stripdata);
 	seq->strip->stripdata = new_seq;
 
-	calc_sequence_disp(scene, seq);
+	BKE_sequence_calc_disp(scene, seq);
 
 	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
 }
@@ -383,7 +383,7 @@ void RNA_api_sequence_strip(StructRNA *srna)
 	FunctionRNA *func;
 	PropertyRNA *parm;
 
-	func = RNA_def_function(srna, "getStripElem", "give_stripelem");
+	func = RNA_def_function(srna, "getStripElem", "BKE_sequencer_give_stripelem");
 	RNA_def_function_ui_description(func, "Return the strip element from a given frame or None");
 	parm = RNA_def_int(func, "frame", 0, -MAXFRAME, MAXFRAME, "Frame",
 	                   "The frame to get the strip element from", -MAXFRAME, MAXFRAME);