diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
commit | ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 (patch) | |
tree | 81af4c18519181490074508dbe9a8d515eab634f /source/blender/editors/space_sequencer | |
parent | 5a90ea77bc1333efe4e1e54984a080550ed3f707 (diff) |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/editors/space_sequencer')
7 files changed, 451 insertions, 411 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 818995bfa23..7c5f1a1543f 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -88,10 +88,10 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) { - if(flag & SEQPROP_STARTFRAME) + if (flag & SEQPROP_STARTFRAME) RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); - if(flag & SEQPROP_ENDFRAME) + if (flag & SEQPROP_ENDFRAME) RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not usual since most strips have a fixed length */ RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, "Channel", "Channel to place this strip into", 1, MAXSEQ); @@ -103,10 +103,10 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) static void sequencer_generic_invoke_path__internal(bContext *C, wmOperator *op, const char *identifier) { - if(RNA_struct_find_property(op->ptr, identifier)) { + if (RNA_struct_find_property(op->ptr, identifier)) { Scene *scene= CTX_data_scene(C); Sequence *last_seq= seq_active_get(scene); - if(last_seq && last_seq->strip && SEQ_HAS_PATH(last_seq)) { + if (last_seq && last_seq->strip && SEQ_HAS_PATH(last_seq)) { char path[sizeof(last_seq->strip->dir)]; BLI_strncpy(path, last_seq->strip->dir, sizeof(path)); BLI_path_abs(path, G.main->name); @@ -124,7 +124,7 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &mval_v2d[0], &mval_v2d[1]); /* effect strips don't need a channel initialized from the mouse */ - if(!(flag & SEQPROP_NOCHAN)) { + if (!(flag & SEQPROP_NOCHAN)) { RNA_int_set(op->ptr, "channel", (int)mval_v2d[1]+0.5f); } @@ -151,15 +151,16 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) seq_load->channel= RNA_int_get(op->ptr, "channel"); seq_load->len= 1; // images only, if endframe isn't set! - if(RNA_struct_find_property(op->ptr, "filepath")) { + if (RNA_struct_find_property(op->ptr, "filepath")) { RNA_string_get(op->ptr, "filepath", seq_load->path); /* full path, file is set by the caller */ is_file= 1; - } else if (RNA_struct_find_property(op->ptr, "directory")) { + } + else if (RNA_struct_find_property(op->ptr, "directory")) { RNA_string_get(op->ptr, "directory", seq_load->path); /* full path, file is set by the caller */ is_file= 0; } - if((is_file != -1) && relative) + if ((is_file != -1) && relative) BLI_path_rel(seq_load->path, G.main->name); @@ -180,10 +181,10 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) seq_load->flag |= SEQ_LOAD_FRAME_ADVANCE; - if(is_file==1) { + if (is_file==1) { BLI_strncpy(seq_load->name, BLI_path_basename(seq_load->path), sizeof(seq_load->name)); } - else if(RNA_struct_find_property(op->ptr, "files")) { + else if (RNA_struct_find_property(op->ptr, "files")) { /* used for image strip */ /* best guess, first images name */ RNA_BEGIN(op->ptr, itemptr, "files") { @@ -244,8 +245,8 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) seq->flag |= SELECT; } - if(RNA_boolean_get(op->ptr, "overlap") == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (RNA_boolean_get(op->ptr, "overlap") == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -256,12 +257,12 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) static int sequencer_add_scene_strip_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } - if(!RNA_struct_property_is_set(op->ptr, "scene")) + if (!RNA_struct_property_is_set(op->ptr, "scene")) return WM_enum_search_invoke(C, op, event); sequencer_generic_invoke_xy__internal(C, op, event, 0); @@ -340,8 +341,8 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op) seq->flag |= SELECT; } - if(RNA_boolean_get(op->ptr, "overlap") == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (RNA_boolean_get(op->ptr, "overlap") == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -352,12 +353,12 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op) static int sequencer_add_movieclip_strip_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } - if(!RNA_struct_property_is_set(op->ptr, "clip")) + if (!RNA_struct_property_is_set(op->ptr, "clip")) return WM_enum_search_invoke(C, op, event); sequencer_generic_invoke_xy__internal(C, op, event, 0); @@ -408,7 +409,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad tot_files= RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files")); - if(tot_files) { + if (tot_files) { /* multiple files */ char dir_only[FILE_MAX]; char file_only[FILE_MAX]; @@ -421,8 +422,8 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad seq = seq_load_func(C, ed->seqbasep, &seq_load); if (seq) { - if(overlap == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (overlap == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } } } @@ -432,8 +433,8 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad /* single file */ seq = seq_load_func(C, ed->seqbasep, &seq_load); if (seq) { - if(overlap == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (overlap == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } } } @@ -461,13 +462,13 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op) static int sequencer_add_movie_strip_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } /* This is for drag and drop */ - if((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || + if ((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || RNA_struct_property_is_set(op->ptr, "filepath")) { sequencer_generic_invoke_xy__internal(C, op, event, SEQPROP_NOPATHS); @@ -515,13 +516,13 @@ static int sequencer_add_sound_strip_exec(bContext *C, wmOperator *op) static int sequencer_add_sound_strip_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } /* This is for drag and drop */ - if((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || + if ((RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) || RNA_struct_property_is_set(op->ptr, "filepath")) { sequencer_generic_invoke_xy__internal(C, op, event, SEQPROP_NOPATHS); @@ -577,10 +578,10 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) /* images are unique in how they handle this - 1 per strip elem */ seq_load.len= RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files")); - if(seq_load.len==0) + if (seq_load.len==0) return OPERATOR_CANCELLED; - if(seq_load.flag & SEQ_LOAD_REPLACE_SEL) + if (seq_load.flag & SEQ_LOAD_REPLACE_SEL) deselect_all_seq(scene); @@ -597,8 +598,8 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) } RNA_END; - if(seq_load.len == 1) { - if(seq_load.start_frame < seq_load.end_frame) { + if (seq_load.len == 1) { + if (seq_load.start_frame < seq_load.end_frame) { seq->endstill= seq_load.end_frame - seq_load.start_frame; } } @@ -610,8 +611,8 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) /* last active name */ strncpy(ed->act_imagedir, strip->dir, FILE_MAXDIR-1); - if(RNA_boolean_get(op->ptr, "overlap") == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (RNA_boolean_get(op->ptr, "overlap") == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -622,14 +623,14 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) static int sequencer_add_image_strip_invoke(bContext *C, wmOperator *op, wmEvent *event) { - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } /* drag drop has set the names */ - if(RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) { + if (RNA_struct_property_is_set(op->ptr, "files") && RNA_collection_length(op->ptr, "files")) { sequencer_generic_invoke_xy__internal(C, op, event, SEQPROP_ENDFRAME|SEQPROP_NOPATHS); return sequencer_add_image_strip_exec(C, op); } @@ -685,7 +686,7 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) type= RNA_enum_get(op->ptr, "type"); // XXX move to invoke - if(!seq_effect_find_selected(scene, NULL, type, &seq1, &seq2, &seq3, &error_msg)) { + if (!seq_effect_find_selected(scene, NULL, type, &seq1, &seq2, &seq3, &error_msg)) { BKE_report(op->reports, RPT_ERROR, error_msg); return OPERATOR_CANCELLED; } @@ -730,35 +731,37 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) sh.init_plugin(seq, path); - if(seq->plugin==NULL) { + if (seq->plugin==NULL) { BLI_remlink(ed->seqbasep, seq); seq_free_sequence(scene, seq); BKE_reportf(op->reports, RPT_ERROR, "Sequencer plugin \"%s\" could not load", path); return OPERATOR_CANCELLED; } - } else if (seq->type == SEQ_COLOR) { + } + else if (seq->type == SEQ_COLOR) { SolidColorVars *colvars= (SolidColorVars *)seq->effectdata; RNA_float_get_array(op->ptr, "color", colvars->col); seq->blend_mode= SEQ_CROSS; /* so alpha adjustment fade to the strip below */ - } else if (seq->type == SEQ_ADJUSTMENT) { + } + else if (seq->type == SEQ_ADJUSTMENT) { seq->blend_mode= SEQ_CROSS; } /* an unset channel is a special case where we automatically go above * the other strips. */ - if(!RNA_struct_property_is_set(op->ptr, "channel")) { - if(seq->seq1) { + if (!RNA_struct_property_is_set(op->ptr, "channel")) { + if (seq->seq1) { int chan= MAX3( seq->seq1 ? seq->seq1->machine : 0, seq->seq2 ? seq->seq2->machine : 0, seq->seq3 ? seq->seq3->machine : 0); - if(chan < MAXSEQ) + if (chan < MAXSEQ) seq->machine= chan; } } - if(RNA_boolean_get(op->ptr, "overlap") == FALSE) { - if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); + if (RNA_boolean_get(op->ptr, "overlap") == FALSE) { + if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene); } update_changed_seq_and_deps(scene, seq, 1, 1); /* runs calc_sequence */ @@ -787,19 +790,19 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven int type= -1; int prop_flag= SEQPROP_ENDFRAME; - if(!ED_operator_sequencer_active(C)) { + if (!ED_operator_sequencer_active(C)) { BKE_report(op->reports, RPT_ERROR, "Sequencer area not active"); return OPERATOR_CANCELLED; } - if(is_type_set) { + if (is_type_set) { type= RNA_enum_get(op->ptr, "type"); /* when invoking an effect strip which uses inputs, * skip initializing the channel from the mouse. * Instead leave the property unset so exec() initializes it to be * above the strips its applied to. */ - if(get_sequence_effect_num_inputs(type) != 0) { + if (get_sequence_effect_num_inputs(type) != 0) { prop_flag |= SEQPROP_NOCHAN; } } diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index d7fe12bb0c2..ee1a0a7ef6d 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -99,7 +99,7 @@ static int sequencer_properties(bContext *C, wmOperator *UNUSED(op)) ScrArea *sa= CTX_wm_area(C); ARegion *ar= sequencer_has_buttons_region(sa); - if(ar) + if (ar) ED_region_toggle_hidden(C, ar); return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 3adae356706..d29af06bbcd 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -101,7 +101,7 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[ case SEQ_SCENE: UI_GetThemeColor3ubv(TH_SEQ_SCENE, col); - if(seq->scene==curscene) { + if (seq->scene==curscene) { UI_GetColorPtrShade3ubv(col, col, 20); } break; @@ -148,7 +148,8 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[ case SEQ_COLOR: if (colvars->col) { rgb_float_to_uchar(col, colvars->col); - } else { + } + else { col[0] = col[1] = col[2] = 128; } break; @@ -160,7 +161,7 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[ case SEQ_SOUND: UI_GetThemeColor3ubv(TH_SEQ_AUDIO, col); blendcol[0] = blendcol[1] = blendcol[2] = 128; - if(seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20); + if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20); break; default: @@ -175,7 +176,7 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x * x2 the end x value, same for y1 and y2 * stepsize is width of a pixel. */ - if(seq->flag & SEQ_AUDIO_DRAW_WAVEFORM) { + if (seq->flag & SEQ_AUDIO_DRAW_WAVEFORM) { int i, j, pos; int length = floor((x2-x1)/stepsize)+1; float ymid = (y1+y2)/2; @@ -186,34 +187,34 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x SoundWaveform* waveform; - if(!seq->sound->waveform) + if (!seq->sound->waveform) sound_read_waveform(seq->sound); - if(!seq->sound->waveform) + if (!seq->sound->waveform) return; /* zero length sound */ waveform = seq->sound->waveform; - if(!waveform) + if (!waveform) return; startsample = floor((seq->startofs + seq->anim_startofs)/FPS * SOUND_WAVE_SAMPLES_PER_SECOND); endsample = ceil((seq->startofs + seq->anim_startofs + seq->enddisp - seq->startdisp)/FPS * SOUND_WAVE_SAMPLES_PER_SECOND); samplestep = (endsample-startsample) * stepsize / (x2-x1); - if(length > floor((waveform->length - startsample) / samplestep)) + if (length > floor((waveform->length - startsample) / samplestep)) length = floor((waveform->length - startsample) / samplestep); glBegin(GL_LINE_STRIP); - for(i = 0; i < length; i++) + for (i = 0; i < length; i++) { pos = startsample + i * samplestep; value = waveform->data[pos * 3]; - for(j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++) + for (j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++) { - if(value > waveform->data[j * 3]) + if (value > waveform->data[j * 3]) value = waveform->data[j * 3]; } @@ -222,15 +223,15 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x glEnd(); glBegin(GL_LINE_STRIP); - for(i = 0; i < length; i++) + for (i = 0; i < length; i++) { pos = startsample + i * samplestep; value = waveform->data[pos * 3 + 1]; - for(j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++) + for (j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++) { - if(value < waveform->data[j * 3 + 1]) + if (value < waveform->data[j * 3 + 1]) value = waveform->data[j * 3 + 1]; } @@ -242,7 +243,7 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x static void drawmeta_stipple(int value) { - if(value) { + if (value) { glEnable(GL_POLYGON_STIPPLE); glPolygonStipple(stipple_halftone); @@ -273,7 +274,7 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - if(seqm->flag & SEQ_MUTE) + if (seqm->flag & SEQ_MUTE) drawmeta_stipple(1); for (seq= seqm->seqbase.first; seq; seq= seq->next) { @@ -287,13 +288,13 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, col[3]= 196; /* alpha, used for all meta children */ for (seq= seqm->seqbase.first; seq; seq= seq->next) { - if((seq->startdisp > x2 || seq->enddisp < x1) == 0) { + if ((seq->startdisp > x2 || seq->enddisp < x1) == 0) { float y_chan= (seq->machine - chan_min) / (float)(chan_range) * draw_range; float x1_chan= seq->startdisp; float x2_chan= seq->enddisp; float y1_chan, y2_chan; - if((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE)) + if ((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE)) drawmeta_stipple(1); get_seq_color3ubv(scene, seq, col); @@ -301,8 +302,8 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, glColor4ubv(col); /* clamp within parent sequence strip bounds */ - if(x1_chan < x1) x1_chan= x1; - if(x2_chan > x2) x2_chan= x2; + if (x1_chan < x1) x1_chan= x1; + if (x2_chan > x2) x2_chan= x2; y1_chan= y1 + y_chan + (draw_height * SEQ_STRIP_OFSBOTTOM); y2_chan= y1 + y_chan + (draw_height * SEQ_STRIP_OFSTOP); @@ -313,7 +314,7 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1, glColor4ubv(col); fdrawbox(x1_chan, y1_chan, x2_chan, y2_chan); - if((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE)) + if ((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE)) drawmeta_stipple(0); } } @@ -356,7 +357,8 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire v3[0]= v2[0] + handsize/4; v3[1]= (y1+y2)/2.0f; whichsel = SEQ_LEFTSEL; - } else if (direction == SEQ_RIGHTHANDLE) { + } + else if (direction == SEQ_RIGHTHANDLE) { rx1 = x2-handsize*0.75f; rx2 = x2; @@ -368,19 +370,19 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire } /* draw! */ - if(seq->type < SEQ_EFFECT || + if (seq->type < SEQ_EFFECT || get_sequence_effect_num_inputs(seq->type) == 0) { glEnable( GL_BLEND ); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - if(seq->flag & whichsel) glColor4ub(0, 0, 0, 80); + if (seq->flag & whichsel) glColor4ub(0, 0, 0, 80); else if (seq->flag & SELECT) glColor4ub(255, 255, 255, 30); else glColor4ub(0, 0, 0, 22); glRectf(rx1, y1, rx2, y2); - if(seq->flag & whichsel) glColor4ub(255, 255, 255, 200); + if (seq->flag & whichsel) glColor4ub(255, 255, 255, 200); else glColor4ub(0, 0, 0, 50); glEnable( GL_POLYGON_SMOOTH ); @@ -392,13 +394,14 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire glDisable( GL_BLEND ); } - if(G.moving || (seq->flag & whichsel)) { + if (G.moving || (seq->flag & whichsel)) { const char col[4]= {255, 255, 255, 255}; if (direction == SEQ_LEFTHANDLE) { BLI_snprintf(numstr, sizeof(numstr),"%d", seq->startdisp); x1= rx1; y1 -= 0.45f; - } else { + } + else { BLI_snprintf(numstr, sizeof(numstr), "%d", seq->enddisp - 1); x1= x2 - handsize*0.75f; y1= y2 + 0.05f; @@ -413,7 +416,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) unsigned char col[3], blendcol[3]; View2D *v2d= &ar->v2d; - if(seq->type >= SEQ_EFFECT) return; + if (seq->type >= SEQ_EFFECT) return; x1= seq->startdisp; x2= seq->enddisp; @@ -423,11 +426,11 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) pixely = (v2d->cur.ymax - v2d->cur.ymin)/(v2d->mask.ymax - v2d->mask.ymin); - if(pixely <= 0) return; /* can happen when the view is split/resized */ + if (pixely <= 0) return; /* can happen when the view is split/resized */ blendcol[0] = blendcol[1] = blendcol[2] = 120; - if(seq->startofs) { + if (seq->startofs) { glEnable( GL_BLEND ); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -436,7 +439,8 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) if (seq->flag & SELECT) { UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40); glColor4ub(col[0], col[1], col[2], 170); - } else { + } + else { UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0); glColor4ub(col[0], col[1], col[2], 110); } @@ -450,7 +454,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) glDisable( GL_BLEND ); } - if(seq->endofs) { + if (seq->endofs) { glEnable( GL_BLEND ); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -459,7 +463,8 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) if (seq->flag & SELECT) { UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40); glColor4ub(col[0], col[1], col[2], 170); - } else { + } + else { UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0); glColor4ub(col[0], col[1], col[2], 110); } @@ -473,7 +478,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) glDisable( GL_BLEND ); } - if(seq->startstill) { + if (seq->startstill) { get_seq_color3ubv(scene, seq, col); UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40); glColor3ubv((GLubyte *)col); @@ -487,11 +492,11 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) glColor3ubv((GLubyte *)col); - for(a=y1; a< y2; a+= pixely * 2.0f) { + for (a=y1; a< y2; a+= pixely * 2.0f) { fdrawline(x1, a, (float)(seq->start), a); } } - if(seq->endstill) { + if (seq->endstill) { get_seq_color3ubv(scene, seq, col); UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40); glColor3ubv((GLubyte *)col); @@ -505,7 +510,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) glColor3ubv((GLubyte *)col); - for(a=y1; a< y2; a+= pixely * 2.0f) { + for (a=y1; a< y2; a+= pixely * 2.0f) { fdrawline((float)(seq->start+seq->len), a, x2, a); } } @@ -520,17 +525,18 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float char col[4]; /* note, all strings should include 'name' */ - if(name[0]=='\0') + if (name[0]=='\0') name= give_seqname(seq); - if(seq->type == SEQ_META || seq->type == SEQ_ADJUSTMENT) { + if (seq->type == SEQ_META || seq->type == SEQ_ADJUSTMENT) { BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name); } - else if(seq->type == SEQ_SCENE) { - if(seq->scene) { - if(seq->scene_camera) { + else if (seq->type == SEQ_SCENE) { + if (seq->scene) { + if (seq->scene_camera) { BLI_snprintf(str, sizeof(str), "%d | %s: %s (%s)", seq->len, name, seq->scene->id.name+2, ((ID *)seq->scene_camera)->name+2); - } else { + } + else { BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->scene->id.name+2); } } @@ -538,25 +544,25 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name); } } - else if(seq->type == SEQ_MOVIECLIP) { - if(seq->clip && strcmp(name, seq->clip->id.name+2) != 0) { + else if (seq->type == SEQ_MOVIECLIP) { + if (seq->clip && strcmp(name, seq->clip->id.name+2) != 0) { BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->clip->id.name+2); } else { BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name); } } - else if(seq->type == SEQ_MULTICAM) { + else if (seq->type == SEQ_MULTICAM) { BLI_snprintf(str, sizeof(str), "Cam | %s: %d", name, seq->multicam_source); } - else if(seq->type == SEQ_IMAGE) { + else if (seq->type == SEQ_IMAGE) { BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, seq->strip->dir, seq->strip->stripdata->name); } - else if(seq->type & SEQ_EFFECT) { + else if (seq->type & SEQ_EFFECT) { int can_float = (seq->type != SEQ_PLUGIN) || (seq->plugin && seq->plugin->version >= 4); - if(seq->seq3!=seq->seq2 && seq->seq1!=seq->seq3) + if (seq->seq3!=seq->seq2 && seq->seq1!=seq->seq3) BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d (use %d)%s", seq->len, name, seq->seq1->machine, seq->seq2->machine, seq->seq3->machine, can_float ? "" : " No float, upgrade plugin!"); else if (seq->seq1 && seq->seq2) BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d%s", seq->len, name, seq->seq1->machine, seq->seq2->machine, can_float ? "" : " No float, upgrade plugin!"); @@ -564,7 +570,7 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name); } else if (seq->type == SEQ_SOUND) { - if(seq->sound) + if (seq->sound) BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->sound->name); else BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name); @@ -573,11 +579,13 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, seq->strip->dir, seq->strip->stripdata->name); } - if(seq->flag & SELECT){ + if (seq->flag & SELECT) { col[0]= col[1]= col[2]= 255; - }else if ((((int)background_col[0] + (int)background_col[1] + (int)background_col[2]) / 3) < 50){ + } + else if ((((int)background_col[0] + (int)background_col[1] + (int)background_col[2]) / 3) < 50) { col[0]= col[1]= col[2]= 80; /* use lighter text color for dark background */ - }else{ + } + else { col[0]= col[1]= col[2]= 0; } col[3]= 255; @@ -605,8 +613,8 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa glShadeModel(GL_SMOOTH); glBegin(GL_QUADS); - if(seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; } - else if(seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -50); + if (seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; } + else if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -50); /* else UI_GetColorPtrShade3ubv(col, col, 0); */ /* DO NOTHING */ glColor3ubv(col); @@ -614,8 +622,8 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa glVertex2f(x1,y1); glVertex2f(x2,y1); - if(seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; } - else if(seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5); + if (seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; } + else if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5); else UI_GetColorPtrShade3ubv(col, col, -5); glColor3ubv((GLubyte *)col); @@ -632,7 +640,7 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa glVertex2f(x1,ymid2); glVertex2f(x2,ymid2); - if(seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -15); + if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -15); else UI_GetColorPtrShade3ubv(col, col, 25); glColor3ubv((GLubyte *)col); @@ -662,10 +670,10 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline is_single_image = (char)seq_single_check(seq); /* body */ - if(seq->startstill) x1= seq->start; + if (seq->startstill) x1= seq->start; else x1= seq->startdisp; y1= seq->machine+SEQ_STRIP_OFSBOTTOM; - if(seq->endstill) x2= seq->start+seq->len; + if (seq->endstill) x2= seq->start+seq->len; else x2= seq->enddisp; y2= seq->machine+SEQ_STRIP_OFSTOP; @@ -692,10 +700,10 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline x2= seq->enddisp; /* draw sound wave */ - if(seq->type == SEQ_SOUND) drawseqwave(scene, seq, x1, y1, x2, y2, (ar->v2d.cur.xmax - ar->v2d.cur.xmin)/ar->winx); + if (seq->type == SEQ_SOUND) drawseqwave(scene, seq, x1, y1, x2, y2, (ar->v2d.cur.xmax - ar->v2d.cur.xmin)/ar->winx); /* draw lock */ - if(seq->flag & SEQ_LOCK) { + if (seq->flag & SEQ_LOCK) { glEnable(GL_POLYGON_STIPPLE); glEnable(GL_BLEND); @@ -715,7 +723,7 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline get_seq_color3ubv(scene, seq, col); if (G.moving && (seq->flag & SELECT)) { - if(seq->flag & SEQ_OVERLAP) { + if (seq->flag & SEQ_OVERLAP) { col[0]= 255; col[1]= col[2]= 40; } else @@ -737,20 +745,20 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline glDisable(GL_LINE_STIPPLE); } - if(seq->type==SEQ_META) drawmeta_contents(scene, seq, x1, y1, x2, y2); + if (seq->type==SEQ_META) drawmeta_contents(scene, seq, x1, y1, x2, y2); /* calculate if seq is long enough to print a name */ x1= seq->startdisp+seq->handsize; x2= seq->enddisp-seq->handsize; /* info text on the strip */ - if(x1<v2d->cur.xmin) x1= v2d->cur.xmin; - else if(x1>v2d->cur.xmax) x1= v2d->cur.xmax; - if(x2<v2d->cur.xmin) x2= v2d->cur.xmin; - else if(x2>v2d->cur.xmax) x2= v2d->cur.xmax; + if (x1<v2d->cur.xmin) x1= v2d->cur.xmin; + else if (x1>v2d->cur.xmax) x1= v2d->cur.xmax; + if (x2<v2d->cur.xmin) x2= v2d->cur.xmin; + else if (x2>v2d->cur.xmax) x2= v2d->cur.xmax; /* nice text here would require changing the view matrix for texture text */ - if( (x2-x1) / pixelx > 32) { + if ( (x2-x1) / pixelx > 32) { draw_seq_text(v2d, seq, x1, x2, y1, y2, background_col); } } @@ -762,7 +770,7 @@ static void UNUSED_FUNCTION(set_special_seq_update)(int val) // int x; /* if mouse over a sequence && LEFTMOUSE */ - if(val) { + if (val) { // XXX special_seq_update= find_nearest_seq(&x); } else special_seq_update= NULL; @@ -786,7 +794,8 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq render_size = sseq->render_size; if (render_size == 0) { render_size = scene->r.size; - } else { + } + else { proxy_size = render_size; } if (render_size < 0) { @@ -805,7 +814,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq viewrecty /= proxy_size / 100.0f; } - if(frame_ofs == 0) { + if (frame_ofs == 0) { UI_GetThemeColor3fv(TH_SEQ_PREVIEW, col); glClearColor(col[0], col[1], col[2], 0.0); glClear(GL_COLOR_BUFFER_BIT); @@ -818,7 +827,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq UI_view2d_curRect_validate(v2d); /* only initialize the preview if a render is in progress */ - if(G.rendering) + if (G.rendering) return; context = seq_new_render_data(bmain, scene, rectx, recty, proxy_size); @@ -830,10 +839,10 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq else ibuf= (ImBuf *)give_ibuf_seq_threaded(context, cfra + frame_ofs, sseq->chanshown); - if(ibuf==NULL) + if (ibuf==NULL) return; - if(ibuf->rect==NULL && ibuf->rect_float == NULL) + if (ibuf->rect==NULL && ibuf->rect_float == NULL) return; switch(sseq->mainb) { @@ -845,7 +854,8 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq case SEQ_DRAW_IMG_WAVEFORM: if ((sseq->flag & SEQ_DRAW_COLOR_SEPARATED) != 0) { scope = make_sep_waveform_view_from_ibuf(ibuf); - } else { + } + else { scope = make_waveform_view_from_ibuf(ibuf); } break; @@ -862,7 +872,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq ibuf = scope; } - if(ibuf->rect_float && ibuf->rect==NULL) { + if (ibuf->rect_float && ibuf->rect==NULL) { IMB_rect_from_float(ibuf); } @@ -881,7 +891,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect); glBegin(GL_QUADS); - if(frame_ofs) { + if (frame_ofs) { rctf tot_clip; tot_clip.xmin = v2d->tot.xmin + (ABS(v2d->tot.xmax - v2d->tot.xmin) * scene->ed->over_border.xmin); tot_clip.ymin = v2d->tot.ymin + (ABS(v2d->tot.ymax - v2d->tot.ymin) * scene->ed->over_border.ymin); @@ -904,7 +914,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq glDisable(GL_TEXTURE_2D); glDeleteTextures(1, &texid); - if(sseq->mainb == SEQ_DRAW_IMG_IMBUF) { + if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) { float x1 = v2d->tot.xmin; float y1 = v2d->tot.ymin; @@ -969,7 +979,8 @@ void drawprefetchseqspace(Scene *scene, ARegion *UNUSED(ar), SpaceSeq *sseq) int proxy_size = 100.0; if (render_size == 0) { render_size = scene->r.size; - } else { + } + else { proxy_size = render_size; } if (render_size < 0) { @@ -979,7 +990,7 @@ void drawprefetchseqspace(Scene *scene, ARegion *UNUSED(ar), SpaceSeq *sseq) rectx= (render_size*scene->r.xsch)/100; recty= (render_size*scene->r.ysch)/100; - if(sseq->mainb != SEQ_DRAW_SEQUENCE) { + if (sseq->mainb != SEQ_DRAW_SEQUENCE) { give_ibuf_prefetch_request( rectx, recty, (scene->r.cfra), sseq->chanshown, proxy_size); @@ -1151,7 +1162,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar) ANIM_draw_previewrange(C, v2d); /* overlap playhead */ - if(scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) { + if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) { int cfra_over= (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ? scene->ed->over_cfra : scene->r.cfra + scene->ed->over_ofs; glColor3f(0.2, 0.2, 0.2); // glRectf(cfra_over, v2d->cur.ymin, scene->ed->over_ofs + scene->r.cfra + 1, v2d->cur.ymax); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 7fc807cf17f..2486875bc04 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -223,10 +223,10 @@ static void seq_proxy_build_job(const bContext *C) void seq_rectf(Sequence *seq, rctf *rectf) { - if(seq->startstill) rectf->xmin = seq->start; + if (seq->startstill) rectf->xmin = seq->start; else rectf->xmin = seq->startdisp; rectf->ymin = seq->machine+SEQ_STRIP_OFSBOTTOM; - if(seq->endstill) rectf->xmax = seq->start+seq->len; + if (seq->endstill) rectf->xmax = seq->start+seq->len; else rectf->xmax = seq->enddisp; rectf->ymax = seq->machine+SEQ_STRIP_OFSTOP; } @@ -237,7 +237,7 @@ static void UNUSED_FUNCTION(change_plugin_seq)(Scene *scene, char *str) /* calle struct SeqEffectHandle sh; Sequence *last_seq= seq_active_get(scene); - if(last_seq==NULL || last_seq->type != SEQ_PLUGIN) return; + if (last_seq==NULL || last_seq->type != SEQ_PLUGIN) return; sh = get_sequence_effect(last_seq); sh.free(last_seq); @@ -247,7 +247,7 @@ static void UNUSED_FUNCTION(change_plugin_seq)(Scene *scene, char *str) /* calle last_seq->seq2->machine, last_seq->seq3->machine); - if( seq_test_overlap(ed->seqbasep, last_seq) ) shuffle_seq(ed->seqbasep, last_seq, scene); + if ( seq_test_overlap(ed->seqbasep, last_seq) ) shuffle_seq(ed->seqbasep, last_seq, scene); } @@ -259,7 +259,7 @@ void boundbox_seq(Scene *scene, rctf *rect) float min[2], max[2]; - if(ed==NULL) return; + if (ed==NULL) return; min[0]= 0.0; max[0]= EFRA+1; @@ -267,11 +267,11 @@ void boundbox_seq(Scene *scene, rctf *rect) max[1]= 8.0; seq= ed->seqbasep->first; - while(seq) { + while (seq) { - if( min[0] > seq->startdisp-1) min[0]= seq->startdisp-1; - if( max[0] < seq->enddisp+1) max[0]= seq->enddisp+1; - if( max[1] < seq->machine+2) max[1]= seq->machine+2; + if ( min[0] > seq->startdisp-1) min[0]= seq->startdisp-1; + if ( max[0] < seq->enddisp+1) max[0]= seq->enddisp+1; + if ( max[1] < seq->machine+2) max[1]= seq->machine+2; seq= seq->next; } @@ -304,12 +304,12 @@ Sequence *find_neighboring_sequence(Scene *scene, Sequence *test, int lr, int se Sequence *seq; Editing *ed= seq_give_editing(scene, FALSE); - if(ed==NULL) return NULL; + if (ed==NULL) return NULL; if (sel>0) sel = SELECT; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { - if( (seq!=test) && + for (seq= ed->seqbasep->first; seq; seq= seq->next) { + if ( (seq!=test) && (test->machine==seq->machine) && ((sel == -1) || (sel && (seq->flag & SELECT)) || (sel==0 && (seq->flag & SELECT)==0) )) { @@ -340,11 +340,11 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i best_dist = MAXFRAME*2; - if(ed==NULL) return NULL; + if (ed==NULL) return NULL; seq= ed->seqbasep->first; - while(seq) { - if( (seq!=test) && + while (seq) { + if ( (seq!=test) && (test->machine==seq->machine) && (test->depth==seq->depth) && ((sel == -1) || (sel==(seq->flag & SELECT)))) @@ -367,7 +367,8 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i if (dist==0) { best_seq = seq; break; - } else if (dist < best_dist) { + } + else if (dist < best_dist) { best_dist = dist; best_seq = seq; } @@ -389,7 +390,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ *hand= SEQ_SIDE_NONE; - if(ed==NULL) return NULL; + if (ed==NULL) return NULL; pixelx = (v2d->cur.xmax - v2d->cur.xmin)/(v2d->mask.xmax - v2d->mask.xmin); @@ -397,13 +398,13 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ seq= ed->seqbasep->first; - while(seq) { - if(seq->machine == (int)y) { + while (seq) { + if (seq->machine == (int)y) { /* check for both normal strips, and strips that have been flipped horizontally */ - if( ((seq->startdisp < seq->enddisp) && (seq->startdisp<=x && seq->enddisp>=x)) || + if ( ((seq->startdisp < seq->enddisp) && (seq->startdisp<=x && seq->enddisp>=x)) || ((seq->startdisp > seq->enddisp) && (seq->startdisp>=x && seq->enddisp<=x)) ) { - if(seq_tx_test(seq)) { + if (seq_tx_test(seq)) { /* clamp handles to defined size in pixel space */ @@ -416,13 +417,14 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ if ((displen/3) < 30*pixelx) { handsize = displen/3; - } else { + } + else { CLAMP(handsize, 7*pixelx, 30*pixelx); } - if( handsize+seq->startdisp >=x ) + if ( handsize+seq->startdisp >=x ) *hand= SEQ_SIDE_LEFT; - else if( -handsize+seq->enddisp <=x ) + else if ( -handsize+seq->enddisp <=x ) *hand= SEQ_SIDE_RIGHT; } } @@ -443,11 +445,11 @@ static int seq_is_parent(Sequence *par, Sequence *seq) static int seq_is_predecessor(Sequence *pred, Sequence *seq) { if (!pred) return 0; - if(pred == seq) return 0; - else if(seq_is_parent(pred, seq)) return 1; - else if(pred->seq1 && seq_is_predecessor(pred->seq1, seq)) return 1; - else if(pred->seq2 && seq_is_predecessor(pred->seq2, seq)) return 1; - else if(pred->seq3 && seq_is_predecessor(pred->seq3, seq)) return 1; + if (pred == seq) return 0; + else if (seq_is_parent(pred, seq)) return 1; + else if (pred->seq1 && seq_is_predecessor(pred->seq1, seq)) return 1; + else if (pred->seq2 && seq_is_predecessor(pred->seq2, seq)) return 1; + else if (pred->seq3 && seq_is_predecessor(pred->seq3, seq)) return 1; return 0; } @@ -458,7 +460,7 @@ void deselect_all_seq(Scene *scene) Editing *ed= seq_give_editing(scene, FALSE); - if(ed==NULL) return; + if (ed==NULL) return; SEQP_BEGIN(ed, seq) { seq->flag &= ~SEQ_ALLSEL; @@ -472,13 +474,13 @@ void recurs_sel_seq(Sequence *seqm) Sequence *seq; seq= seqm->seqbase.first; - while(seq) { + while (seq) { - if(seqm->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL)) seq->flag &= ~SEQ_ALLSEL; - else if(seqm->flag & SELECT) seq->flag |= SELECT; + if (seqm->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL)) seq->flag &= ~SEQ_ALLSEL; + else if (seqm->flag & SELECT) seq->flag |= SELECT; else seq->flag &= ~SEQ_ALLSEL; - if(seq->seqbase.first) recurs_sel_seq(seq); + if (seq->seqbase.first) recurs_sel_seq(seq); seq= seq->next; } @@ -494,16 +496,16 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen if (!activeseq) seq2= seq_active_get(scene); - for(seq=ed->seqbasep->first; seq; seq=seq->next) { - if(seq->flag & SELECT) { + for (seq=ed->seqbasep->first; seq; seq=seq->next) { + if (seq->flag & SELECT) { if (seq->type == SEQ_SOUND && get_sequence_effect_num_inputs(type) != 0) { *error_str= "Can't apply effects to audio sequence strips"; return 0; } - if((seq != activeseq) && (seq != seq2)) { - if(seq2 == NULL) seq2= seq; - else if(seq1 == NULL) seq1= seq; - else if(seq3 == NULL) seq3= seq; + if ((seq != activeseq) && (seq != seq2)) { + if (seq2 == NULL) seq2= seq; + else if (seq1 == NULL) seq1= seq; + else if (seq3 == NULL) seq3= seq; else { *error_str= "Can't apply effect to more than 3 sequence strips"; return 0; @@ -526,18 +528,18 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen *selseq1 = *selseq2 = *selseq3 = NULL; return 1; /* succsess */ case 1: - if(seq2==NULL) { + if (seq2==NULL) { *error_str= "Need at least one selected sequence strip"; return 0; } - if(seq1==NULL) seq1= seq2; - if(seq3==NULL) seq3= seq2; + if (seq1==NULL) seq1= seq2; + if (seq3==NULL) seq3= seq2; case 2: - if(seq1==NULL || seq2==NULL) { + if (seq1==NULL || seq2==NULL) { *error_str= "Need 2 selected sequence strips"; return 0; } - if(seq3 == NULL) seq3= seq2; + if (seq3 == NULL) seq3= seq2; } if (seq1==NULL && seq2==NULL && seq3==NULL) { @@ -559,18 +561,18 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq) /* try to find a replacement input sequence, and flag for later deletion if * no replacement can be found */ - if(!seq) + if (!seq) return NULL; - else if(!(seq->type & SEQ_EFFECT)) + else if (!(seq->type & SEQ_EFFECT)) return ((seq->flag & SELECT)? NULL: seq); - else if(!(seq->flag & SELECT)) { + else if (!(seq->flag & SELECT)) { /* try to find replacement for effect inputs */ seq1= del_seq_find_replace_recurs(scene, seq->seq1); seq2= del_seq_find_replace_recurs(scene, seq->seq2); seq3= del_seq_find_replace_recurs(scene, seq->seq3); - if(seq1==seq->seq1 && seq2==seq->seq2 && seq3==seq->seq3); - else if(seq1 || seq2 || seq3) { + if (seq1==seq->seq1 && seq2==seq->seq2 && seq3==seq->seq3); + else if (seq1 || seq2 || seq3) { seq->seq1= (seq1)? seq1: (seq2)? seq2: seq3; seq->seq2= (seq2)? seq2: (seq1)? seq1: seq3; seq->seq3= (seq3)? seq3: (seq1)? seq1: seq2; @@ -582,9 +584,9 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq) } if (seq->flag & SELECT) { - if((seq1 = del_seq_find_replace_recurs(scene, seq->seq1))) return seq1; - if((seq2 = del_seq_find_replace_recurs(scene, seq->seq2))) return seq2; - if((seq3 = del_seq_find_replace_recurs(scene, seq->seq3))) return seq3; + if ((seq1 = del_seq_find_replace_recurs(scene, seq->seq1))) return seq1; + if ((seq2 = del_seq_find_replace_recurs(scene, seq->seq2))) return seq2; + if ((seq3 = del_seq_find_replace_recurs(scene, seq->seq3))) return seq3; else return NULL; } else @@ -597,12 +599,12 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de Sequence *last_seq = seq_active_get(scene); seq= lb->first; - while(seq) { + while (seq) { seqn= seq->next; - if((seq->flag & flag) || deleteall) { + if ((seq->flag & flag) || deleteall) { BLI_remlink(lb, seq); - if(seq==last_seq) seq_active_set(scene, NULL); - if(seq->type==SEQ_META) recurs_del_seq_flag(scene, &seq->seqbase, flag, 1); + if (seq==last_seq) seq_active_set(scene, NULL); + if (seq->type==SEQ_META) recurs_del_seq_flag(scene, &seq->seqbase, flag, 1); seq_free_sequence(scene, seq); } seq= seqn; @@ -637,7 +639,8 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe) if (seq->type == SEQ_META) { skip_dup = TRUE; seq->startstill = seq->start - cutframe; - } else { + } + else { seq->start= cutframe -1; seq->startstill= cutframe -seq->startdisp -1; seq->anim_endofs += seq->len - 1; @@ -732,7 +735,8 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence * seq, int cutframe) if (seq->type == SEQ_META) { skip_dup = TRUE; seq->startstill = seq->start - cutframe; - } else { + } + else { seq->start= cutframe -1; seq->startstill= cutframe -seq->startdisp -1; seq->endofs = seq->len - 1; @@ -803,21 +807,23 @@ static int cut_seq_list(Scene *scene, ListBase *old, ListBase *new, int cutframe seq= old->first; - while(seq) { + while (seq) { seq_next_iter = seq->next; /* we need this because we may remove seq */ seq->tmp= NULL; - if(seq->flag & SELECT) { - if(cutframe > seq->startdisp && + if (seq->flag & SELECT) { + if (cutframe > seq->startdisp && cutframe < seq->enddisp) { Sequence * seqn = cut_seq(scene, seq, cutframe); if (seqn) { BLI_addtail(new, seqn); } did_something = TRUE; - } else if (seq->enddisp <= cutframe) { + } + else if (seq->enddisp <= cutframe) { /* do nothing */ - } else if (seq->startdisp >= cutframe) { + } + else if (seq->startdisp >= cutframe) { /* move into new list */ BLI_remlink(old, seq); BLI_addtail(new, seq); @@ -836,10 +842,10 @@ static int insert_gap(Scene *scene, int gap, int cfra) /* all strips >= cfra are shifted */ - if(ed==NULL) return 0; + if (ed==NULL) return 0; SEQP_BEGIN(ed, seq) { - if(seq->startdisp >= cfra) { + if (seq->startdisp >= cfra) { seq->start+= gap; calc_sequence(scene, seq); done= 1; @@ -858,16 +864,16 @@ static void UNUSED_FUNCTION(touch_seq_files)(Scene *scene) /* touch all strips with movies */ - if(ed==NULL) return; + if (ed==NULL) return; // XXX25 if(okee("Touch and print selected movies")==0) return; WM_cursor_wait(1); SEQP_BEGIN(ed, seq) { - if(seq->flag & SELECT) { - if(seq->type==SEQ_MOVIE) { - if(seq->strip && seq->strip->stripdata) { + if (seq->flag & SELECT) { + if (seq->type==SEQ_MOVIE) { + if (seq->strip && seq->strip->stripdata) { BLI_make_file_string(G.main->name, str, seq->strip->dir, seq->strip->stripdata->name); BLI_file_touch(seq->name); } @@ -887,13 +893,13 @@ static void set_filter_seq(Scene *scene) Editing *ed= seq_give_editing(scene, FALSE); - if(ed==NULL) return; + if (ed==NULL) return; - if(okee("Set Deinterlace")==0) return; + if (okee("Set Deinterlace")==0) return; SEQP_BEGIN(ed, seq) { - if(seq->flag & SELECT) { - if(seq->type==SEQ_MOVIE) { + if (seq->flag & SELECT) { + if (seq->type==SEQ_MOVIE) { seq->flag |= SEQ_FILTERY; reload_sequence_new_file(scene, seq, FALSE); calc_sequence(scene, seq); @@ -912,7 +918,7 @@ static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene) char from[FILE_MAX], to[FILE_MAX], stripped[FILE_MAX]; - if(last_seq==NULL) + if (last_seq==NULL) return; BLI_strncpy(from, last_seq->strip->dir, sizeof(from)); @@ -927,8 +933,8 @@ static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene) return; SEQP_BEGIN(ed, seq) { - if(seq->flag & SELECT) { - if(strncmp(seq->strip->dir, from, strlen(from))==0) { + if (seq->flag & SELECT) { + if (strncmp(seq->strip->dir, from, strlen(from))==0) { printf("found %s\n", seq->strip->dir); /* strip off the beginning */ @@ -952,19 +958,19 @@ static void UNUSED_FUNCTION(no_gaps)(Scene *scene) int cfra, first= 0, done; - if(ed==NULL) return; + if (ed==NULL) return; - for(cfra= CFRA; cfra<=EFRA; cfra++) { - if(first==0) { - if( evaluate_seq_frame(scene, cfra) ) first= 1; + for (cfra= CFRA; cfra<=EFRA; cfra++) { + if (first==0) { + if ( evaluate_seq_frame(scene, cfra) ) first= 1; } else { done= 1; - while( evaluate_seq_frame(scene, cfra) == 0) { + while ( evaluate_seq_frame(scene, cfra) == 0) { done= insert_gap(scene, -1, cfra); - if(done==0) break; + if (done==0) break; } - if(done==0) break; + if (done==0) break; } } @@ -1027,18 +1033,20 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) snap_frame= RNA_int_get(op->ptr, "frame"); /* also check metas */ - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK) && seq_tx_test(seq)) { - if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) { + if ((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) { /* simple but no anim update */ /* seq->start= snap_frame-seq->startofs+seq->startstill; */ seq_translate(scene, seq, (snap_frame-seq->startofs+seq->startstill) - seq->start); - } else { - if(seq->flag & SEQ_LEFTSEL) { + } + else { + if (seq->flag & SEQ_LEFTSEL) { seq_tx_set_final_left(seq, snap_frame); - } else { /* SEQ_RIGHTSEL */ + } + else { /* SEQ_RIGHTSEL */ seq_tx_set_final_right(seq, snap_frame); } seq_tx_handle_xlimits(seq, seq->flag & SEQ_LEFTSEL, seq->flag & SEQ_RIGHTSEL); @@ -1049,19 +1057,19 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) /* test for effects and overlap * don't use SEQP_BEGIN since that would be recursive */ - for(seq= ed->seqbasep->first; seq; seq= seq->next) { - if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { + if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; - if( seq_test_overlap(ed->seqbasep, seq) ) { + if ( seq_test_overlap(ed->seqbasep, seq) ) { shuffle_seq(ed->seqbasep, seq, scene); } } - else if(seq->type & SEQ_EFFECT) { - if(seq->seq1 && (seq->seq1->flag & SELECT)) + else if (seq->type & SEQ_EFFECT) { + if (seq->seq1 && (seq->seq1->flag & SELECT)) calc_sequence(scene, seq); - else if(seq->seq2 && (seq->seq2->flag & SELECT)) + else if (seq->seq2 && (seq->seq2->flag & SELECT)) calc_sequence(scene, seq); - else if(seq->seq3 && (seq->seq3->flag & SELECT)) + else if (seq->seq3 && (seq->seq3->flag & SELECT)) calc_sequence(scene, seq); } } @@ -1114,14 +1122,14 @@ static int sequencer_mute_exec(bContext *C, wmOperator *op) selected= !RNA_boolean_get(op->ptr, "unselected"); - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if ((seq->flag & SEQ_LOCK)==0) { - if(selected){ /* mute unselected */ - if(seq->flag & SELECT) + if (selected) { /* mute unselected */ + if (seq->flag & SELECT) seq->flag |= SEQ_MUTE; } else { - if((seq->flag & SELECT)==0) + if ((seq->flag & SELECT)==0) seq->flag |= SEQ_MUTE; } } @@ -1161,14 +1169,14 @@ static int sequencer_unmute_exec(bContext *C, wmOperator *op) selected= !RNA_boolean_get(op->ptr, "unselected"); - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if ((seq->flag & SEQ_LOCK)==0) { - if(selected){ /* unmute unselected */ - if(seq->flag & SELECT) + if (selected) { /* unmute unselected */ + if (seq->flag & SELECT) seq->flag &= ~SEQ_MUTE; } else { - if((seq->flag & SELECT)==0) + if ((seq->flag & SELECT)==0) seq->flag &= ~SEQ_MUTE; } } @@ -1205,7 +1213,7 @@ static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) Editing *ed= seq_give_editing(scene, FALSE); Sequence *seq; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if (seq->flag & SELECT) { seq->flag |= SEQ_LOCK; } @@ -1238,7 +1246,7 @@ static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) Editing *ed= seq_give_editing(scene, FALSE); Sequence *seq; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if (seq->flag & SELECT) { seq->flag &= ~SEQ_LOCK; } @@ -1271,8 +1279,8 @@ static int sequencer_reload_exec(bContext *C, wmOperator *UNUSED(op)) Editing *ed= seq_give_editing(scene, FALSE); Sequence *seq; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { - if(seq->flag & SELECT) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { + if (seq->flag & SELECT) { update_changed_seq_and_deps(scene, seq, 0, 1); } } @@ -1328,12 +1336,12 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) Sequence *seq1, *seq2, *seq3, *last_seq = seq_active_get(scene); const char *error_msg; - if(!seq_effect_find_selected(scene, last_seq, last_seq->type, &seq1, &seq2, &seq3, &error_msg)) { + if (!seq_effect_find_selected(scene, last_seq, last_seq->type, &seq1, &seq2, &seq3, &error_msg)) { BKE_report(op->reports, RPT_ERROR, error_msg); return OPERATOR_CANCELLED; } /* see reassigning would create a cycle */ - if( seq_is_predecessor(seq1, last_seq) || + if ( seq_is_predecessor(seq1, last_seq) || seq_is_predecessor(seq2, last_seq) || seq_is_predecessor(seq3, last_seq) ) { @@ -1357,9 +1365,9 @@ static int sequencer_effect_poll(bContext *C) Scene *scene= CTX_data_scene(C); Editing *ed= seq_give_editing(scene, FALSE); - if(ed) { + if (ed) { Sequence *last_seq= seq_active_get(scene); - if(last_seq && (last_seq->type & SEQ_EFFECT)) { + if (last_seq && (last_seq->type & SEQ_EFFECT)) { return 1; } } @@ -1388,7 +1396,7 @@ static int sequencer_swap_inputs_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Sequence *seq, *last_seq = seq_active_get(scene); - if(last_seq->seq1==NULL || last_seq->seq2 == NULL) { + if (last_seq->seq1==NULL || last_seq->seq2 == NULL) { BKE_report(op->reports, RPT_ERROR, "No valid inputs to swap"); return OPERATOR_CANCELLED; } @@ -1443,7 +1451,8 @@ static int sequencer_cut_exec(bContext *C, wmOperator *op) if (cut_hard==SEQ_CUT_HARD) { changed = cut_seq_list(scene, ed->seqbasep, &newlist, cut_frame, cut_seq_hard); - } else { + } + else { changed = cut_seq_list(scene, ed->seqbasep, &newlist, cut_frame, cut_seq_soft); } @@ -1457,7 +1466,8 @@ static int sequencer_cut_exec(bContext *C, wmOperator *op) if ( seq->startdisp >= cut_frame ) { seq->flag &= ~SEQ_ALLSEL; } - } else { + } + else { if ( seq->enddisp <= cut_frame ) { seq->flag &= ~SEQ_ALLSEL; } @@ -1469,7 +1479,7 @@ static int sequencer_cut_exec(bContext *C, wmOperator *op) sort_seq(scene); } - if(changed) { + if (changed) { WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); return OPERATOR_FINISHED; } @@ -1538,17 +1548,17 @@ static int sequencer_add_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) ListBase nseqbase= {NULL, NULL}; - if(ed==NULL) + if (ed==NULL) return OPERATOR_CANCELLED; seqbase_dupli_recursive(scene, NULL, &nseqbase, ed->seqbasep, SEQ_DUPE_CONTEXT); - if(nseqbase.first) { + if (nseqbase.first) { Sequence * seq= nseqbase.first; /* rely on the nseqbase list being added at the end */ BLI_movelisttolist(ed->seqbasep, &nseqbase); - for( ; seq; seq= seq->next) + for ( ; seq; seq= seq->next) seq_recursive_apply(seq, apply_unique_name_cb, scene); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -1599,7 +1609,8 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) seq=seq_active_get(scene); if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */ nothingSelected = FALSE; - } else { + } + else { for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { nothingSelected = FALSE; @@ -1612,8 +1623,8 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; /* for effects, try to find a replacement input */ - for(seq=ed->seqbasep->first; seq; seq=seq->next) - if((seq->type & SEQ_EFFECT) && !(seq->flag & SELECT)) + for (seq=ed->seqbasep->first; seq; seq=seq->next) + if ((seq->type & SEQ_EFFECT) && !(seq->flag & SELECT)) del_seq_find_replace_recurs(scene, seq); /* delete all selected strips */ @@ -1621,14 +1632,14 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) /* updates lengths etc */ seq= ed->seqbasep->first; - while(seq) { + while (seq) { calc_sequence(scene, seq); seq= seq->next; } /* free parent metas */ ms= ed->metastack.last; - while(ms) { + while (ms) { calc_sequence(scene, ms->parseq); ms= ms->prev; } @@ -1665,22 +1676,22 @@ static int sequencer_offset_clear_exec(bContext *C, wmOperator *UNUSED(op)) Sequence *seq; /* for effects, try to find a replacement input */ - for(seq=ed->seqbasep->first; seq; seq=seq->next) { - if((seq->type & SEQ_EFFECT)==0 && (seq->flag & SELECT)) { + for (seq=ed->seqbasep->first; seq; seq=seq->next) { + if ((seq->type & SEQ_EFFECT)==0 && (seq->flag & SELECT)) { seq->startofs= seq->endofs= seq->startstill= seq->endstill= 0; } } /* updates lengths etc */ seq= ed->seqbasep->first; - while(seq) { + while (seq) { calc_sequence(scene, seq); seq= seq->next; } - for(seq=ed->seqbasep->first; seq; seq=seq->next) { - if((seq->type & SEQ_EFFECT)==0 && (seq->flag & SELECT)) { - if(seq_test_overlap(ed->seqbasep, seq)) { + for (seq=ed->seqbasep->first; seq; seq=seq->next) { + if ((seq->type & SEQ_EFFECT)==0 && (seq->flag & SELECT)) { + if (seq_test_overlap(ed->seqbasep, seq)) { shuffle_seq(ed->seqbasep, seq, scene); } } @@ -1724,7 +1735,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) seq= ed->seqbasep->first; /* poll checks this is valid */ while (seq) { - if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { + if ((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { /* remove seq so overlap tests don't conflict, * see seq_free_sequence below for the real free'ing */ BLI_remlink(ed->seqbasep, seq); @@ -1755,7 +1766,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) BLI_strncpy(se_new->name, se->name, sizeof(se_new->name)); calc_sequence(scene, seq_new); - if(step > 1) { + if (step > 1) { seq_new->flag &= ~SEQ_OVERLAP; if (seq_test_overlap(ed->seqbasep, seq_new)) { shuffle_seq(ed->seqbasep, seq_new, scene); @@ -1770,7 +1781,8 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) seq_free_sequence(scene, seq); seq = seq->next; - } else { + } + else { seq = seq->next; } } @@ -1812,7 +1824,7 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) Sequence *last_seq= seq_active_get(scene); MetaStack *ms; - if(last_seq && last_seq->type==SEQ_META && last_seq->flag & SELECT) { + if (last_seq && last_seq->type==SEQ_META && last_seq->flag & SELECT) { /* Enter Metastrip */ ms= MEM_mallocN(sizeof(MetaStack), "metastack"); BLI_addtail(&ed->metastack, ms); @@ -1829,7 +1841,7 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) Sequence *seq; - if(ed->metastack.first==NULL) + if (ed->metastack.first==NULL) return OPERATOR_CANCELLED; ms= ed->metastack.last; @@ -1838,7 +1850,7 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) ed->seqbasep= ms->oldbasep; /* recalc all: the meta can have effects connected to it */ - for(seq= ed->seqbasep->first; seq; seq= seq->next) + for (seq= ed->seqbasep->first; seq; seq= seq->next) calc_sequence(scene, seq); seq_active_set(scene, ms->parseq); @@ -1881,7 +1893,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) Sequence *seq, *seqm, *next, *last_seq = seq_active_get(scene); int channel_max= 1; - if(seqbase_isolated_sel_check(ed->seqbasep)==FALSE) { + if (seqbase_isolated_sel_check(ed->seqbasep)==FALSE) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -1894,9 +1906,9 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) seqm->flag= SELECT; seq= ed->seqbasep->first; - while(seq) { + while (seq) { next= seq->next; - if(seq!=seqm && (seq->flag & SELECT)) { + if (seq!=seqm && (seq->flag & SELECT)) { channel_max= MAX2(seq->machine, channel_max); BLI_remlink(ed->seqbasep, seq); BLI_addtail(&seqm->seqbase, seq); @@ -1911,7 +1923,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) seq_active_set(scene, seqm); - if( seq_test_overlap(ed->seqbasep, seqm) ) shuffle_seq(ed->seqbasep, seqm, scene); + if ( seq_test_overlap(ed->seqbasep, seqm) ) shuffle_seq(ed->seqbasep, seqm, scene); seq_update_muting(ed); @@ -1956,7 +1968,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) Sequence *seq, *last_seq = seq_active_get(scene); /* last_seq checks ed==NULL */ - if(last_seq==NULL || last_seq->type!=SEQ_META) + if (last_seq==NULL || last_seq->type!=SEQ_META) return OPERATOR_CANCELLED; BLI_movelisttolist(ed->seqbasep, &last_seq->seqbase); @@ -1968,18 +1980,18 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) seq_free_sequence(scene, last_seq); /* emtpy meta strip, delete all effects depending on it */ - for(seq=ed->seqbasep->first; seq; seq=seq->next) - if((seq->type & SEQ_EFFECT) && seq_depends_on_meta(seq, last_seq)) + for (seq=ed->seqbasep->first; seq; seq=seq->next) + if ((seq->type & SEQ_EFFECT) && seq_depends_on_meta(seq, last_seq)) seq->flag |= SEQ_FLAG_DELETE; recurs_del_seq_flag(scene, ed->seqbasep, SEQ_FLAG_DELETE, 0); /* test for effects and overlap * don't use SEQP_BEGIN since that would be recursive */ - for(seq= ed->seqbasep->first; seq; seq= seq->next) { - if(seq->flag & SELECT) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { + if (seq->flag & SELECT) { seq->flag &= ~SEQ_OVERLAP; - if(seq_test_overlap(ed->seqbasep, seq)) { + if (seq_test_overlap(ed->seqbasep, seq)) { shuffle_seq(ed->seqbasep, seq, scene); } } @@ -2201,11 +2213,11 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) int ymargin= 1; int xmargin= FPS; - if(ed==NULL) + if (ed==NULL) return OPERATOR_CANCELLED; - for(seq=ed->seqbasep->first; seq; seq=seq->next) { - if(seq->flag & SELECT) { + for (seq=ed->seqbasep->first; seq; seq=seq->next) { + if (seq->flag & SELECT) { xmin= MIN2(xmin, seq->startdisp); xmax= MAX2(xmax, seq->enddisp); @@ -2270,9 +2282,9 @@ static int find_next_prev_edit(Scene *scene, int cfra, int side) int dist, best_dist; best_dist = MAXFRAME*2; - if(ed==NULL) return cfra; + if (ed==NULL) return cfra; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { dist = MAXFRAME*2; switch (side) { @@ -2284,7 +2296,8 @@ static int find_next_prev_edit(Scene *scene, int cfra, int side) case SEQ_SIDE_RIGHT: if (seq->startdisp > cfra) { dist = seq->startdisp - cfra; - } else if (seq->startdisp == cfra) { + } + else if (seq->startdisp == cfra) { frame_seq=seq; } break; @@ -2323,7 +2336,7 @@ static int sequencer_next_edit_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); - if(!next_prev_edit_internal(scene, SEQ_SIDE_RIGHT)) + if (!next_prev_edit_internal(scene, SEQ_SIDE_RIGHT)) return OPERATOR_CANCELLED; WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); @@ -2353,7 +2366,7 @@ static int sequencer_previous_edit_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); - if(!next_prev_edit_internal(scene, SEQ_SIDE_LEFT)) + if (!next_prev_edit_internal(scene, SEQ_SIDE_LEFT)) return OPERATOR_CANCELLED; WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); @@ -2394,9 +2407,9 @@ static Sequence* sequence_find_parent(Scene* scene, Sequence* child) Sequence *parent= NULL; Sequence *seq; - if(ed==NULL) return NULL; + if (ed==NULL) return NULL; - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { if ( (seq != child) && seq_is_parent(seq, child) ) { parent = seq; break; @@ -2415,11 +2428,11 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) Sequence *seq, *iseq; int side= RNA_enum_get(op->ptr, "side"); - if(active_seq==NULL) return OPERATOR_CANCELLED; + if (active_seq==NULL) return OPERATOR_CANCELLED; seq = find_next_prev_sequence(scene, active_seq, side, -1); - if(seq) { + if (seq) { /* disallow effect strips */ if (get_sequence_effect_num_inputs(seq->type) >= 1 && (seq->effectdata || seq->seq1 || seq->seq2 || seq->seq3)) @@ -2437,17 +2450,17 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op) } // XXX - should be a generic function - for(iseq= scene->ed->seqbasep->first; iseq; iseq= iseq->next) { - if((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { + for (iseq= scene->ed->seqbasep->first; iseq; iseq= iseq->next) { + if ((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { calc_sequence(scene, iseq); } } /* do this in a new loop since both effects need to be calculated first */ - for(iseq= scene->ed->seqbasep->first; iseq; iseq= iseq->next) { - if((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { + for (iseq= scene->ed->seqbasep->first; iseq; iseq= iseq->next) { + if ((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { /* this may now overlap */ - if( seq_test_overlap(ed->seqbasep, iseq) ) { + if ( seq_test_overlap(ed->seqbasep, iseq) ) { shuffle_seq(ed->seqbasep, iseq, scene); } } @@ -2490,7 +2503,7 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) Sequence *active_seq = seq_active_get(scene); StripElem *se = NULL; - if(active_seq==NULL) + if (active_seq==NULL) return OPERATOR_CANCELLED; @@ -2543,13 +2556,13 @@ void SEQUENCER_OT_rendersize(wmOperatorType *ot) static void seq_copy_del_sound(Scene *scene, Sequence *seq) { - if(seq->type == SEQ_META) { + if (seq->type == SEQ_META) { Sequence *iseq; - for(iseq= seq->seqbase.first; iseq; iseq= iseq->next) { + for (iseq= seq->seqbase.first; iseq; iseq= iseq->next) { seq_copy_del_sound(scene, iseq); } } - else if(seq->scene_sound) { + else if (seq->scene_sound) { sound_remove_scene_sound(scene, seq->scene_sound); seq->scene_sound = NULL; } @@ -2566,7 +2579,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) seq_free_clipboard(); - if(seqbase_isolated_sel_check(ed->seqbasep)==FALSE) { + if (seqbase_isolated_sel_check(ed->seqbasep)==FALSE) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -2576,17 +2589,17 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) /* To make sure the copied strips have unique names between each other add * them temporarily to the end of the original seqbase. (bug 25932) */ - if(nseqbase.first) { + if (nseqbase.first) { Sequence *seq, *first_seq = nseqbase.first; BLI_movelisttolist(ed->seqbasep, &nseqbase); - for(seq=first_seq; seq; seq=seq->next) + for (seq=first_seq; seq; seq=seq->next) seq_recursive_apply(seq, apply_unique_name_cb, scene); seqbase_clipboard.first = first_seq; seqbase_clipboard.last = ed->seqbasep->last; - if(first_seq->prev) { + if (first_seq->prev) { first_seq->prev->next = NULL; ed->seqbasep->last = first_seq->prev; first_seq->prev = NULL; @@ -2596,7 +2609,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op) seqbase_clipboard_frame= scene->r.cfra; /* Need to remove anything that references the current scene */ - for(seq= seqbase_clipboard.first; seq; seq= seq->next) { + for (seq= seqbase_clipboard.first; seq; seq= seq->next) { seq_copy_del_sound(scene, seq); } @@ -2622,13 +2635,13 @@ void SEQUENCER_OT_copy(wmOperatorType *ot) static void seq_paste_add_sound(Scene *scene, Sequence *seq) { - if(seq->type == SEQ_META) { + if (seq->type == SEQ_META) { Sequence *iseq; - for(iseq= seq->seqbase.first; iseq; iseq= iseq->next) { + for (iseq= seq->seqbase.first; iseq; iseq= iseq->next) { seq_paste_add_sound(scene, iseq); } } - else if(seq->type == SEQ_SOUND) { + else if (seq->type == SEQ_SOUND) { seq->scene_sound = sound_add_scene_sound_defaults(scene, seq); } } @@ -2647,8 +2660,8 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) seqbase_dupli_recursive(scene, NULL, &nseqbase, &seqbase_clipboard, SEQ_DUPE_UNIQUE_NAME); /* transform pasted strips before adding */ - if(ofs) { - for(iseq= nseqbase.first; iseq; iseq= iseq->next) { + if (ofs) { + for (iseq= nseqbase.first; iseq; iseq= iseq->next) { seq_translate(scene, iseq, ofs); seq_sound_init(scene, iseq); } @@ -2659,7 +2672,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) BLI_movelisttolist(ed->seqbasep, &nseqbase); /* make sure the pasted strips have unique names between them */ - for(; iseq; iseq=iseq->next) { + for (; iseq; iseq=iseq->next) { seq_recursive_apply(iseq, apply_unique_name_cb, scene); /* restore valid sound_scene for newly added strips */ @@ -2695,12 +2708,12 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) Sequence *seq_other; const char *error_msg; - if(seq_active_pair_get(scene, &seq_act, &seq_other) == 0) { + if (seq_active_pair_get(scene, &seq_act, &seq_other) == 0) { BKE_report(op->reports, RPT_ERROR, "Must select 2 strips"); return OPERATOR_CANCELLED; } - if(seq_swap(seq_act, seq_other, &error_msg) == 0) { + if (seq_swap(seq_act, seq_other, &error_msg) == 0) { BKE_report(op->reports, RPT_ERROR, error_msg); return OPERATOR_CANCELLED; } @@ -2714,8 +2727,8 @@ static int sequencer_swap_data_exec(bContext *C, wmOperator *op) calc_sequence(scene, seq_act); calc_sequence(scene, seq_other); - if(seq_act->sound) sound_add_scene_sound_defaults(scene, seq_act); - if(seq_other->sound) sound_add_scene_sound_defaults(scene, seq_other); + if (seq_act->sound) sound_add_scene_sound_defaults(scene, seq_act); + if (seq_other->sound) sound_add_scene_sound_defaults(scene, seq_other); WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene); @@ -2752,7 +2765,7 @@ static int view_ghost_border_exec(bContext *C, wmOperator *op) UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmin"), RNA_int_get(op->ptr, "ymin"), &rect.xmin, &rect.ymin); UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmax"), RNA_int_get(op->ptr, "ymax"), &rect.xmax, &rect.ymax); - if(ed==NULL) + if (ed==NULL) return OPERATOR_CANCELLED; rect.xmin /= (float)(ABS(v2d->tot.xmax - v2d->tot.xmin)); @@ -2855,7 +2868,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) break; } - if(*seq_1 == NULL || *seq_2 == NULL) { + if (*seq_1 == NULL || *seq_2 == NULL) { BKE_report(op->reports, RPT_ERROR, "One of the effect inputs is unset, can't swap"); return OPERATOR_CANCELLED; } @@ -2958,12 +2971,12 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) Sequence *seq= seq_active_get(scene); const int is_relative_path= RNA_boolean_get(op->ptr, "relative_path"); - if(seq->type == SEQ_IMAGE) { + if (seq->type == SEQ_IMAGE) { char directory[FILE_MAX]; const int len= RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files")); StripElem *se; - if(len==0) + if (len==0) return OPERATOR_CANCELLED; RNA_string_get(op->ptr, "directory", directory); @@ -2975,7 +2988,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) } BLI_strncpy(seq->strip->dir, directory, sizeof(seq->strip->dir)); - if(seq->strip->stripdata) { + if (seq->strip->stripdata) { MEM_freeN(seq->strip->stripdata); } seq->strip->stripdata= se= MEM_callocN(len*sizeof(StripElem), "stripelem"); @@ -3027,7 +3040,7 @@ static int sequencer_change_path_invoke(bContext *C, wmOperator *op, wmEvent *UN RNA_string_set(op->ptr, "directory", seq->strip->dir); /* set default display depending on seq type */ - if(seq->type == SEQ_IMAGE) { + if (seq->type == SEQ_IMAGE) { RNA_boolean_set(op->ptr, "filter_movie", FALSE); } else { diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index c13a5202c19..2e36c233f8e 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -240,7 +240,8 @@ struct ImBuf *make_waveform_view_from_ibuf(struct ImBuf * ibuf) { if (ibuf->rect_float) { return make_waveform_view_from_ibuf_float(ibuf); - } else { + } + else { return make_waveform_view_from_ibuf_byte(ibuf); } } @@ -353,7 +354,8 @@ struct ImBuf *make_sep_waveform_view_from_ibuf(struct ImBuf * ibuf) { if (ibuf->rect_float) { return make_sep_waveform_view_from_ibuf_float(ibuf); - } else { + } + else { return make_sep_waveform_view_from_ibuf_byte(ibuf); } } @@ -426,7 +428,8 @@ struct ImBuf * make_zebra_view_from_ibuf(struct ImBuf * src, float perc) if (src->rect_float) { draw_zebra_float(src, ibuf, perc); - } else { + } + else { draw_zebra_byte(src, ibuf, perc); } return ibuf; @@ -508,7 +511,8 @@ static int get_bin_float(float f) { if (f < -0.25f) { f = -0.25f; - } else if (f > 1.25f) { + } + else if (f > 1.25f) { f = 1.25f; } @@ -561,7 +565,8 @@ struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf * ibuf) { if (ibuf->rect_float) { return make_histogram_view_from_ibuf_float(ibuf); - } else { + } + else { return make_histogram_view_from_ibuf_byte(ibuf); } } @@ -696,7 +701,8 @@ struct ImBuf *make_vectorscope_view_from_ibuf(struct ImBuf * ibuf) { if (ibuf->rect_float) { return make_vectorscope_view_from_ibuf_float(ibuf); - } else { + } + else { return make_vectorscope_view_from_ibuf_byte(ibuf); } } diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index e93eb0e0a0e..c111870b5bb 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -89,8 +89,8 @@ static void select_active_side(ListBase *seqbase, int sel_side, int channel, int { Sequence *seq; - for(seq= seqbase->first; seq; seq=seq->next) { - if(channel==seq->machine) { + for (seq= seqbase->first; seq; seq=seq->next) { + if (channel==seq->machine) { switch(sel_side) { case SEQ_SIDE_LEFT: if (frame > (seq->startdisp)) { @@ -117,27 +117,27 @@ static void select_linked_time(ListBase *seqbase, Sequence *seq_link) { Sequence *seq; - for(seq= seqbase->first; seq; seq=seq->next) { - if(seq_link->machine != seq->machine) { + for (seq= seqbase->first; seq; seq=seq->next) { + if (seq_link->machine != seq->machine) { int left_match = (seq->startdisp == seq_link->startdisp) ? 1:0; int right_match = (seq->enddisp == seq_link->enddisp) ? 1:0; - if(left_match && right_match) { + if (left_match && right_match) { /* a direct match, copy the selection settinhs */ seq->flag &= ~(SELECT|SEQ_LEFTSEL|SEQ_RIGHTSEL); seq->flag |= seq_link->flag & (SELECT|SEQ_LEFTSEL|SEQ_RIGHTSEL); recurs_sel_seq(seq); } - else if(seq_link->flag & SELECT && (left_match || right_match)) { + else if (seq_link->flag & SELECT && (left_match || right_match)) { /* clear for reselection */ seq->flag &= ~(SEQ_LEFTSEL|SEQ_RIGHTSEL); - if(left_match && seq_link->flag & SEQ_LEFTSEL) + if (left_match && seq_link->flag & SEQ_LEFTSEL) seq->flag |= SELECT|SEQ_LEFTSEL; - if(right_match && seq_link->flag & SEQ_RIGHTSEL) + if (right_match && seq_link->flag & SEQ_RIGHTSEL) seq->flag |= SELECT|SEQ_RIGHTSEL; recurs_sel_seq(seq); @@ -163,16 +163,16 @@ static void UNUSED_FUNCTION(select_single_seq)(Scene *scene, Sequence *seq, int { Editing *ed= seq_give_editing(scene, FALSE); - if(deselect_all) + if (deselect_all) deselect_all_seq(scene); seq_active_set(scene, seq); - if((seq->type==SEQ_IMAGE) || (seq->type==SEQ_MOVIE)) { - if(seq->strip) + if ((seq->type==SEQ_IMAGE) || (seq->type==SEQ_MOVIE)) { + if (seq->strip) BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR); } - else if(seq->type==SEQ_SOUND) { - if(seq->strip) + else if (seq->type==SEQ_SOUND) { + if (seq->strip) BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR); } seq->flag|= SELECT; @@ -281,7 +281,7 @@ static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) Editing *ed= seq_give_editing(scene, FALSE); Sequence *seq; - for(seq= ed->seqbasep->first; seq; seq=seq->next) { + for (seq= ed->seqbasep->first; seq; seq=seq->next) { if (seq->flag & SELECT) { seq->flag &= ~SEQ_ALLSEL; } @@ -325,7 +325,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) int hand,sel_side; TimeMarker *marker; - if(ed==NULL) + if (ed==NULL) return OPERATOR_CANCELLED; marker=find_nearest_marker(SCE_MARKERS, 1); //XXX - dummy function for now @@ -333,7 +333,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) seq= find_nearest_seq(scene, v2d, &hand, event->mval); // XXX - not nice, Ctrl+RMB needs to do left_right only when not over a strip - if(seq && linked_time && left_right) + if (seq && linked_time && left_right) left_right= FALSE; @@ -352,7 +352,8 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) marker->flag |= SELECT; } - } else if (left_right) { + } + else if (left_right) { /* use different logic for this */ float x; deselect_all_seq(scene); @@ -360,13 +361,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) SEQP_BEGIN(ed, seq) { if (x < CFRA) { - if(seq->enddisp < CFRA) { + if (seq->enddisp < CFRA) { seq->flag |= SELECT; recurs_sel_seq(seq); } } else { - if(seq->startdisp > CFRA) { + if (seq->startdisp > CFRA) { seq->flag |= SELECT; recurs_sel_seq(seq); } @@ -380,7 +381,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) TimeMarker *tmarker; for (tmarker= scene->markers.first; tmarker; tmarker= tmarker->next) { - if( ((x < CFRA) && tmarker->frame < CFRA) || + if ( ((x < CFRA) && tmarker->frame < CFRA) || ((x >= CFRA) && tmarker->frame >= CFRA) ) { tmarker->flag |= SELECT; @@ -391,29 +392,31 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) } } } - } else { + } + else { // seq= find_nearest_seq(scene, v2d, &hand, mval); act_orig= ed->act_seq; - if(extend == 0 && linked_handle==0) + if (extend == 0 && linked_handle==0) deselect_all_seq(scene); - if(seq) { + if (seq) { seq_active_set(scene, seq); if ((seq->type == SEQ_IMAGE) || (seq->type == SEQ_MOVIE)) { - if(seq->strip) { + if (seq->strip) { BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR); } - } else + } + else if (seq->type == SEQ_SOUND) { - if(seq->strip) { + if (seq->strip) { BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR); } } - if(extend && (seq->flag & SELECT) && ed->act_seq == act_orig ) { + if (extend && (seq->flag & SELECT) && ed->act_seq == act_orig ) { switch(hand) { case SEQ_SIDE_NONE: if (linked_handle==0) @@ -429,13 +432,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) } else { seq->flag |= SELECT; - if(hand==SEQ_SIDE_LEFT) seq->flag |= SEQ_LEFTSEL; - if(hand==SEQ_SIDE_RIGHT) seq->flag |= SEQ_RIGHTSEL; + if (hand==SEQ_SIDE_LEFT) seq->flag |= SEQ_LEFTSEL; + if (hand==SEQ_SIDE_RIGHT) seq->flag |= SEQ_RIGHTSEL; } /* On Alt selection, select the strip and bordering handles */ if (linked_handle && !ELEM(hand, SEQ_SIDE_LEFT, SEQ_SIDE_RIGHT)) { - if(extend==0) deselect_all_seq(scene); + if (extend==0) deselect_all_seq(scene); seq->flag |= SELECT; select_surrounding_handles(scene, seq); } @@ -451,12 +454,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) switch (sel_side) { case SEQ_SIDE_LEFT: if ((seq->flag & SEQ_LEFTSEL) && (neighbor->flag & SEQ_RIGHTSEL)) { - if(extend==0) deselect_all_seq(scene); + if (extend==0) deselect_all_seq(scene); seq->flag |= SELECT; select_active_side(ed->seqbasep, SEQ_SIDE_LEFT, seq->machine, seq->startdisp); - } else { - if(extend==0) deselect_all_seq(scene); + } + else { + if (extend==0) deselect_all_seq(scene); seq->flag |= SELECT; neighbor->flag |= SELECT; @@ -467,12 +471,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) break; case SEQ_SIDE_RIGHT: if ((seq->flag & SEQ_RIGHTSEL) && (neighbor->flag & SEQ_LEFTSEL)) { - if(extend==0) deselect_all_seq(scene); + if (extend==0) deselect_all_seq(scene); seq->flag |= SELECT; select_active_side(ed->seqbasep, SEQ_SIDE_RIGHT, seq->machine, seq->startdisp); - } else { - if(extend==0) deselect_all_seq(scene); + } + else { + if (extend==0) deselect_all_seq(scene); seq->flag |= SELECT; neighbor->flag |= SELECT; @@ -482,14 +487,15 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) } break; } - } else { - if(extend==0) deselect_all_seq(scene); + } + else { + if (extend==0) deselect_all_seq(scene); select_active_side(ed->seqbasep, sel_side, seq->machine, seq->startdisp); } } recurs_sel_seq(seq); - if(linked_time) { + if (linked_time) { select_linked_time(ed->seqbasep, seq); } } @@ -505,7 +511,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) while(get_mbut()) { // getmouseco_areawin(mval); - if(abs(mval[0]-xo)+abs(mval[1]-yo) > 4) { + if (abs(mval[0]-xo)+abs(mval[1]-yo) > 4) { transform_markers('g', 0); return; } @@ -552,25 +558,26 @@ static int select_more_less_seq__internal(Scene *scene, int sel, int linked) int change=0; int isel; - if(ed==NULL) return 0; + if (ed==NULL) return 0; if (sel) { sel = SELECT; isel = 0; - } else { + } + else { sel = 0; isel = SELECT; } if (!linked) { /* if not linked we only want to touch each seq once, newseq */ - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { seq->tmp = NULL; } } - for(seq= ed->seqbasep->first; seq; seq= seq->next) { - if((int)(seq->flag & SELECT) == sel) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { + if ((int)(seq->flag & SELECT) == sel) { if ((linked==0 && seq->tmp)==0) { /* only get unselected nabours */ neighbor = find_neighboring_sequence(scene, seq, SEQ_SIDE_LEFT, isel); @@ -601,7 +608,7 @@ static int sequencer_select_more_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); - if(!select_more_less_seq__internal(scene, 0, 0)) + if (!select_more_less_seq__internal(scene, 0, 0)) return OPERATOR_CANCELLED; WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene); @@ -632,7 +639,7 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene= CTX_data_scene(C); - if(!select_more_less_seq__internal(scene, 1, 0)) + if (!select_more_less_seq__internal(scene, 1, 0)) return OPERATOR_CANCELLED; WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene); @@ -752,7 +759,7 @@ static int sequencer_select_handles_exec(bContext *C, wmOperator *op) int sel_side= RNA_enum_get(op->ptr, "side"); - for(seq= ed->seqbasep->first; seq; seq=seq->next) { + for (seq= ed->seqbasep->first; seq; seq=seq->next) { if (seq->flag & SELECT) { switch(sel_side) { case SEQ_SIDE_LEFT: @@ -845,7 +852,7 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) int extend = RNA_boolean_get(op->ptr, "extend"); int mval[2]; - if(ed==NULL) + if (ed==NULL) return OPERATOR_CANCELLED; rect.xmin = RNA_int_get(op->ptr, "xmin"); @@ -860,15 +867,15 @@ static int sequencer_borderselect_exec(bContext *C, wmOperator *op) mval[1]= rect.ymax; UI_view2d_region_to_view(v2d, mval[0], mval[1], &rectf.xmax, &rectf.ymax); - for(seq= ed->seqbasep->first; seq; seq= seq->next) { + for (seq= ed->seqbasep->first; seq; seq= seq->next) { seq_rectf(seq, &rq); - if(BLI_isect_rctf(&rq, &rectf, NULL)) { - if(selecting) seq->flag |= SELECT; + if (BLI_isect_rctf(&rq, &rectf, NULL)) { + if (selecting) seq->flag |= SELECT; else seq->flag &= ~SEQ_ALLSEL; recurs_sel_seq(seq); } - else if(!extend) { + else if (!extend) { seq->flag &= ~SEQ_ALLSEL; recurs_sel_seq(seq); } @@ -1025,9 +1032,9 @@ static short select_grouped_effect(Editing *ed, Sequence *actseq) SEQP_BEGIN(ed, seq) { if (effects[seq->type]) { - if(seq->seq1) seq->seq1->flag |= SELECT; - if(seq->seq2) seq->seq2->flag |= SELECT; - if(seq->seq3) seq->seq3->flag |= SELECT; + if (seq->seq1) seq->seq1->flag |= SELECT; + if (seq->seq2) seq->seq2->flag |= SELECT; + if (seq->seq3) seq->seq3->flag |= SELECT; changed = TRUE; } } @@ -1069,7 +1076,7 @@ static short select_grouped_effect_link(Editing *ed, Sequence *actseq) actseq->tmp= SET_INT_IN_POINTER(TRUE); - for(seq_begin(ed, &iter, 1); iter.valid; seq_next(&iter)) { + for (seq_begin(ed, &iter, 1); iter.valid; seq_next(&iter)) { seq = iter.seq; /* Ignore all seqs already selected! */ @@ -1133,13 +1140,13 @@ static int sequencer_select_grouped_exec(bContext *C, wmOperator *op) SEQ_END; } - if(type==1) changed |= select_grouped_type(ed, actseq); - else if(type==2) changed |= select_grouped_type_basic(ed, actseq); - else if(type==3) changed |= select_grouped_type_effect(ed, actseq); - else if(type==4) changed |= select_grouped_data(ed, actseq); - else if(type==5) changed |= select_grouped_effect(ed, actseq); - else if(type==6) changed |= select_grouped_effect_link(ed, actseq); - else if(type==7) changed |= select_grouped_time_overlap(ed, actseq); + if (type==1) changed |= select_grouped_type(ed, actseq); + else if (type==2) changed |= select_grouped_type_basic(ed, actseq); + else if (type==3) changed |= select_grouped_type_effect(ed, actseq); + else if (type==4) changed |= select_grouped_data(ed, actseq); + else if (type==5) changed |= select_grouped_effect(ed, actseq); + else if (type==6) changed |= select_grouped_effect_link(ed, actseq); + else if (type==7) changed |= select_grouped_time_overlap(ed, actseq); if (changed) { WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER|NA_SELECTED, scene); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index dd4315e6651..fe6ff40922e 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -65,13 +65,13 @@ ARegion *sequencer_has_buttons_region(ScrArea *sa) ARegion *ar, *arnew; ar= BKE_area_find_region_type(sa, RGN_TYPE_UI); - if(ar) return ar; + if (ar) return ar; /* add subdiv level; after header */ ar= BKE_area_find_region_type(sa, RGN_TYPE_HEADER); /* is error! */ - if(ar==NULL) return NULL; + if (ar==NULL) return NULL; arnew= MEM_callocN(sizeof(ARegion), "buttons for sequencer"); @@ -88,8 +88,8 @@ static ARegion *sequencer_find_region(ScrArea *sa, short type) { ARegion *ar=NULL; - for(ar= sa->regionbase.first; ar; ar= ar->next) - if(ar->regiontype==type) + for (ar= sa->regionbase.first; ar; ar= ar->next) + if (ar->regiontype==type) return ar; return ar; @@ -186,7 +186,7 @@ static void sequencer_free(SpaceLink *UNUSED(sl)) { // SpaceSeq *sseq= (SpaceSequencer*) sl; -// XXX if(sseq->gpd) free_gpencil_data(sseq->gpd); +// XXX if (sseq->gpd) free_gpencil_data(sseq->gpd); } @@ -273,7 +273,7 @@ static void sequencer_refresh(const bContext *C, ScrArea *sa) break; } - if(view_changed) { + if (view_changed) { ED_area_initialize(wm, window, sa); ED_area_tag_redraw(sa); } @@ -326,24 +326,24 @@ static void sequencer_main_area_draw(const bContext *C, ARegion *ar) static int image_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event)) { - if(drag->type==WM_DRAG_PATH) - if(ELEM(drag->icon, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */ + if (drag->type==WM_DRAG_PATH) + if (ELEM(drag->icon, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */ return 1; return 0; } static int movie_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event)) { - if(drag->type==WM_DRAG_PATH) - if(ELEM3(drag->icon, 0, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */ + if (drag->type==WM_DRAG_PATH) + if (ELEM3(drag->icon, 0, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */ return 1; return 0; } static int sound_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event)) { - if(drag->type==WM_DRAG_PATH) - if(ELEM(drag->icon, ICON_FILE_SOUND, ICON_FILE_BLANK)) /* rule might not work? */ + if (drag->type==WM_DRAG_PATH) + if (ELEM(drag->icon, ICON_FILE_SOUND, ICON_FILE_BLANK)) /* rule might not work? */ return 1; return 0; } @@ -351,10 +351,10 @@ static int sound_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(ev static void sequencer_drop_copy(wmDrag *drag, wmDropBox *drop) { /* copy drag path to properties */ - if(RNA_struct_find_property(drop->ptr, "filepath")) + if (RNA_struct_find_property(drop->ptr, "filepath")) RNA_string_set(drop->ptr, "filepath", drag->path); - if(RNA_struct_find_property(drop->ptr, "directory")) { + if (RNA_struct_find_property(drop->ptr, "directory")) { PointerRNA itemptr; char dir[FILE_MAX], file[FILE_MAX]; @@ -407,11 +407,11 @@ static void sequencer_main_area_listener(ARegion *ar, wmNotifier *wmn) } break; case NC_SPACE: - if(wmn->data == ND_SPACE_SEQUENCER) + if (wmn->data == ND_SPACE_SEQUENCER) ED_region_tag_redraw(ar); break; case NC_ID: - if(wmn->action == NA_RENAME) + if (wmn->action == NA_RENAME) ED_region_tag_redraw(ar); break; } @@ -443,15 +443,15 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar) draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0); - if(scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW && sseq->mainb == SEQ_DRAW_IMG_IMBUF) { + if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW && sseq->mainb == SEQ_DRAW_IMG_IMBUF) { int over_cfra; - if(scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) + if (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) over_cfra= scene->ed->over_cfra; else over_cfra= scene->r.cfra + scene->ed->over_ofs; - if(over_cfra != scene->r.cfra) + if (over_cfra != scene->r.cfra) draw_image_seq(C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra); } @@ -471,7 +471,7 @@ static void sequencer_preview_area_listener(ARegion *ar, wmNotifier *wmn) } break; case NC_SPACE: - if(wmn->data == ND_SPACE_SEQUENCER) + if (wmn->data == ND_SPACE_SEQUENCER) ED_region_tag_redraw(ar); break; case NC_ID: @@ -512,11 +512,11 @@ static void sequencer_buttons_area_listener(ARegion *ar, wmNotifier *wmn) } break; case NC_SPACE: - if(wmn->data == ND_SPACE_SEQUENCER) + if (wmn->data == ND_SPACE_SEQUENCER) ED_region_tag_redraw(ar); break; case NC_ID: - if(wmn->action == NA_RENAME) + if (wmn->action == NA_RENAME) ED_region_tag_redraw(ar); break; } @@ -590,7 +590,7 @@ void ED_spacetype_sequencer(void) BKE_spacetype_register(st); /* set the sequencer callback when not in background mode */ - if(G.background==0) { + if (G.background==0) { sequencer_view3d_cb = ED_view3d_draw_offscreen_imbuf_simple; } } |