diff options
Diffstat (limited to 'source/blender/editors/space_sequencer')
3 files changed, 24 insertions, 23 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 93dfc347b1f..fcd8acd391d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -179,7 +179,8 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, i static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) { - int relative = RNA_struct_find_property(op->ptr, "relative_path") && RNA_boolean_get(op->ptr, "relative_path"); + PropertyRNA *prop; + const bool relative = (prop = RNA_struct_find_property(op->ptr, "relative_path")) && RNA_property_boolean_get(op->ptr, prop); int is_file = -1; memset(seq_load, 0, sizeof(SeqLoadInfo)); @@ -189,12 +190,12 @@ 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")) { - RNA_string_get(op->ptr, "filepath", seq_load->path); /* full path, file is set by the caller */ + if ((prop = RNA_struct_find_property(op->ptr, "filepath"))) { + RNA_property_string_get(op->ptr, prop, seq_load->path); /* full path, file is set by the caller */ is_file = 1; } - 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 */ + else if ((prop = RNA_struct_find_property(op->ptr, "directory"))) { + RNA_property_string_get(op->ptr, prop, seq_load->path); /* full path, file is set by the caller */ is_file = 0; } @@ -202,17 +203,17 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) BLI_path_rel(seq_load->path, G.main->name); - if (RNA_struct_find_property(op->ptr, "frame_end")) { - seq_load->end_frame = RNA_int_get(op->ptr, "frame_end"); + if ((prop = RNA_struct_find_property(op->ptr, "frame_end"))) { + seq_load->end_frame = RNA_property_int_get(op->ptr, prop); } - if (RNA_struct_find_property(op->ptr, "replace_sel") && RNA_boolean_get(op->ptr, "replace_sel")) + if ((prop = RNA_struct_find_property(op->ptr, "replace_sel")) && RNA_property_boolean_get(op->ptr, prop)) seq_load->flag |= SEQ_LOAD_REPLACE_SEL; - if (RNA_struct_find_property(op->ptr, "cache") && RNA_boolean_get(op->ptr, "cache")) + if ((prop = RNA_struct_find_property(op->ptr, "cache")) && RNA_property_boolean_get(op->ptr, prop)) seq_load->flag |= SEQ_LOAD_SOUND_CACHE; - if (RNA_struct_find_property(op->ptr, "sound") && RNA_boolean_get(op->ptr, "sound")) + if ((prop = RNA_struct_find_property(op->ptr, "sound")) && RNA_property_boolean_get(op->ptr, prop)) seq_load->flag |= SEQ_LOAD_MOVIE_SOUND; /* always use this for ops */ @@ -222,17 +223,17 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) 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 ((prop = RNA_struct_find_property(op->ptr, "files"))) { /* used for image strip */ /* best guess, first images name */ - RNA_BEGIN (op->ptr, itemptr, "files") + RNA_PROP_BEGIN (op->ptr, itemptr, prop) { char *name = RNA_string_get_alloc(&itemptr, "name", NULL, 0); BLI_strncpy(seq_load->name, name, sizeof(seq_load->name)); MEM_freeN(name); break; } - RNA_END; + RNA_PROP_END; } } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 3253d344ff6..c360987bd1f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -475,7 +475,7 @@ int ED_space_sequencer_maskedit_mask_poll(bContext *C) return ED_space_sequencer_maskedit_poll(C); } -int ED_space_sequencer_check_show_maskedit(SpaceSeq *sseq, Scene *scene) +bool ED_space_sequencer_check_show_maskedit(SpaceSeq *sseq, Scene *scene) { if (sseq && sseq->mainb == SEQ_DRAW_IMG_IMBUF) { return (BKE_sequencer_mask_get(scene) != NULL); @@ -497,7 +497,7 @@ int ED_space_sequencer_maskedit_poll(bContext *C) } /* are we displaying the seq output (not channels or histogram)*/ -int ED_space_sequencer_check_show_imbuf(SpaceSeq *sseq) +bool ED_space_sequencer_check_show_imbuf(SpaceSeq *sseq) { return (ELEM(sseq->view, SEQ_VIEW_PREVIEW, SEQ_VIEW_SEQUENCE_PREVIEW) && ELEM(sseq->mainb, SEQ_DRAW_SEQUENCE, SEQ_DRAW_IMG_IMBUF)); @@ -1394,7 +1394,7 @@ static int sequencer_reload_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, FALSE); Sequence *seq; - int adjust_length = RNA_boolean_get(op->ptr, "adjust_length"); + const bool adjust_length = RNA_boolean_get(op->ptr, "adjust_length"); for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { @@ -2414,7 +2414,7 @@ void SEQUENCER_OT_view_selected(wmOperatorType *ot) static int find_next_prev_edit(Scene *scene, int cfra, const short side, - const short do_skip_mute, const short do_center) + const bool do_skip_mute, const bool do_center) { Editing *ed = BKE_sequencer_editing_get(scene, FALSE); Sequence *seq, *best_seq = NULL, *frame_seq = NULL; @@ -2488,7 +2488,7 @@ static int find_next_prev_edit(Scene *scene, int cfra, static bool strip_jump_internal(Scene *scene, const short side, - const short do_skip_mute, const short do_center) + const bool do_skip_mute, const bool do_center) { bool changed = false; int cfra = CFRA; @@ -2515,8 +2515,8 @@ static int sequencer_strip_jump_poll(bContext *C) static int sequencer_strip_jump_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - short next = RNA_boolean_get(op->ptr, "next"); - short center = RNA_boolean_get(op->ptr, "center"); + const bool next = RNA_boolean_get(op->ptr, "next"); + const bool center = RNA_boolean_get(op->ptr, "center"); /* currently do_skip_mute is always TRUE */ if (!strip_jump_internal(scene, next ? SEQ_SIDE_RIGHT : SEQ_SIDE_LEFT, TRUE, center)) { diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index d1cc2091265..c8178259dc2 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -927,7 +927,7 @@ static EnumPropertyItem sequencer_prop_select_grouped_types[] = { #define SEQ_IS_SOUND(_seq) ((_seq->type & SEQ_TYPE_SOUND_RAM) && !(_seq->type & SEQ_TYPE_EFFECT)) -#define SEQ_IS_EFFECT(_seq) (_seq->type & SEQ_TYPE_EFFECT) +#define SEQ_IS_EFFECT(_seq) ((_seq->type & SEQ_TYPE_EFFECT) != 0) #define SEQ_USE_DATA(_seq) (ELEM3(_seq->type, SEQ_TYPE_SCENE, SEQ_TYPE_MOVIECLIP, SEQ_TYPE_MASK) || SEQ_HAS_PATH(_seq)) @@ -970,7 +970,7 @@ static bool select_grouped_type_effect(Editing *ed, Sequence *actseq) { Sequence *seq; bool changed = false; - short is_effect = SEQ_IS_EFFECT(actseq); + const bool is_effect = SEQ_IS_EFFECT(actseq); SEQP_BEGIN (ed, seq) { @@ -1093,7 +1093,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) { Sequence *seq = NULL; bool changed = false; - short is_audio = ((actseq->type == SEQ_TYPE_META) || SEQ_IS_SOUND(actseq)); + const bool is_audio = ((actseq->type == SEQ_TYPE_META) || SEQ_IS_SOUND(actseq)); int startdisp = actseq->startdisp; int enddisp = actseq->enddisp; int machine = actseq->machine; |