Revision: 46544
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46544
Author: campbellbarton
Date: 2012-05-11 10:04:55 +0000 (Fri, 11 May 2012)
Log Message:
-----------
- dont create scene.sequence_editor on read, means data-browser or autocomplete
will allocate a sequencer.
... instead add scene.sequencer_editor_create / clear, these match
id.animation_data_* functions.
- refactor for names, for scene level functions call them BKE_sequencer_*
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/screen/screen_context.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-05-11
09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-05-11
10:04:55 UTC (rev 46544)
@@ -170,6 +170,22 @@
struct ImBuf *give_ibuf_seqbase(SeqRenderData context, float cfra, int
chan_shown, struct ListBase *seqbasep);
void give_ibuf_prefetch_request(SeqRenderData context, float cfra, int
chan_shown);
+
+/* **********************************************************************
+ * sequencer scene functions
+ * ********************************************************************** */
+struct Editing *BKE_sequencer_editing_get(struct Scene *scene, int alloc);
+struct Editing *BKE_sequencer_editing_ensure(struct Scene *scene);
+void BKE_sequencer_editing_free(struct Scene *scene);
+
+void BKE_sequencer_sort(struct Scene *scene);
+
+struct Sequence *BKE_sequencer_active_get(struct Scene *scene);
+int BKE_sequencer_active_get_pair(struct Scene *scene,
+ struct Sequence **seq_act,
struct Sequence **seq_other);
+void BKE_sequencer_active_set(struct Scene *scene, struct Sequence
*seq);
+
+
/* apply functions recursively */
int seqbase_recursive_apply(struct ListBase *seqbase, int (*apply_func)(struct
Sequence *seq, void *), void *arg);
int seq_recursive_apply(struct Sequence *seq, int (*apply_func)(struct
Sequence *, void *), void *arg);
@@ -179,14 +195,12 @@
void seq_free_sequence(struct Scene *scene, struct Sequence *seq);
void seq_free_sequence_recurse(struct Scene *scene, struct Sequence *seq);
void seq_free_strip(struct Strip *strip);
-void seq_free_editing(struct Scene *scene);
+
void seq_free_clipboard(void);
-struct Editing *seq_give_editing(struct Scene *scene, int alloc);
const char *give_seqname(struct Sequence *seq);
void calc_sequence(struct Scene *scene, struct Sequence *seq);
void calc_sequence_disp(struct Scene *scene, struct Sequence *seq);
void reload_sequence_new_file(struct Scene *scene, struct Sequence * seq, int
lock_range);
-void sort_seq(struct Scene *scene);
void build_seqar_cb(struct ListBase *seqbase, struct Sequence ***seqar, int
*totseq,
int (*test_func)(struct Sequence *
seq));
int evaluate_seq_frame(struct Scene *scene, int cfra);
@@ -296,10 +310,6 @@
struct Sequence *get_seq_by_name(struct ListBase *seqbase, const char *name,
int recursive);
-struct Sequence *seq_active_get(struct Scene *scene);
-void seq_active_set(struct Scene *scene, struct Sequence *seq);
-int seq_active_pair_get(struct Scene *scene, struct Sequence **seq_act, struct
Sequence **seq_other);
-
/* api for adding new sequence strips */
typedef struct SeqLoadInfo {
int start_frame;
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-11
09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-11
10:04:55 UTC (rev 46544)
@@ -266,7 +266,7 @@
}
BLI_freelistN(&sce->base);
- seq_free_editing(sce);
+ BKE_sequencer_editing_free(sce);
BKE_free_animdata((ID *)sce);
BKE_keyingsets_free(&sce->keyingsets);
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-05-11
09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-05-11
10:04:55 UTC (rev 46544)
@@ -216,13 +216,10 @@
}
-Editing *seq_give_editing(Scene *scene, int alloc)
+Editing *BKE_sequencer_editing_get(Scene *scene, int alloc)
{
- if (scene->ed == NULL && alloc) {
- Editing *ed;
-
- ed = scene->ed = MEM_callocN(sizeof(Editing), "addseq");
- ed->seqbasep = &ed->seqbase;
+ if (alloc) {
+ BKE_sequencer_editing_ensure(scene);
}
return scene->ed;
}
@@ -250,8 +247,20 @@
seqbase_clipboard.first = seqbase_clipboard.last = NULL;
}
-void seq_free_editing(Scene *scene)
+Editing *BKE_sequencer_editing_ensure(Scene *scene)
{
+ if (scene->ed == NULL) {
+ Editing *ed;
+
+ ed = scene->ed = MEM_callocN(sizeof(Editing), "addseq");
+ ed->seqbasep = &ed->seqbase;
+ }
+
+ return scene->ed;
+}
+
+void BKE_sequencer_editing_free(Scene *scene)
+{
Editing *ed = scene->ed;
MetaStack *ms;
Sequence *seq;
@@ -754,11 +763,11 @@
calc_sequence(scene, seq);
}
-void sort_seq(Scene *scene)
+void BKE_sequencer_sort(Scene *scene)
{
/* all strips together per kind, and in order of y location ("machine")
*/
ListBase seqbase, effbase;
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq, *seqt;
@@ -1075,7 +1084,7 @@
int evaluate_seq_frame(Scene *scene, int cfra)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq_arr[MAXSEQ + 1];
if (ed == NULL) return 0;
@@ -2530,7 +2539,7 @@
ImBuf *give_ibuf_seq(SeqRenderData context, float cfra, int chanshown)
{
- Editing *ed = seq_give_editing(context.scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(context.scene, FALSE);
int count;
ListBase *seqbasep;
@@ -3007,7 +3016,7 @@
void update_changed_seq_and_deps(Scene *scene, Sequence *changed_seq, int
len_change, int ibuf_change)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq;
if (ed == NULL) return;
@@ -3254,7 +3263,7 @@
Sequence *seq_foreground_frame_get(Scene *scene, int frame)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq, *best_seq = NULL;
int best_machine = -1;
@@ -3660,26 +3669,26 @@
}
-Sequence *seq_active_get(Scene *scene)
+Sequence *BKE_sequencer_active_get(Scene *scene)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
if (ed == NULL) return NULL;
return ed->act_seq;
}
-void seq_active_set(Scene *scene, Sequence *seq)
+void BKE_sequencer_active_set(Scene *scene, Sequence *seq)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
if (ed == NULL) return;
ed->act_seq = seq;
}
-int seq_active_pair_get(Scene *scene, Sequence **seq_act, Sequence **seq_other)
+int BKE_sequencer_active_get_pair(Scene *scene, Sequence **seq_act, Sequence
**seq_other)
{
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
- *seq_act = seq_active_get(scene);
+ *seq_act = BKE_sequencer_active_get(scene);
if (*seq_act == NULL) {
return 0;
@@ -3718,7 +3727,7 @@
if (seq_load->flag & SEQ_LOAD_REPLACE_SEL) {
seq_load->flag |= SELECT;
- seq_active_set(scene, seq);
+ BKE_sequencer_active_set(scene, seq);
}
if (seq_load->flag & SEQ_LOAD_SOUND_CACHE) {
@@ -3785,7 +3794,7 @@
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C); /* only for sound */
- Editing *ed = seq_give_editing(scene, TRUE);
+ Editing *ed = BKE_sequencer_editing_get(scene, TRUE);
bSound *sound;
Sequence *seq; /* generic strip vars */
@@ -4015,7 +4024,7 @@
{
Sequence *seq;
Sequence *seqn = NULL;
- Sequence *last_seq = seq_active_get(scene);
+ Sequence *last_seq = BKE_sequencer_active_get(scene);
for (seq = seqbase->first; seq; seq = seq->next) {
seq->tmp = NULL;
@@ -4033,7 +4042,7 @@
if (dupe_flag & SEQ_DUPE_CONTEXT) {
if (seq == last_seq) {
- seq_active_set(scene, seqn);
+ BKE_sequencer_active_set(scene,
seqn);
}
}
}
Modified: trunk/blender/source/blender/editors/animation/anim_deps.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_deps.c 2012-05-11
09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/editors/animation/anim_deps.c 2012-05-11
10:04:55 UTC (rev 46544)
@@ -196,7 +196,7 @@
/* only affect if F-Curve involves sequence_editor.sequences */
if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) {
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq;
char *seq_name;
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2012-05-11 09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2012-05-11 10:04:55 UTC (rev 46544)
@@ -882,7 +882,7 @@
/* only consider if F-Curve involves sequence_editor.sequences
*/
if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) {
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
Sequence *seq;
char *seq_name;
Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c
2012-05-11 09:08:58 UTC (rev 46543)
+++ trunk/blender/source/blender/editors/screen/screen_context.c
2012-05-11 10:04:55 UTC (rev 46544)
@@ -357,7 +357,7 @@
return 1;
}
else if (CTX_data_equals(member, "sequences")) {
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
if (ed) {
Sequence *seq;
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
@@ -368,7 +368,7 @@
}
}
else if (CTX_data_equals(member, "selected_sequences")) {
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
if (ed) {
Sequence *seq;
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
@@ -381,7 +381,7 @@
}
}
else if (CTX_data_equals(member, "selected_editable_sequences")) {
- Editing *ed = seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
if (ed) {
Sequence *seq;
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_select.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
