diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-18 01:34:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-18 01:34:41 +0300 |
| commit | 27e812d69702c43313af8a5521841fd7f4da69f1 (patch) | |
| tree | b54543b140c5d38a46eef7ddf189adfaaafe8d54 /source/blender/editors/space_sequencer | |
| parent | 456ca98564555bb072e0e72b64f790e4b8c6ceec (diff) | |
Clear some compiler warnings by commenting some functions, adding others to headers.
left in warnings where functions obviously need to get ported to 2.5x still.
Also, render stamp seq strip works again.
Diffstat (limited to 'source/blender/editors/space_sequencer')
3 files changed, 2 insertions, 26 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index afabbc93610..8b3240e91c8 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -70,8 +70,6 @@ /* Note, Dont use WHILE_SEQ while drawing! - it messes up transform, - Campbell */ - -static int no_rightbox=0, no_leftbox= 0; static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2); static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[3]) diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 6299d22fac0..39a81e7481e 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -121,28 +121,6 @@ typedef struct TransSeq { int len; } TransSeq; -static Sequence *get_foreground_frame_seq(Scene *scene, int frame) -{ - Editing *ed= seq_give_editing(scene, FALSE); - Sequence *seq, *best_seq=NULL; - int best_machine = -1; - - if(!ed) return NULL; - - for (seq=ed->seqbasep->first; seq; seq= seq->next) { - if(seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame) - continue; - /* only use elements you can see - not */ - if (ELEM5(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE, SEQ_COLOR)) { - if (seq->machine > best_machine) { - best_seq = seq; - best_machine = seq->machine; - } - } - } - return best_seq; -} - void seq_rectf(Sequence *seq, rctf *rectf) { if(seq->startstill) rectf->xmin= seq->start; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 869d8f17680..3b4312cda2b 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -176,7 +176,7 @@ static void select_single_seq(Scene *scene, Sequence *seq, int deselect_all) /* // remove this function, replace with invert operator //void swap_select_seq(Scene *scene) - +#if 0 static void select_neighbor_from_last(Scene *scene, int lr) { Sequence *seq= seq_active_get(scene); @@ -206,7 +206,7 @@ static void select_neighbor_from_last(Scene *scene, int lr) if (change) { } } - +#endif /* (de)select operator */ static int sequencer_deselect_exec(bContext *C, wmOperator *UNUSED(op)) |