[Bf-blender-cvs] [9767ff8] master: Code cleanup: use true/false in sequencer functions
Sergey Sharybin
noreply at git.blender.org
Thu Mar 20 10:46:53 CET 2014
Commit: 9767ff891607fed7b6b5c2f1a99a122f220ec5dc
Author: Sergey Sharybin
Date: Thu Mar 20 15:45:20 2014 +0600
https://developer.blender.org/rB9767ff891607fed7b6b5c2f1a99a122f220ec5dc
Code cleanup: use true/false in sequencer functions
===================================================================
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index ea47f0b..4cca918 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 e491661..ab44cf7 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 = fre
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list