From 9767ff891607fed7b6b5c2f1a99a122f220ec5dc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 20 Mar 2014 15:45:20 +0600 Subject: Code cleanup: use true/false in sequencer functions --- source/blender/blenkernel/BKE_sequencer.h | 30 ++-- source/blender/blenkernel/intern/seqeffects.c | 42 ++--- source/blender/blenkernel/intern/seqmodifier.c | 16 +- source/blender/blenkernel/intern/sequencer.c | 183 +++++++++++---------- source/blender/editors/animation/anim_deps.c | 2 +- source/blender/editors/animation/anim_filter.c | 2 +- source/blender/editors/screen/screen_context.c | 6 +- .../editors/space_outliner/outliner_select.c | 4 +- .../blender/editors/space_outliner/outliner_tree.c | 2 +- .../editors/space_sequencer/sequencer_add.c | 14 +- .../editors/space_sequencer/sequencer_draw.c | 14 +- .../editors/space_sequencer/sequencer_edit.c | 138 ++++++++-------- .../editors/space_sequencer/sequencer_intern.h | 2 +- .../editors/space_sequencer/sequencer_modifier.c | 2 +- .../editors/space_sequencer/sequencer_select.c | 30 ++-- .../editors/space_sequencer/sequencer_view.c | 2 +- .../editors/space_sequencer/space_sequencer.c | 4 +- .../editors/transform/transform_conversions.c | 16 +- source/blender/makesrna/intern/rna_sequencer.c | 58 +++---- source/blender/makesrna/intern/rna_sequencer_api.c | 2 +- source/blender/render/intern/source/pipeline.c | 2 +- 21 files changed, 286 insertions(+), 285 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index ea47f0ba47d..4cca91830d6 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -62,14 +62,14 @@ typedef struct SeqIterator { int valid; } SeqIterator; -void BKE_sequence_iterator_begin(struct Editing *ed, SeqIterator *iter, int use_pointer); +void BKE_sequence_iterator_begin(struct Editing *ed, SeqIterator *iter, bool use_pointer); void BKE_sequence_iterator_next(SeqIterator *iter); void BKE_sequence_iterator_end(SeqIterator *iter); #define SEQP_BEGIN(_ed, _seq) \ { \ SeqIterator iter_macro; \ - for (BKE_sequence_iterator_begin(_ed, &iter_macro, 1); \ + for (BKE_sequence_iterator_begin(_ed, &iter_macro, true); \ iter_macro.valid; \ BKE_sequence_iterator_next(&iter_macro)) \ { \ @@ -78,7 +78,7 @@ void BKE_sequence_iterator_end(SeqIterator *iter); #define SEQ_BEGIN(ed, _seq) \ { \ SeqIterator iter_macro; \ - for (BKE_sequence_iterator_begin(ed, &iter_macro, 0); \ + for (BKE_sequence_iterator_begin(ed, &iter_macro, false); \ iter_macro.valid; \ BKE_sequence_iterator_next(&iter_macro)) \ { \ @@ -116,8 +116,8 @@ enum { }; struct SeqEffectHandle { - short multithreaded; - short supports_mask; + bool multithreaded; + bool supports_mask; /* constructors & destructor */ /* init is _only_ called on first creation */ @@ -185,7 +185,7 @@ void BKE_sequencer_give_ibuf_prefetch_request(const SeqRenderData *context, floa * sequencer color space functions * ********************************************************************** */ -void BKE_sequencer_imbuf_to_sequencer_space(struct Scene *scene, struct ImBuf *ibuf, int make_float); +void BKE_sequencer_imbuf_to_sequencer_space(struct Scene *scene, struct ImBuf *ibuf, bool make_float); void BKE_sequencer_imbuf_from_sequencer_space(struct Scene *scene, struct ImBuf *ibuf); void BKE_sequencer_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4]); @@ -228,11 +228,11 @@ struct StripElem *BKE_sequencer_give_stripelem(struct Sequence *seq, int cfra); /* intern */ void BKE_sequencer_update_changed_seq_and_deps(struct Scene *scene, struct Sequence *changed_seq, int len_change, int ibuf_change); -int BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, struct Sequence *seq, float cfra); +bool BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, struct Sequence *seq, float cfra); struct SeqIndexBuildContext *BKE_sequencer_proxy_rebuild_context(struct Main *bmain, struct Scene *scene, struct Sequence *seq); void BKE_sequencer_proxy_rebuild(struct SeqIndexBuildContext *context, short *stop, short *do_update, float *progress); -void BKE_sequencer_proxy_rebuild_finish(struct SeqIndexBuildContext *context, short stop); +void BKE_sequencer_proxy_rebuild_finish(struct SeqIndexBuildContext *context, bool stop); /* ********************************************************************** * seqcache.c @@ -276,7 +276,7 @@ void BKE_sequencer_preprocessed_cache_cleanup_sequence(struct Sequence *seq); /* intern */ struct SeqEffectHandle BKE_sequence_get_blend(struct Sequence *seq); -void BKE_sequence_effect_speed_rebuild_map(struct Scene *scene, struct Sequence *seq, int force); +void BKE_sequence_effect_speed_rebuild_map(struct Scene *scene, struct Sequence *seq, bool force); /* extern */ struct SeqEffectHandle BKE_sequence_get_effect(struct Sequence *seq); @@ -289,8 +289,8 @@ int BKE_sequence_effect_get_supports_mask(int seq_type); */ /* for transform but also could use elsewhere */ -int BKE_sequence_tx_get_final_left(struct Sequence *seq, int metaclip); -int BKE_sequence_tx_get_final_right(struct Sequence *seq, int metaclip); +int BKE_sequence_tx_get_final_left(struct Sequence *seq, bool metaclip); +int BKE_sequence_tx_get_final_right(struct Sequence *seq, bool metaclip); void BKE_sequence_tx_set_final_left(struct Sequence *seq, int val); void BKE_sequence_tx_set_final_right(struct Sequence *seq, int val); void BKE_sequence_tx_handle_xlimits(struct Sequence *seq, int leftflag, int rightflag); @@ -309,7 +309,7 @@ void BKE_sequencer_dupe_animdata(struct Scene *scene, const char *name_src, cons bool BKE_sequence_base_shuffle(struct ListBase *seqbasep, struct Sequence *test, struct Scene *evil_scene); bool BKE_sequence_base_shuffle_time(ListBase *seqbasep, struct Scene *evil_scene); bool BKE_sequence_base_isolated_sel_check(struct ListBase *seqbase); -void BKE_sequencer_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, int for_render); +void BKE_sequencer_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, bool for_render); struct Sequence *BKE_sequence_dupli_recursive(struct Scene *scene, struct Scene *scene_to, struct Sequence *seq, int dupe_flag); int BKE_sequence_swap(struct Sequence *seq_a, struct Sequence *seq_b, const char **error_str); @@ -410,7 +410,7 @@ typedef struct SequenceModifierTypeInfo { struct SequenceModifierTypeInfo *BKE_sequence_modifier_type_info_get(int type); struct SequenceModifierData *BKE_sequence_modifier_new(struct Sequence *seq, const char *name, int type); -int BKE_sequence_modifier_remove(struct Sequence *seq, struct SequenceModifierData *smd); +bool BKE_sequence_modifier_remove(struct Sequence *seq, struct SequenceModifierData *smd); void BKE_sequence_modifier_clear(struct Sequence *seq); void BKE_sequence_modifier_free(struct SequenceModifierData *smd); void BKE_sequence_modifier_unique_name(struct Sequence *seq, struct SequenceModifierData *smd); @@ -421,7 +421,7 @@ void BKE_sequence_modifier_list_copy(struct Sequence *seqn, struct Sequence *seq int BKE_sequence_supports_modifiers(struct Sequence *seq); /* internal filters */ -struct ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context, int mask_input_type, struct Sequence *mask_sequence, struct Mask *mask_id, int cfra, int make_float); -void BKE_sequencer_color_balance_apply(struct StripColorBalance *cb, struct ImBuf *ibuf, float mul, short make_float, struct ImBuf *mask_input); +struct ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context, int mask_input_type, struct Sequence *mask_sequence, struct Mask *mask_id, int cfra, bool make_float); +void BKE_sequencer_color_balance_apply(struct StripColorBalance *cb, struct ImBuf *ibuf, float mul, bool make_float, struct ImBuf *mask_input); #endif /* __BKE_SEQUENCER_H__ */ diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index e491661d5b1..ab44cf720d0 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -121,13 +121,13 @@ static ImBuf *prepare_effect_imbufs(const SeqRenderData *context, ImBuf *ibuf1, } if (ibuf1 && !ibuf1->rect_float && out->rect_float) { - BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf1, TRUE); + BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf1, true); } if (ibuf2 && !ibuf2->rect_float && out->rect_float) { - BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf2, TRUE); + BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf2, true); } if (ibuf3 && !ibuf3->rect_float && out->rect_float) { - BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf3, TRUE); + BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf3, true); } if (ibuf1 && !ibuf1->rect && !out->rect_float) { @@ -582,7 +582,7 @@ static void do_cross_effect(const SeqRenderData *context, Sequence *UNUSED(seq), /* copied code from initrender.c */ static unsigned short gamtab[65536]; static unsigned short igamtab1[256]; -static int gamma_tabs_init = FALSE; +static bool gamma_tabs_init = false; #define RE_GAMMA_TABLE_SIZE 400 @@ -696,10 +696,10 @@ static void gamtabs(float gamma) static void build_gammatabs(void) { - if (gamma_tabs_init == FALSE) { + if (gamma_tabs_init == false) { gamtabs(2.0f); makeGammaTables(2.0f); - gamma_tabs_init = TRUE; + gamma_tabs_init = true; } } @@ -2430,7 +2430,7 @@ static void store_icu_yrange_speed(Sequence *seq, short UNUSED(adrcode), float * } } -void BKE_sequence_effect_speed_rebuild_map(Scene *scene, Sequence *seq, int force) +void BKE_sequence_effect_speed_rebuild_map(Scene *scene, Sequence *seq, bool force) { int cfra; float fallback_fac = 1.0f; @@ -2441,7 +2441,7 @@ void BKE_sequence_effect_speed_rebuild_map(Scene *scene, Sequence *seq, int forc /* if not already done, load / initialize data */ BKE_sequence_get_effect(seq); - if ((force == FALSE) && + if ((force == false) && (seq->len == v->length) && (v->frameMap != NULL)) { @@ -2657,8 +2657,8 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type) struct SeqEffectHandle rval; int sequence_type = seq_type; - rval.multithreaded = FALSE; - rval.supports_mask = FALSE; + rval.multithreaded = false; + rval.supports_mask = false; rval.init = init_noop; rval.num_inputs = num_inputs_default; rval.load = load_noop; @@ -2673,13 +2673,13 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type) switch (sequence_type) { case SEQ_TYPE_CROSS: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.execute_slice = do_cross_effect; rval.early_out = early_out_fade; rval.get_default_fac = get_default_fac_fade; break; case SEQ_TYPE_GAMCROSS: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.init = init_gammacross; rval.load = load_gammacross; rval.free = free_gammacross; @@ -2689,31 +2689,31 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type) rval.execute_slice = do_gammacross_effect; break; case SEQ_TYPE_ADD: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.execute_slice = do_add_effect; rval.early_out = early_out_mul_input2; break; case SEQ_TYPE_SUB: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.execute_slice = do_sub_effect; rval.early_out = early_out_mul_input2; break; case SEQ_TYPE_MUL: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.execute_slice = do_mul_effect; rval.early_out = early_out_mul_input2; break; case SEQ_TYPE_ALPHAOVER: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.init = init_alpha_over_or_under; rval.execute_slice = do_alphaover_effect; break; case SEQ_TYPE_OVERDROP: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.execute_slice = do_overdrop_effect; break; case SEQ_TYPE_ALPHAUNDER: - rval.multithreaded = TRUE; + rval.multithreaded = true; rval.init = init_alpha_over_or_under; rval.execute_slice = do_alphaunder_effect; break; @@ -2764,7 +2764,7 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type) rval.execute = do_multicam; break; case SEQ_TYPE_ADJUSTMENT: - rval.supports_mask = TRUE; + rval.supports_mask = true; rval.num_inputs = num_inputs_adjustment; rval.early_out = early_out_adjustment; rval.execute = do_adjustment; @@ -2776,7 +2776,7 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type) struct SeqEffectHandle BKE_sequence_get_effect(Sequence *seq) { - struct SeqEffectHandle rval = {FALSE, FALSE, NULL}; + struct SeqEffectHandle rval = {false, false, NULL}; if (seq->type & SEQ_TYPE_EFFECT) { rval = get_sequence_effect_impl(seq->type); @@ -2791,7 +2791,7 @@ struct SeqEffectHandle BKE_sequence_get_effect(Sequence *seq) struct SeqEffectHandle BKE_sequence_get_blend(Sequence *seq) { - struct SeqEffectHandle rval = {FALSE, FALSE, NULL}; + struct SeqEffectHandle rval = {false, false, NULL}; if (seq->blend_mode != 0) { rval = get_sequence_effect_impl(seq->blend_mode); diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/blenkernel/intern/seqmodifier.c index 27d09eeaf8f..2b5bc884315 100644 --- a/source/blender/blenkernel/intern/seqmodifier.c +++ b/source/blender/blenkernel/intern/seqmodifier.c @@ -50,7 +50,7 @@ #include "IMB_imbuf_types.h" static SequenceModifierTypeInfo *modifiersTypes[NUM_SEQUENCE_MODIFIER_TYPES]; -static int modifierTypesInit = FALSE; +static bool modifierTypesInit = false; /*********************** Modifiers *************************/ @@ -77,7 +77,7 @@ typedef struct ModifierThread { } ModifierThread; -static ImBuf *modifier_mask_get(SequenceModifierData *smd, const SeqRenderData *context, int cfra, int make_float) +static ImBuf *modifier_mask_get(SequenceModifierData *smd, const SeqRenderData *context, int cfra, bool make_float) { return BKE_sequencer_render_mask_input(context, smd->mask_input_type, smd->mask_sequence, smd->mask_id, cfra, make_float); } @@ -160,7 +160,7 @@ static void colorBalance_apply(SequenceModifierData *smd, ImBuf *ibuf, ImBuf *ma { ColorBalanceModifierData *cbmd = (ColorBalanceModifierData *) smd; - BKE_sequencer_color_balance_apply(&cbmd->color_balance, ibuf, cbmd->color_multiply, FALSE, mask); + BKE_sequencer_color_balance_apply(&cbmd->color_balance, ibuf, cbmd->color_multiply, false, mask); } static SequenceModifierTypeInfo seqModifier_ColorBalance = { @@ -571,7 +571,7 @@ SequenceModifierTypeInfo *BKE_sequence_modifier_type_info_get(int type) { if (!modifierTypesInit) { sequence_modifier_type_info_init(); - modifierTypesInit = TRUE; + modifierTypesInit = true; } return modifiersTypes[type]; @@ -602,15 +602,15 @@ SequenceModifierData *BKE_sequence_modifier_new(Sequence *seq, const char *name, return smd; } -int BKE_sequence_modifier_remove(Sequence *seq, SequenceModifierData *smd) +bool BKE_sequence_modifier_remove(Sequence *seq, SequenceModifierData *smd) { if (BLI_findindex(&seq->modifiers, smd) == -1) - return FALSE; + return false; BLI_remlink(&seq->modifiers, smd); BKE_sequence_modifier_free(smd); - return TRUE; + return true; } void BKE_sequence_modifier_clear(Sequence *seq) @@ -684,7 +684,7 @@ ImBuf *BKE_sequence_modifier_apply_stack(const SeqRenderData *context, Sequence } if (seq->modifiers.first && (seq->flag & SEQ_USE_LINEAR_MODIFIERS)) { - BKE_sequencer_imbuf_to_sequencer_space(context->scene, processed_ibuf, FALSE); + BKE_sequencer_imbuf_to_sequencer_space(context->scene, processed_ibuf, false); } return processed_ibuf; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 84f07755683..27ac7fd700d 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -88,7 +88,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seqbasep, float cfra, int chanshown); static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, float cfra); static void seq_free_animdata(Scene *scene, Sequence *seq); -static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr, short make_float); +static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr, bool make_float); /* **** XXX ******** */ #define SELECT 1 @@ -232,7 +232,7 @@ static void BKE_sequence_free_ex(Scene *scene, Sequence *seq, const bool do_cach void BKE_sequence_free(Scene *scene, Sequence *seq) { - BKE_sequence_free_ex(scene, seq, TRUE); + BKE_sequence_free_ex(scene, seq, true); } /* cache must be freed before calling this function @@ -246,7 +246,7 @@ static void seq_free_sequence_recurse(Scene *scene, Sequence *seq) seq_free_sequence_recurse(scene, iseq); } - BKE_sequence_free_ex(scene, seq, FALSE); + BKE_sequence_free_ex(scene, seq, false); } @@ -268,7 +268,7 @@ static void seq_free_clipboard_recursive(Sequence *seq_parent) } BKE_sequence_clipboard_pointers_free(seq_parent); - BKE_sequence_free_ex(NULL, seq_parent, FALSE); + BKE_sequence_free_ex(NULL, seq_parent, false); } void BKE_sequencer_free_clipboard(void) @@ -403,7 +403,7 @@ void BKE_sequencer_editing_free(Scene *scene) SEQ_BEGIN (ed, seq) { /* handle cache freeing above */ - BKE_sequence_free_ex(scene, seq, FALSE); + BKE_sequence_free_ex(scene, seq, false); } SEQ_END @@ -423,7 +423,7 @@ static void sequencer_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf) } } -void BKE_sequencer_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, int make_float) +void BKE_sequencer_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, bool make_float) { const char *from_colorspace = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_SCENE_LINEAR); const char *to_colorspace = scene->sequencer_colorspace_settings.name; @@ -554,7 +554,7 @@ static void seq_build_array(ListBase *seqbase, Sequence ***array, int depth) } } -static void seq_array(Editing *ed, Sequence ***seqarray, int *tot, int use_pointer) +static void seq_array(Editing *ed, Sequence ***seqarray, int *tot, bool use_pointer) { Sequence **array; @@ -579,7 +579,7 @@ static void seq_array(Editing *ed, Sequence ***seqarray, int *tot, int use_point seq_build_array(&ed->seqbase, &array, 0); } -void BKE_sequence_iterator_begin(Editing *ed, SeqIterator *iter, int use_pointer) +void BKE_sequence_iterator_begin(Editing *ed, SeqIterator *iter, bool use_pointer) { memset(iter, 0, sizeof(*iter)); seq_array(ed, &iter->array, &iter->tot, use_pointer); @@ -873,7 +873,7 @@ void BKE_sequencer_sort(Scene *scene) { /* all strips together per kind, and in order of y location ("machine") */ ListBase seqbase, effbase; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *seqt; @@ -1200,7 +1200,7 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr int BKE_sequencer_evaluate_frame(Scene *scene, int cfra) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq_arr[MAXSEQ + 1]; if (ed == NULL) @@ -1337,13 +1337,13 @@ static void seq_open_anim_file(Sequence *seq) } -static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *name) +static bool seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *name) { int frameno; char dir[PROXY_MAXFILE]; if (!seq->strip->proxy) { - return FALSE; + return false; } /* MOVIE tracks (only exception: custom files) are now handled @@ -1361,7 +1361,7 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir); } else { - return FALSE; + return false; } if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) { @@ -1369,7 +1369,7 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n dir, seq->strip->proxy->file); BLI_path_abs(name, G.main->name); - return TRUE; + return true; } /* generate a separate proxy directory for each preview size */ @@ -1389,7 +1389,7 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n strcat(name, ".jpg"); - return TRUE; + return true; } static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int cfra) @@ -1586,7 +1586,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho } } -void BKE_sequencer_proxy_rebuild_finish(SeqIndexBuildContext *context, short stop) +void BKE_sequencer_proxy_rebuild_finish(SeqIndexBuildContext *context, bool stop) { if (context->index_context) { IMB_close_anim_proxies(context->seq->anim); @@ -1778,7 +1778,7 @@ typedef struct ColorBalanceInitData { ImBuf *ibuf; float mul; ImBuf *mask; - short make_float; + bool make_float; } ColorBalanceInitData; typedef struct ColorBalanceThread { @@ -1790,7 +1790,7 @@ typedef struct ColorBalanceThread { unsigned char *rect, *mask_rect; float *rect_float, *mask_rect_float; - short make_float; + bool make_float; } ColorBalanceThread; static void color_balance_init_handle(void *handle_v, int start_line, int tot_line, void *init_data_v) @@ -1853,7 +1853,7 @@ static void *color_balance_do_thread(void *thread_data_v) return NULL; } -ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context, int mask_input_type, Sequence *mask_sequence, Mask *mask_id, int cfra, int make_float) +ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context, int mask_input_type, Sequence *mask_sequence, Mask *mask_id, int cfra, bool make_float) { ImBuf *mask_input = NULL; @@ -1878,7 +1878,7 @@ ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context, int mask_in return mask_input; } -void BKE_sequencer_color_balance_apply(StripColorBalance *cb, ImBuf *ibuf, float mul, short make_float, ImBuf *mask_input) +void BKE_sequencer_color_balance_apply(StripColorBalance *cb, ImBuf *ibuf, float mul, bool make_float, ImBuf *mask_input) { ColorBalanceInitData init_data; @@ -1920,16 +1920,16 @@ void BKE_sequencer_color_balance_apply(StripColorBalance *cb, ImBuf *ibuf, float * - Premultiply */ -int BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, Sequence *seq, float UNUSED(cfra)) +bool BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, Sequence *seq, float UNUSED(cfra)) { float mul; if (context->is_proxy_render) { - return FALSE; + return false; } if (seq->flag & (SEQ_FILTERY | SEQ_USE_CROP | SEQ_USE_TRANSFORM | SEQ_FLIPX | SEQ_FLIPY | SEQ_MAKE_FLOAT)) { - return TRUE; + return true; } mul = seq->mul; @@ -1939,18 +1939,18 @@ int BKE_sequencer_input_have_to_preprocess(const SeqRenderData *context, Sequenc } if (mul != 1.0f) { - return TRUE; + return true; } if (seq->sat != 1.0f) { - return TRUE; + return true; } if (seq->modifiers.first) { - return TRUE; + return true; } - - return FALSE; + + return false; } static ImBuf *input_preprocess(const SeqRenderData *context, Sequence *seq, float cfra, ImBuf *ibuf, @@ -2058,7 +2058,7 @@ static ImBuf *input_preprocess(const SeqRenderData *context, Sequence *seq, floa if (seq->flag & SEQ_MAKE_FLOAT) { if (!ibuf->rect_float) { - BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf, TRUE); + BKE_sequencer_imbuf_to_sequencer_space(scene, ibuf, true); } if (ibuf->rect) { @@ -2365,7 +2365,7 @@ static ImBuf *seq_render_movieclip_strip(const SeqRenderData *context, Sequence } -static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr, short make_float) +static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr, bool make_float) { /* TODO - add option to rasterize to alpha imbuf? */ ImBuf *ibuf = NULL; @@ -2387,7 +2387,7 @@ static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr mr_handle = BKE_maskrasterize_handle_new(); - BKE_maskrasterize_handle_init(mr_handle, mask_temp, context->rectx, context->recty, TRUE, TRUE, TRUE); + BKE_maskrasterize_handle_init(mr_handle, mask_temp, context->rectx, context->recty, true, true, true); BKE_mask_free_nolib(mask_temp); MEM_freeN(mask_temp); @@ -2442,7 +2442,7 @@ static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr static ImBuf *seq_render_mask_strip(const SeqRenderData *context, Sequence *seq, float nr) { - short make_float = seq->flag & SEQ_MAKE_FLOAT; + bool make_float = (seq->flag & SEQ_MAKE_FLOAT) != 0; return seq_render_mask(context, seq->mask, nr, make_float); } @@ -2487,13 +2487,13 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq */ const bool is_rendering = G.is_rendering; - const bool is_background = G.background; + const bool is_background = G.background; const bool do_seq_gl = is_rendering ? 0 /* (context->scene->r.seq_flag & R_SEQ_GL_REND) */ : (context->scene->r.seq_flag & R_SEQ_GL_PREV) != 0; int do_seq; - // int have_seq = FALSE; /* UNUSED */ - int have_comp = FALSE; + // bool have_seq = false; /* UNUSED */ + bool have_comp = false; Scene *scene; int is_thread_main = BLI_thread_is_main(); @@ -2505,7 +2505,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq scene = seq->scene; frame = scene->r.sfra + nr + seq->anim_startofs; - // have_seq = (scene->r.scemode & R_DOSEQ) && scene->ed && scene->ed->seqbase.first; /* UNUSED */ + // have_seq = (scene->r.scemode & R_DOSEQ) && scene->ed && scene->ed->seqbase.first); /* UNUSED */ have_comp = (scene->r.scemode & R_DOCOMP) && scene->use_nodes && scene->nodetree; oldcfra = scene->r.cfra; @@ -2519,7 +2519,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq camera = scene->camera; } - if (have_comp == FALSE && camera == NULL) { + if (have_comp == false && camera == NULL) { scene->r.cfra = oldcfra; return NULL; } @@ -2546,8 +2546,9 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq /* opengl offscreen render */ BKE_scene_update_for_newframe(context->eval_ctx, context->bmain, scene, scene->lay); ibuf = sequencer_view3d_cb(scene, camera, context->rectx, context->recty, IB_rect, - context->scene->r.seq_prev_type, context->scene->r.seq_flag & R_SEQ_SOLID_TEX, - TRUE, scene->r.alphamode, err_out); + context->scene->r.seq_prev_type, + (context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0, + true, scene->r.alphamode, err_out); if (ibuf == NULL) { fprintf(stderr, "seq_render_scene_strip failed to get opengl buffer: %s\n", err_out); } @@ -2564,7 +2565,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq * When rendering from command line renderer is called from main thread, in this * case it's always safe to render scene here */ - if (!is_thread_main || is_rendering == FALSE || is_background) { + if (!is_thread_main || is_rendering == false || is_background) { if (re == NULL) re = RE_NewRender(scene->id.name); @@ -2586,7 +2587,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq } /* float buffers in the sequencer are not linear */ - BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, FALSE); + BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false); } else if (rres.rect32) { ibuf = IMB_allocImBuf(rres.rectx, rres.recty, 32, IB_rect); @@ -2620,7 +2621,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s ImBuf *ibuf = NULL; float nr = give_stripelem_index(seq, cfra); int type = (seq->type & SEQ_TYPE_EFFECT && seq->type != SEQ_TYPE_SPEED) ? SEQ_TYPE_EFFECT : seq->type; - int use_preprocess = BKE_sequencer_input_have_to_preprocess(context, seq, cfra); + bool use_preprocess = BKE_sequencer_input_have_to_preprocess(context, seq, cfra); char name[FILE_MAX]; switch (type) { @@ -2652,7 +2653,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s float f_cfra; SpeedControlVars *s = (SpeedControlVars *)seq->effectdata; - BKE_sequence_effect_speed_rebuild_map(context->scene, seq, 0); + BKE_sequence_effect_speed_rebuild_map(context->scene, seq, false); /* weeek! */ f_cfra = seq->start + s->frameMap[(int)nr]; @@ -2698,7 +2699,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s imb_freerectImBuf(ibuf); /* all sequencer color is done in SRGB space, linear gives odd crossfades */ - BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, FALSE); + BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false); copy_to_ibuf_still(context, seq, nr, ibuf); @@ -2720,7 +2721,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s seq_rendersize_to_proxysize(context->preview_render_size)); if (ibuf) { - BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, FALSE); + BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false); /* we don't need both (speed reasons)! */ if (ibuf->rect_float && ibuf->rect) { @@ -2758,7 +2759,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s ibuf = i; if (ibuf->rect_float) - BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, FALSE); + BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false); copy_to_ibuf_still(context, seq, nr, ibuf); } @@ -2838,7 +2839,7 @@ static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, floa if (context->is_proxy_render == false && (ibuf->x != context->rectx || ibuf->y != context->recty)) { - use_preprocess = TRUE; + use_preprocess = true; } if (use_preprocess) @@ -2853,13 +2854,13 @@ static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, floa static bool seq_must_swap_input_in_blend_mode(Sequence *seq) { - bool swap_input = FALSE; + bool swap_input = false; /* bad hack, to fix crazy input ordering of * those two effects */ if (ELEM3(seq->blend_mode, SEQ_TYPE_ALPHAOVER, SEQ_TYPE_ALPHAUNDER, SEQ_TYPE_OVERDROP)) { - swap_input = TRUE; + swap_input = true; } return swap_input; @@ -3050,7 +3051,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seq ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int chanshown) { - Editing *ed = BKE_sequencer_editing_get(context->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(context->scene, false); int count; ListBase *seqbasep; @@ -3095,7 +3096,7 @@ static pthread_cond_t wakeup_cond = PTHREAD_COND_INITIALIZER; static pthread_mutex_t frame_done_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t frame_done_cond = PTHREAD_COND_INITIALIZER; -static volatile int seq_thread_shutdown = TRUE; +static volatile bool seq_thread_shutdown = true; static volatile int seq_last_given_monoton_cfra = 0; static int monoton_cfra = 0; @@ -3150,14 +3151,14 @@ void BKE_sequencer_give_ibuf_prefetch_request(const SeqRenderData *context, floa ImBuf *BKE_sequencer_give_ibuf_threaded(const SeqRenderData *context, float cfra, int chanshown) { PrefetchQueueElem *e = NULL; - int found_something = FALSE; + bool found_something = false; if (seq_thread_shutdown) { return BKE_sequencer_give_ibuf(context, cfra, chanshown); } while (!e) { - int success = FALSE; + bool success = false; pthread_mutex_lock(&queue_lock); for (e = prefetch_done.first; e; e = e->next) { @@ -3167,8 +3168,8 @@ ImBuf *BKE_sequencer_give_ibuf_threaded(const SeqRenderData *context, float cfra context->recty == e->recty && context->preview_render_size == e->preview_render_size) { - success = TRUE; - found_something = TRUE; + success = true; + found_something = true; break; } } @@ -3181,7 +3182,7 @@ ImBuf *BKE_sequencer_give_ibuf_threaded(const SeqRenderData *context, float cfra context->recty == e->recty && context->preview_render_size == e->preview_render_size) { - found_something = TRUE; + found_something = true; break; } } @@ -3201,7 +3202,7 @@ ImBuf *BKE_sequencer_give_ibuf_threaded(const SeqRenderData *context, float cfra context->recty == tslot->current->recty && context->preview_render_size == tslot->current->preview_render_size) { - found_something = TRUE; + found_something = true; break; } } @@ -3286,7 +3287,7 @@ static void sequence_do_invalidate_dependent(Sequence *seq, ListBase *seqbase) } } -static void sequence_invalidate_cache(Scene *scene, Sequence *seq, int invalidate_self, int invalidate_preprocess) +static void sequence_invalidate_cache(Scene *scene, Sequence *seq, bool invalidate_self, bool invalidate_preprocess) { Editing *ed = scene->ed; @@ -3306,7 +3307,7 @@ static void sequence_invalidate_cache(Scene *scene, Sequence *seq, int invalidat /* if invalidation is invoked from sequence free routine, effectdata would be NULL here */ if (seq->effectdata && seq->type == SEQ_TYPE_SPEED) - BKE_sequence_effect_speed_rebuild_map(scene, seq, TRUE); + BKE_sequence_effect_speed_rebuild_map(scene, seq, true); if (invalidate_preprocess) BKE_sequencer_preprocessed_cache_cleanup_sequence(seq); @@ -3321,20 +3322,20 @@ static void sequence_invalidate_cache(Scene *scene, Sequence *seq, int invalidat void BKE_sequence_invalidate_cache(Scene *scene, Sequence *seq) { - sequence_invalidate_cache(scene, seq, TRUE, TRUE); + sequence_invalidate_cache(scene, seq, true, true); } void BKE_sequence_invalidate_dependent(Scene *scene, Sequence *seq) { - sequence_invalidate_cache(scene, seq, FALSE, TRUE); + sequence_invalidate_cache(scene, seq, false, true); } void BKE_sequence_invalidate_cache_for_modifier(Scene *scene, Sequence *seq) { - sequence_invalidate_cache(scene, seq, TRUE, FALSE); + sequence_invalidate_cache(scene, seq, true, false); } -void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, int for_render) +void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, bool for_render) { Sequence *seq; @@ -3350,7 +3351,7 @@ void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, int for_render) free_anim_seq(seq); } if (seq->type == SEQ_TYPE_SPEED) { - BKE_sequence_effect_speed_rebuild_map(scene, seq, 1); + BKE_sequence_effect_speed_rebuild_map(scene, seq, true); } } if (seq->type == SEQ_TYPE_META) { @@ -3364,10 +3365,10 @@ void BKE_sequencer_free_imbuf(Scene *scene, ListBase *seqbase, int for_render) } -static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *changed_seq, int len_change, int ibuf_change) +static bool update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *changed_seq, int len_change, int ibuf_change) { Sequence *subseq; - int free_imbuf = 0; + bool free_imbuf = false; /* recurs downwards to see if this seq depends on the changed seq */ @@ -3375,28 +3376,28 @@ static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *chan return 0; if (seq == changed_seq) - free_imbuf = 1; + free_imbuf = true; for (subseq = seq->seqbase.first; subseq; subseq = subseq->next) if (update_changed_seq_recurs(scene, subseq, changed_seq, len_change, ibuf_change)) - free_imbuf = TRUE; + free_imbuf = true; if (seq->seq1) if (update_changed_seq_recurs(scene, seq->seq1, changed_seq, len_change, ibuf_change)) - free_imbuf = TRUE; + free_imbuf = true; if (seq->seq2 && (seq->seq2 != seq->seq1)) if (update_changed_seq_recurs(scene, seq->seq2, changed_seq, len_change, ibuf_change)) - free_imbuf = TRUE; + free_imbuf = true; if (seq->seq3 && (seq->seq3 != seq->seq1) && (seq->seq3 != seq->seq2)) if (update_changed_seq_recurs(scene, seq->seq3, changed_seq, len_change, ibuf_change)) - free_imbuf = TRUE; + free_imbuf = true; if (free_imbuf) { if (ibuf_change) { if (seq->type == SEQ_TYPE_MOVIE) free_anim_seq(seq); if (seq->type == SEQ_TYPE_SPEED) { - BKE_sequence_effect_speed_rebuild_map(scene, seq, 1); + BKE_sequence_effect_speed_rebuild_map(scene, seq, true); } } @@ -3409,7 +3410,7 @@ static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *chan void BKE_sequencer_update_changed_seq_and_deps(Scene *scene, Sequence *changed_seq, int len_change, int ibuf_change) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; if (ed == NULL) return; @@ -3433,22 +3434,22 @@ static int seq_tx_get_end(Sequence *seq) return seq->start + seq->len; } -int BKE_sequence_tx_get_final_left(Sequence *seq, int metaclip) +int BKE_sequence_tx_get_final_left(Sequence *seq, bool metaclip) { if (metaclip && seq->tmp) { /* return the range clipped by the parents range */ - return max_ii(BKE_sequence_tx_get_final_left(seq, 0), BKE_sequence_tx_get_final_left((Sequence *)seq->tmp, TRUE)); + return max_ii(BKE_sequence_tx_get_final_left(seq, false), BKE_sequence_tx_get_final_left((Sequence *)seq->tmp, true)); } else { return (seq->start - seq->startstill) + seq->startofs; } } -int BKE_sequence_tx_get_final_right(Sequence *seq, int metaclip) +int BKE_sequence_tx_get_final_right(Sequence *seq, bool metaclip) { if (metaclip && seq->tmp) { /* return the range clipped by the parents range */ - return min_ii(BKE_sequence_tx_get_final_right(seq, 0), BKE_sequence_tx_get_final_right((Sequence *)seq->tmp, TRUE)); + return min_ii(BKE_sequence_tx_get_final_right(seq, false), BKE_sequence_tx_get_final_right((Sequence *)seq->tmp, true)); } else { return ((seq->start + seq->len) + seq->endstill) - seq->endofs; @@ -3537,12 +3538,12 @@ bool BKE_sequence_base_isolated_sel_check(ListBase *seqbase) void BKE_sequence_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { if (leftflag) { - if (BKE_sequence_tx_get_final_left(seq, 0) >= BKE_sequence_tx_get_final_right(seq, 0)) { - BKE_sequence_tx_set_final_left(seq, BKE_sequence_tx_get_final_right(seq, 0) - 1); + if (BKE_sequence_tx_get_final_left(seq, false) >= BKE_sequence_tx_get_final_right(seq, false)) { + BKE_sequence_tx_set_final_left(seq, BKE_sequence_tx_get_final_right(seq, false) - 1); } if (BKE_sequence_single_check(seq) == 0) { - if (BKE_sequence_tx_get_final_left(seq, 0) >= seq_tx_get_end(seq)) { + if (BKE_sequence_tx_get_final_left(seq, false) >= seq_tx_get_end(seq)) { BKE_sequence_tx_set_final_left(seq, seq_tx_get_end(seq) - 1); } @@ -3559,12 +3560,12 @@ void BKE_sequence_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag) } if (rightflag) { - if (BKE_sequence_tx_get_final_right(seq, 0) <= BKE_sequence_tx_get_final_left(seq, 0)) { - BKE_sequence_tx_set_final_right(seq, BKE_sequence_tx_get_final_left(seq, 0) + 1); + if (BKE_sequence_tx_get_final_right(seq, false) <= BKE_sequence_tx_get_final_left(seq, false)) { + BKE_sequence_tx_set_final_right(seq, BKE_sequence_tx_get_final_left(seq, false) + 1); } if (BKE_sequence_single_check(seq) == 0) { - if (BKE_sequence_tx_get_final_right(seq, 0) <= seq_tx_get_start(seq)) { + if (BKE_sequence_tx_get_final_right(seq, false) <= seq_tx_get_start(seq)) { BKE_sequence_tx_set_final_right(seq, seq_tx_get_start(seq) + 1); } } @@ -3585,12 +3586,12 @@ void BKE_sequence_single_fix(Sequence *seq) /* make sure the image is always at the start since there is only one, * adjusting its start should be ok */ - left = BKE_sequence_tx_get_final_left(seq, 0); + left = BKE_sequence_tx_get_final_left(seq, false); start = seq->start; if (start != left) { offset = left - start; - BKE_sequence_tx_set_final_left(seq, BKE_sequence_tx_get_final_left(seq, 0) - offset); - BKE_sequence_tx_set_final_right(seq, BKE_sequence_tx_get_final_right(seq, 0) - offset); + BKE_sequence_tx_set_final_left(seq, BKE_sequence_tx_get_final_left(seq, false) - offset); + BKE_sequence_tx_set_final_right(seq, BKE_sequence_tx_get_final_right(seq, false) - offset); seq->start += offset; } } @@ -3656,7 +3657,7 @@ void BKE_sequence_sound_init(Scene *scene, Sequence *seq) Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *best_seq = NULL; int best_machine = -1; @@ -4142,7 +4143,7 @@ Sequence *BKE_sequencer_from_elem(ListBase *seqbase, StripElem *se) Sequence *BKE_sequencer_active_get(Scene *scene) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return NULL; @@ -4152,7 +4153,7 @@ Sequence *BKE_sequencer_active_get(Scene *scene) void BKE_sequencer_active_set(Scene *scene, Sequence *seq) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -4162,7 +4163,7 @@ void BKE_sequencer_active_set(Scene *scene, Sequence *seq) int BKE_sequencer_active_get_pair(Scene *scene, Sequence **seq_act, Sequence **seq_other) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); *seq_act = BKE_sequencer_active_get(scene); @@ -4318,7 +4319,7 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); /* only for sound */ - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, false); bSound *sound; Sequence *seq; /* generic strip vars */ diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c index 618c1b04a71..71e405a2209 100644 --- a/source/blender/editors/animation/anim_deps.c +++ b/source/blender/editors/animation/anim_deps.c @@ -243,7 +243,7 @@ static void animchan_sync_fcurve(bAnimContext *ac, bAnimListElem *ale, FCurve ** /* only affect if F-Curve involves sequence_editor.sequences */ if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; char *seq_name; diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c1820ff1b3a..9ec8b678f0b 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -914,7 +914,7 @@ static bool skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_id /* only consider if F-Curve involves sequence_editor.sequences */ if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = NULL; char *seq_name; diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index a516603cfd4..b1c57030130 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -357,7 +357,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if (CTX_data_equals(member, "sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -368,7 +368,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "selected_sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -381,7 +381,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "selected_editable_sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 688695e3ded..89f17bc611b 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -724,7 +724,7 @@ static eOLDrawState tree_element_active_sequence( bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { Sequence *seq = (Sequence *) te->directdata; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (set != OL_SETSEL_NONE) { /* only check on setting */ @@ -757,7 +757,7 @@ static eOLDrawState tree_element_active_sequence_dup( Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { Sequence *seq, *p; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); seq = (Sequence *)te->directdata; if (set == OL_SETSEL_NONE) { diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 4231dc6f9f8..0c8c7a2e12f 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1630,7 +1630,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops) } else if (soops->outlinevis == SO_SEQUENCE) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int op; if (ed == NULL) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index e816494faaf..d6b5bb3e534 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -130,7 +130,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) Sequence *tgt = NULL; Sequence *seq; Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); int cfra = (int) CFRA; int proximity = INT_MAX; @@ -240,7 +240,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Scene *sce_seq; @@ -334,7 +334,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); MovieClip *clip; @@ -426,7 +426,7 @@ void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot) static int sequencer_add_mask_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Mask *mask; @@ -519,7 +519,7 @@ void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot) static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoadFunc seq_load_func) { Scene *scene = CTX_data_scene(C); /* only for sound */ - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); SeqLoadInfo seq_load; Sequence *seq; int tot_files; @@ -688,7 +688,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) /* cant use the generic function for this */ Scene *scene = CTX_data_scene(C); /* only for sound */ - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); SeqLoadInfo seq_load; Sequence *seq; @@ -788,7 +788,7 @@ void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot) static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Sequence *seq; /* generic strip vars */ Strip *strip; diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index caade2dc59f..9f7f40899b2 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -702,8 +702,8 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline /* draw the main strip body */ if (is_single_image) { /* single image */ draw_shadedstrip(seq, background_col, - BKE_sequence_tx_get_final_left(seq, 0), y1, - BKE_sequence_tx_get_final_right(seq, 0), y2); + BKE_sequence_tx_get_final_left(seq, false), y1, + BKE_sequence_tx_get_final_right(seq, false), y2); } else { /* normal operation */ draw_shadedstrip(seq, background_col, x1, y1, x2, y2); @@ -843,7 +843,7 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int /* sequencer could start rendering, in this case we need to be sure it wouldn't be canceled * by Esc pressed somewhere in the past */ - G.is_break = FALSE; + G.is_break = false; if (special_seq_update) ibuf = BKE_sequencer_give_ibuf_direct(&context, cfra + frame_ofs, special_seq_update); @@ -903,7 +903,7 @@ static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scop return scope; } -void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs, int draw_overlay) +void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs, bool draw_overlay) { struct Main *bmain = CTX_data_main(C); struct ImBuf *ibuf = NULL; @@ -922,7 +922,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq int format, type; bool glsl_used = false; - if (G.is_rendering == FALSE && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) { + if (G.is_rendering == false && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) { /* stop all running jobs, except screen one. currently previews frustrate Render * needed to make so sequencer's rendering doesn't conflict with compositor */ @@ -1262,7 +1262,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq 0, 0, 0, /* TODO */ width, height, aspx, aspy, - FALSE, TRUE, + false, true, NULL, C); } } @@ -1405,7 +1405,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d) void draw_timeline_seq(const bContext *C, ARegion *ar) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); SpaceSeq *sseq = CTX_wm_space_seq(C); View2D *v2d = &ar->v2d; View2DScrollers *scrollers; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1464d39ff23..ddade51e5ad 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -165,14 +165,14 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog static void proxy_endjob(void *pjv) { ProxyJob *pj = pjv; - Editing *ed = BKE_sequencer_editing_get(pj->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(pj->scene, false); LinkData *link; for (link = pj->queue.first; link; link = link->next) { BKE_sequencer_proxy_rebuild_finish(link->data, pj->stop); } - BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, false); WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, pj->scene); } @@ -182,7 +182,7 @@ static void seq_proxy_build_job(const bContext *C) wmJob *wm_job; ProxyJob *pj; Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ScrArea *sa = CTX_wm_area(C); struct SeqIndexBuildContext *context; LinkData *link; @@ -215,7 +215,7 @@ static void seq_proxy_build_job(const bContext *C) SEQ_END if (!WM_jobs_is_running(wm_job)) { - G.is_break = FALSE; + G.is_break = false; WM_jobs_start(CTX_wm_manager(C), wm_job); } @@ -237,7 +237,7 @@ void seq_rectf(Sequence *seq, rctf *rectf) void boundbox_seq(Scene *scene, rctf *rect) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); float min[2], max[2]; @@ -284,7 +284,7 @@ Sequence *find_neighboring_sequence(Scene *scene, Sequence *test, int lr, int se { /* sel - 0==unselected, 1==selected, -1==done care*/ Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return NULL; @@ -316,7 +316,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i { /* sel - 0==unselected, 1==selected, -1==done care*/ Sequence *seq, *best_seq = NULL; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int dist, best_dist; best_dist = MAXFRAME * 2; @@ -364,7 +364,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[2]) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); float x, y; float pixelx; float handsize; @@ -439,7 +439,7 @@ static bool seq_is_predecessor(Sequence *pred, Sequence *seq) void ED_sequencer_deselect_all(Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -481,7 +481,7 @@ bool ED_space_sequencer_check_show_maskedit(SpaceSeq *sseq, Scene *scene) return (BKE_sequencer_mask_get(scene) != NULL); } - return FALSE; + return false; } int ED_space_sequencer_maskedit_poll(bContext *C) @@ -505,7 +505,7 @@ bool ED_space_sequencer_check_show_imbuf(SpaceSeq *sseq) int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char **error_str) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq1 = NULL, *seq2 = NULL, *seq3 = NULL, *seq; *error_str = NULL; @@ -616,7 +616,7 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq) static void del_seq_clear_modifiers_recurs(Scene *scene, Sequence *deleting_sequence) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *current_sequence; SEQP_BEGIN(ed, current_sequence) @@ -657,7 +657,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) { TransSeq ts; Sequence *seqn = NULL; - int skip_dup = FALSE; + bool skip_dup = false; /* backup values */ ts.start = seq->start; @@ -678,7 +678,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) if ((seq->startstill) && (cutframe < seq->start)) { /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; seq->startstill = seq->start - cutframe; } else { @@ -699,11 +699,11 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) seq->endstill -= seq->enddisp - cutframe; /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; } } - BKE_sequence_reload_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); BKE_sequence_calc(scene, seq); if (!skip_dup) { @@ -743,7 +743,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) seqn->startstill = 0; } - BKE_sequence_reload_new_file(scene, seqn, FALSE); + BKE_sequence_reload_new_file(scene, seqn, false); BKE_sequence_calc(scene, seqn); } return seqn; @@ -753,7 +753,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) { TransSeq ts; Sequence *seqn = NULL; - int skip_dup = FALSE; + bool skip_dup = false; /* backup values */ ts.start = seq->start; @@ -774,7 +774,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) if ((seq->startstill) && (cutframe < seq->start)) { /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; seq->startstill = seq->start - cutframe; } else { @@ -793,7 +793,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) seq->endstill -= seq->enddisp - cutframe; /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; } } @@ -891,7 +891,7 @@ static bool cut_seq_list(Scene *scene, ListBase *slist, int cutframe, static bool sequence_offset_after_frame(Scene *scene, const int delta, const int cfra) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); bool done = false; /* all strips >= cfra are shifted */ @@ -912,7 +912,7 @@ static bool sequence_offset_after_frame(Scene *scene, const int delta, const int static void UNUSED_FUNCTION(touch_seq_files) (Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); char str[256]; /* touch all strips with movies */ @@ -944,7 +944,7 @@ static void UNUSED_FUNCTION(touch_seq_files) (Scene *scene) static void set_filter_seq(Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -956,7 +956,7 @@ static void set_filter_seq(Scene *scene) if (seq->flag & SELECT) { if (seq->type == SEQ_TYPE_MOVIE) { seq->flag |= SEQ_FILTERY; - reload_sequence_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); BKE_sequence_calc(scene, seq); } @@ -969,7 +969,7 @@ static void set_filter_seq(Scene *scene) static void UNUSED_FUNCTION(seq_remap_paths) (Scene *scene) { Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); char from[FILE_MAX], to[FILE_MAX], stripped[FILE_MAX]; @@ -1120,14 +1120,14 @@ static int seq_get_snaplimit(View2D *v2d) /* Operator functions */ int sequencer_edit_poll(bContext *C) { - return (BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL); + return (BKE_sequencer_editing_get(CTX_data_scene(C), false) != NULL); } #if 0 /* UNUSED */ int sequencer_strip_poll(bContext *C) { Editing *ed; - return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE)) != NULL) && (ed->act_seq != NULL)); + return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), false)) != NULL) && (ed->act_seq != NULL)); } #endif @@ -1135,13 +1135,13 @@ int sequencer_strip_has_path_poll(bContext *C) { Editing *ed; Sequence *seq; - return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE)) != NULL) && ((seq = ed->act_seq) != NULL) && (SEQ_HAS_PATH(seq))); + return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), false)) != NULL) && ((seq = ed->act_seq) != NULL) && (SEQ_HAS_PATH(seq))); } int sequencer_view_poll(bContext *C) { SpaceSeq *sseq = CTX_wm_space_seq(C); - Editing *ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE); + Editing *ed = BKE_sequencer_editing_get(CTX_data_scene(C), false); if (ed && sseq && (sseq->mainb == SEQ_DRAW_IMG_IMBUF)) return 1; @@ -1153,7 +1153,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int snap_frame; @@ -1244,7 +1244,7 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot) static int sequencer_mute_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int selected; @@ -1295,7 +1295,7 @@ void SEQUENCER_OT_mute(struct wmOperatorType *ot) static int sequencer_unmute_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int selected; @@ -1346,7 +1346,7 @@ void SEQUENCER_OT_unmute(struct wmOperatorType *ot) static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -1379,7 +1379,7 @@ void SEQUENCER_OT_lock(struct wmOperatorType *ot) static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -1412,7 +1412,7 @@ void SEQUENCER_OT_unlock(struct wmOperatorType *ot) static int sequencer_reload_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; const bool adjust_length = RNA_boolean_get(op->ptr, "adjust_length"); @@ -1458,9 +1458,9 @@ void SEQUENCER_OT_reload(struct wmOperatorType *ot) static int sequencer_refresh_all_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -1512,7 +1512,7 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) static int sequencer_effect_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *last_seq = BKE_sequencer_active_get(scene); @@ -1586,7 +1586,7 @@ static EnumPropertyItem prop_cut_types[] = { static int sequencer_cut_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int cut_side, cut_hard, cut_frame; bool changed; @@ -1699,7 +1699,7 @@ static int apply_unique_name_cb(Sequence *seq, void *arg_pt) static int sequencer_add_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase nseqbase = {NULL, NULL}; @@ -1745,19 +1745,19 @@ void SEQUENCER_OT_duplicate(wmOperatorType *ot) static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; MetaStack *ms; - int nothingSelected = TRUE; + bool nothingSelected = true; seq = BKE_sequencer_active_get(scene); if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */ - nothingSelected = FALSE; + nothingSelected = false; } else { for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { - nothingSelected = FALSE; + nothingSelected = false; break; } } @@ -1837,7 +1837,7 @@ void SEQUENCER_OT_delete(wmOperatorType *ot) static int sequencer_offset_clear_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; /* for effects, try to find a replacement input */ @@ -1889,7 +1889,7 @@ void SEQUENCER_OT_offset_clear(wmOperatorType *ot) static int sequencer_separate_images_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *seq_new; Strip *strip_new; @@ -1909,8 +1909,8 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) /* if (seq->ipo) seq->ipo->id.us--; */ /* XXX, remove fcurve and assign to split image strips */ - start_ofs = cfra = BKE_sequence_tx_get_final_left(seq, 0); - frame_end = BKE_sequence_tx_get_final_right(seq, 0); + start_ofs = cfra = BKE_sequence_tx_get_final_left(seq, false); + frame_end = BKE_sequence_tx_get_final_right(seq, false); while (cfra < frame_end) { /* new seq */ @@ -1989,7 +1989,7 @@ void SEQUENCER_OT_images_separate(wmOperatorType *ot) static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *last_seq = BKE_sequencer_active_get(scene); MetaStack *ms; @@ -2060,12 +2060,12 @@ void SEQUENCER_OT_meta_toggle(wmOperatorType *ot) static int sequencer_meta_make_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *seqm, *next, *last_seq = BKE_sequencer_active_get(scene); int channel_max = 1; - if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == FALSE) { + if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == false) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -2135,7 +2135,7 @@ static int seq_depends_on_meta(Sequence *seq, Sequence *seqm) static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks (ed == NULL) */ @@ -2364,7 +2364,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); View2D *v2d = UI_view2d_fromcontext(C); ARegion *ar = CTX_wm_region(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *last_seq = BKE_sequencer_active_get(scene); Sequence *seq; rctf cur_new = v2d->cur; @@ -2445,7 +2445,7 @@ static int find_next_prev_edit(Scene *scene, int cfra, const short side, const bool do_skip_mute, const bool do_center) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *best_seq = NULL, *frame_seq = NULL; int dist, best_dist; @@ -2547,8 +2547,8 @@ static int sequencer_strip_jump_exec(bContext *C, wmOperator *op) 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)) { + /* currently do_skip_mute is always true */ + if (!strip_jump_internal(scene, next ? SEQ_SIDE_RIGHT : SEQ_SIDE_LEFT, true, center)) { return OPERATOR_CANCELLED; } @@ -2594,7 +2594,7 @@ static void swap_sequence(Scene *scene, Sequence *seqa, Sequence *seqb) #if 0 static Sequence *sequence_find_parent(Scene *scene, Sequence *child) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *parent = NULL; Sequence *seq; @@ -2614,7 +2614,7 @@ static Sequence *sequence_find_parent(Scene *scene, Sequence *child) static int sequencer_swap_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *active_seq = BKE_sequencer_active_get(scene); Sequence *seq, *iseq; int side = RNA_enum_get(op->ptr, "side"); @@ -2762,13 +2762,13 @@ static void seq_copy_del_sound(Scene *scene, Sequence *seq) static int sequencer_copy_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase nseqbase = {NULL, NULL}; BKE_sequencer_free_clipboard(); - if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == FALSE) { + if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == false) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -2834,7 +2834,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); /* create if needed */ + Editing *ed = BKE_sequencer_editing_get(scene, true); /* create if needed */ ListBase nseqbase = {NULL, NULL}; int ofs; Sequence *iseq, *iseq_first; @@ -2955,7 +2955,7 @@ void SEQUENCER_OT_swap_data(wmOperatorType *ot) static int view_ghost_border_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); View2D *v2d = UI_view2d_fromcontext(C); rctf rect; @@ -3047,7 +3047,7 @@ static EnumPropertyItem prop_change_effect_input_types[] = { static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); Sequence **seq_1, **seq_2; @@ -3078,7 +3078,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -3105,7 +3105,7 @@ void SEQUENCER_OT_change_effect_input(struct wmOperatorType *ot) static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); const int new_type = RNA_enum_get(op->ptr, "type"); @@ -3138,7 +3138,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -3166,7 +3166,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); const int is_relative_path = RNA_boolean_get(op->ptr, "relative_path"); @@ -3206,12 +3206,12 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) /* correct start/end frames so we don't move * important not to set seq->len = len; allow the function to handle it */ - BKE_sequence_reload_new_file(scene, seq, TRUE); + BKE_sequence_reload_new_file(scene, seq, true); BKE_sequence_calc(scene, seq); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); } else { /* lame, set rna filepath */ diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index a0212bd17fa..60fc300da1f 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -52,7 +52,7 @@ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); /* sequencer_draw.c */ void draw_timeline_seq(const struct bContext *C, struct ARegion *ar); -void draw_image_seq(const struct bContext *C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, int draw_overlay); +void draw_image_seq(const struct bContext *C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, bool draw_overlay); /* UNUSED */ // void seq_reset_imageofs(struct SpaceSeq *sseq); diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c index 9850c7c3493..d3057645972 100644 --- a/source/blender/editors/space_sequencer/sequencer_modifier.c +++ b/source/blender/editors/space_sequencer/sequencer_modifier.c @@ -65,7 +65,7 @@ static int strip_modifier_active_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq = BKE_sequencer_active_get(scene); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index c8178259dc2..cc97f7108ce 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -164,7 +164,7 @@ void select_surround_from_last(Scene *scene) void ED_sequencer_select_sequence_single(Scene *scene, Sequence *seq, bool deselect_all) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (deselect_all) ED_sequencer_deselect_all(scene); @@ -221,7 +221,7 @@ static int sequencer_de_select_all_exec(bContext *C, wmOperator *op) int action = RNA_enum_get(op->ptr, "action"); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; if (action == SEL_TOGGLE) { @@ -282,7 +282,7 @@ void SEQUENCER_OT_select_all(struct wmOperatorType *ot) static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -319,7 +319,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e { View2D *v2d = UI_view2d_fromcontext(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); const bool extend = RNA_boolean_get(op->ptr, "extend"); const bool linked_handle = RNA_boolean_get(op->ptr, "linked_handle"); const bool linked_time = RNA_boolean_get(op->ptr, "linked_time"); @@ -338,7 +338,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e // XXX - not nice, Ctrl+RMB needs to do left_right only when not over a strip if (seq && linked_time && left_right) - left_right = FALSE; + left_right = false; if (marker) { @@ -555,7 +555,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot) /* run recursively to select linked */ static bool select_more_less_seq__internal(Scene *scene, bool sel, const bool linked) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *neighbor; bool changed = false; int isel; @@ -757,7 +757,7 @@ void SEQUENCER_OT_select_linked(wmOperatorType *ot) static int sequencer_select_handles_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int sel_side = RNA_enum_get(op->ptr, "side"); @@ -807,7 +807,7 @@ void SEQUENCER_OT_select_handles(wmOperatorType *ot) static int sequencer_select_active_side_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq_act = BKE_sequencer_active_get(scene); if (ed == NULL || seq_act == NULL) @@ -845,7 +845,7 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot) static int sequencer_borderselect_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); View2D *v2d = UI_view2d_fromcontext(C); Sequence *seq; @@ -1044,16 +1044,16 @@ static bool select_grouped_effect(Editing *ed, Sequence *actseq) { Sequence *seq; bool changed = false; - short effects[SEQ_TYPE_EFFECT_MAX + 1]; + bool effects[SEQ_TYPE_EFFECT_MAX + 1]; int i; for (i = 0; i <= SEQ_TYPE_EFFECT_MAX; i++) - effects[i] = FALSE; + effects[i] = false; SEQP_BEGIN (ed, seq) { if (ELEM3(actseq, seq->seq1, seq->seq2, seq->seq3)) { - effects[seq->type] = TRUE; + effects[seq->type] = true; } } SEQ_END; @@ -1107,7 +1107,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) actseq->tmp = SET_INT_IN_POINTER(TRUE); - for (BKE_sequence_iterator_begin(ed, &iter, TRUE); iter.valid; BKE_sequence_iterator_next(&iter)) { + for (BKE_sequence_iterator_begin(ed, &iter, true); iter.valid; BKE_sequence_iterator_next(&iter)) { seq = iter.seq; /* Ignore all seqs already selected! */ @@ -1136,7 +1136,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) /* Unfortunately, we must restart checks from the beginning. */ BKE_sequence_iterator_end(&iter); - BKE_sequence_iterator_begin(ed, &iter, TRUE); + BKE_sequence_iterator_begin(ed, &iter, true); } /* Video strips bellow active one, or any strip for audio (order do no matters here!). */ @@ -1157,7 +1157,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) static int sequencer_select_grouped_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *actseq = BKE_sequencer_active_get(scene); int type = RNA_enum_get(op->ptr, "type"); bool changed = false, extend; diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index f39b30adf37..74fd22b4226 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -219,7 +219,7 @@ static void sample_cancel(bContext *C, wmOperator *op) static int sample_poll(bContext *C) { SpaceSeq *sseq = CTX_wm_space_seq(C); - return sseq && BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL; + return sseq && BKE_sequencer_editing_get(CTX_data_scene(C), false) != NULL; } void SEQUENCER_OT_sample(wmOperatorType *ot) diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 1f7b70a52a9..03d74d1952f 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -544,7 +544,7 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar) if (sseq->mainb == SEQ_DRAW_SEQUENCE) sseq->mainb = SEQ_DRAW_IMG_IMBUF; if (!show_split || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) - draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0, FALSE); + draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0, false); if (show_split && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { int over_cfra; @@ -555,7 +555,7 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar) over_cfra = scene->r.cfra + scene->ed->over_ofs; if (over_cfra != scene->r.cfra || sseq->overlay_type != SEQ_DRAW_OVERLAY_RECT) - draw_image_seq(C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra, TRUE); + draw_image_seq(C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra, true); } if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e7a6e1460a4..10575eb0d53 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2426,7 +2426,7 @@ BLI_INLINE void trans_update_seq(Scene *sce, Sequence *seq, int old_start, int s void flushTransSeq(TransInfo *t) { - ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, FALSE)->seqbasep; /* Editing null check already done */ + ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, false)->seqbasep; /* Editing null check already done */ int a, new_frame; TransData *td = NULL; TransData2D *td2d = NULL; @@ -4156,8 +4156,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count Scene *scene = t->scene; int cfra = CFRA; - int left = BKE_sequence_tx_get_final_left(seq, 1); - int right = BKE_sequence_tx_get_final_right(seq, 1); + int left = BKE_sequence_tx_get_final_left(seq, true); + int right = BKE_sequence_tx_get_final_right(seq, true); if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) { *recursive = FALSE; @@ -4292,16 +4292,16 @@ static TransData *SeqToTransData(TransData *td, TransData2D *td2d, TransDataSeq /* Use seq_tx_get_final_left() and an offset here * so transform has the left hand location of the strip. * tdsq->start_offset is used when flushing the tx data back */ - start_left = BKE_sequence_tx_get_final_left(seq, 0); + start_left = BKE_sequence_tx_get_final_left(seq, false); td2d->loc[0] = start_left; tdsq->start_offset = start_left - seq->start; /* use to apply the original location */ break; case SEQ_LEFTSEL: - start_left = BKE_sequence_tx_get_final_left(seq, 0); + start_left = BKE_sequence_tx_get_final_left(seq, false); td2d->loc[0] = start_left; break; case SEQ_RIGHTSEL: - td2d->loc[0] = BKE_sequence_tx_get_final_right(seq, 0); + td2d->loc[0] = BKE_sequence_tx_get_final_right(seq, false); break; } @@ -4388,7 +4388,7 @@ static int SeqToTransData_Recursive(TransInfo *t, ListBase *seqbase, TransData * static void freeSeqData(TransInfo *t) { - Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(t->scene, false); if (ed != NULL) { ListBase *seqbasep = ed->seqbasep; @@ -4563,7 +4563,7 @@ static void createTransSeqData(bContext *C, TransInfo *t) View2D *v2d = UI_view2d_fromcontext(C); Scene *scene = t->scene; - Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(t->scene, false); TransData *td = NULL; TransData2D *td2d = NULL; TransDataSeq *tdsq = NULL; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 14149da78e8..1ac43e426de 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -98,7 +98,7 @@ static void meta_tmp_ref(Sequence *seq_par, Sequence *seq) static void rna_SequenceElement_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { StripElem *se = (StripElem *)ptr->data; @@ -115,7 +115,7 @@ static void rna_SequenceElement_update(Main *UNUSED(bmain), Scene *UNUSED(scene) static void rna_Sequence_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq = (Sequence *) ptr->data; @@ -127,7 +127,7 @@ static void rna_Sequence_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Point static void rna_SequenceEditor_sequences_all_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Scene *scene = (Scene *)ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); meta_tmp_ref(NULL, ed->seqbase.first); @@ -179,7 +179,7 @@ static void rna_SequenceEditor_elements_begin(CollectionPropertyIterator *iter, static void do_sequence_frame_change_update(Scene *scene, Sequence *seq) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq); Sequence *tseq; BKE_sequence_calc_disp(scene, seq); @@ -247,7 +247,7 @@ static void rna_Sequence_anim_startofs_final_set(PointerRNA *ptr, int value) seq->anim_startofs = MIN2(value, seq->len + seq->anim_startofs); - BKE_sequence_reload_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); do_sequence_frame_change_update(scene, seq); } @@ -258,7 +258,7 @@ static void rna_Sequence_anim_endofs_final_set(PointerRNA *ptr, int value) seq->anim_endofs = MIN2(value, seq->len + seq->anim_endofs); - BKE_sequence_reload_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); do_sequence_frame_change_update(scene, seq); } @@ -274,7 +274,7 @@ static void rna_Sequence_frame_length_set(PointerRNA *ptr, int value) static int rna_Sequence_frame_length_get(PointerRNA *ptr) { Sequence *seq = (Sequence *)ptr->data; - return BKE_sequence_tx_get_final_right(seq, 0) - BKE_sequence_tx_get_final_left(seq, 0); + return BKE_sequence_tx_get_final_right(seq, false) - BKE_sequence_tx_get_final_left(seq, false); } static int rna_Sequence_frame_editable(PointerRNA *ptr) @@ -288,7 +288,7 @@ static void rna_Sequence_channel_set(PointerRNA *ptr, int value) { Sequence *seq = (Sequence *)ptr->data; Scene *scene = (Scene *)ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase *seqbase = BKE_sequence_seqbase(&ed->seqbase, seq); seq->machine = value; @@ -371,7 +371,7 @@ static Sequence *sequence_get_by_transform(Editing *ed, StripTransform *transfor static char *rna_SequenceTransform_path(PointerRNA *ptr) { Scene *scene = ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_transform(ed, ptr->data); if (seq && seq->name + 2) { @@ -388,7 +388,7 @@ static char *rna_SequenceTransform_path(PointerRNA *ptr) static void rna_SequenceTransform_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_transform(ed, ptr->data); BKE_sequence_invalidate_cache(scene, seq); @@ -421,7 +421,7 @@ static Sequence *sequence_get_by_crop(Editing *ed, StripCrop *crop) static char *rna_SequenceCrop_path(PointerRNA *ptr) { Scene *scene = ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_crop(ed, ptr->data); if (seq && seq->name + 2) { @@ -438,7 +438,7 @@ static char *rna_SequenceCrop_path(PointerRNA *ptr) static void rna_SequenceCrop_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_crop(ed, ptr->data); BKE_sequence_invalidate_cache(scene, seq); @@ -678,9 +678,9 @@ static void rna_SequenceElement_filename_set(PointerRNA *ptr, const char *value) static void rna_Sequence_update_reopen_files(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); if (RNA_struct_is_a(ptr->type, &RNA_SoundSequence)) BKE_sequencer_update_sound_bounds(scene, ptr->data); @@ -689,7 +689,7 @@ static void rna_Sequence_update_reopen_files(Main *UNUSED(bmain), Scene *UNUSED( static void rna_Sequence_mute_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); BKE_sequencer_update_muting(ed); rna_Sequence_update(bmain, scene, ptr); @@ -699,7 +699,7 @@ static void rna_Sequence_filepath_update(Main *bmain, Scene *UNUSED(scene), Poin { Scene *scene = (Scene *) ptr->id.data; Sequence *seq = (Sequence *)(ptr->data); - BKE_sequence_reload_new_file(scene, seq, TRUE); + BKE_sequence_reload_new_file(scene, seq, true); BKE_sequence_calc(scene, seq); rna_Sequence_update(bmain, scene, ptr); } @@ -729,17 +729,17 @@ static Sequence *sequence_get_by_proxy(Editing *ed, StripProxy *proxy) static void rna_Sequence_tcindex_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_proxy(ed, ptr->data); - BKE_sequence_reload_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); do_sequence_frame_change_update(scene, seq); } static void rna_SequenceProxy_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_proxy(ed, ptr->data); BKE_sequence_invalidate_cache(scene, seq); @@ -801,7 +801,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr) { Scene *scene = ptr->id.data; SequenceModifierData *smd; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_colorbalance(ed, ptr->data, &smd); if (seq && seq->name + 2) { @@ -831,7 +831,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr) static void rna_SequenceColorBalance_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); SequenceModifierData *smd; Sequence *seq = sequence_get_by_colorbalance(ed, ptr->data, &smd); @@ -844,7 +844,7 @@ static void rna_SequenceColorBalance_update(Main *UNUSED(bmain), Scene *UNUSED(s static void rna_SequenceEditor_overlay_lock_set(PointerRNA *ptr, int value) { Scene *scene = ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -863,7 +863,7 @@ static void rna_SequenceEditor_overlay_lock_set(PointerRNA *ptr, int value) static int rna_SequenceEditor_overlay_frame_get(PointerRNA *ptr) { Scene *scene = (Scene *)ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return scene->r.cfra; @@ -878,7 +878,7 @@ static int rna_SequenceEditor_overlay_frame_get(PointerRNA *ptr) static void rna_SequenceEditor_overlay_frame_set(PointerRNA *ptr, int value) { Scene *scene = (Scene *)ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -936,7 +936,7 @@ static StructRNA *rna_SequenceModifier_refine(struct PointerRNA *ptr) static char *rna_SequenceModifier_path(PointerRNA *ptr) { Scene *scene = ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); SequenceModifierData *smd = ptr->data; Sequence *seq = sequence_get_by_modifier(ed, smd); @@ -958,7 +958,7 @@ static void rna_SequenceModifier_name_set(PointerRNA *ptr, const char *value) { SequenceModifierData *smd = ptr->data; Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_modifier(ed, smd); AnimData *adt; char oldname[sizeof(smd->name)]; @@ -986,7 +986,7 @@ static void rna_SequenceModifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene { /* strip from other scenes could be modified, so using active scene is not reliable */ Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_modifier(ed, ptr->data); BKE_sequence_invalidate_cache_for_modifier(scene, seq); @@ -995,7 +995,7 @@ static void rna_SequenceModifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene static int rna_SequenceModifier_otherSequence_poll(PointerRNA *ptr, PointerRNA value) { Scene *scene = (Scene *) ptr->id.data; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = sequence_get_by_modifier(ed, ptr->data); Sequence *cur = (Sequence *) value.data; @@ -1031,7 +1031,7 @@ static void rna_Sequence_modifier_remove(Sequence *seq, bContext *C, ReportList SequenceModifierData *smd = smd_ptr->data; Scene *scene = CTX_data_scene(C); - if (BKE_sequence_modifier_remove(seq, smd) == FALSE) { + if (BKE_sequence_modifier_remove(seq, smd) == false) { BKE_report(reports, RPT_ERROR, "Modifier was not found in the stack"); return; } diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index aee9c054b6f..2777f642bca 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -325,7 +325,7 @@ static void rna_Sequences_remove(ID *id, Editing *ed, ReportList *reports, Point Sequence *seq = seq_ptr->data; Scene *scene = (Scene *)id; - if (BLI_remlink_safe(&ed->seqbase, seq) == FALSE) { + if (BLI_remlink_safe(&ed->seqbase, seq) == false) { BKE_reportf(reports, RPT_ERROR, "Sequence '%s' not in scene '%s'", seq->name + 2, scene->id.name + 2); return; } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index ee462706a5b..d144da5bc4e 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2262,7 +2262,7 @@ static void do_render_seq(Render *re) if (recurs_depth == 0) { /* with nested scenes, only free on toplevel... */ Editing *ed = re->scene->ed; if (ed) - BKE_sequencer_free_imbuf(re->scene, &ed->seqbase, TRUE); + BKE_sequencer_free_imbuf(re->scene, &ed->seqbase, true); } IMB_freeImBuf(ibuf); } -- cgit v1.2.3