Cleanup: Use `_fn` as a suffix for callbacks in VSE code
This commit is contained in:
parent
9d4300b0c6
commit
43cc2f3195
|
@ -493,7 +493,7 @@ typedef struct SeqLoadInfo {
|
|||
#define SEQ_DUPE_ALL (1 << 3) /* otherwise only selected are copied */
|
||||
|
||||
/* use as an api function */
|
||||
typedef struct Sequence *(*SeqLoadFunc)(struct bContext *, ListBase *, struct SeqLoadInfo *);
|
||||
typedef struct Sequence *(*SeqLoadFn)(struct bContext *, ListBase *, struct SeqLoadInfo *);
|
||||
|
||||
struct Sequence *BKE_sequence_alloc(ListBase *lb, int cfra, int machine, int type);
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
|
|||
const char *viewname,
|
||||
struct GPUOffScreen *ofs,
|
||||
char err_out[256]);
|
||||
extern SequencerDrawView sequencer_view3d_cb;
|
||||
extern SequencerDrawView sequencer_view3d_fn;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@ static ThreadMutex seq_render_mutex = BLI_MUTEX_INITIALIZER;
|
|||
#define SELECT 1
|
||||
ListBase seqbase_clipboard;
|
||||
int seqbase_clipboard_frame;
|
||||
SequencerDrawView sequencer_view3d_cb = NULL; /* NULL in background mode */
|
||||
SequencerDrawView sequencer_view3d_fn = NULL; /* NULL in background mode */
|
||||
|
||||
#if 0 /* unused function */
|
||||
static void printf_strip(Sequence *seq)
|
||||
|
@ -153,28 +153,28 @@ static void sequencer_state_init(SeqRenderState *state)
|
|||
}
|
||||
|
||||
int BKE_sequencer_base_recursive_apply(ListBase *seqbase,
|
||||
int (*apply_func)(Sequence *seq, void *),
|
||||
int (*apply_fn)(Sequence *seq, void *),
|
||||
void *arg)
|
||||
{
|
||||
Sequence *iseq;
|
||||
for (iseq = seqbase->first; iseq; iseq = iseq->next) {
|
||||
if (BKE_sequencer_recursive_apply(iseq, apply_func, arg) == -1) {
|
||||
if (BKE_sequencer_recursive_apply(iseq, apply_fn, arg) == -1) {
|
||||
return -1; /* bail out */
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int BKE_sequencer_recursive_apply(Sequence *seq, int (*apply_func)(Sequence *, void *), void *arg)
|
||||
int BKE_sequencer_recursive_apply(Sequence *seq, int (*apply_fn)(Sequence *, void *), void *arg)
|
||||
{
|
||||
int ret = apply_func(seq, arg);
|
||||
int ret = apply_fn(seq, arg);
|
||||
|
||||
if (ret == -1) {
|
||||
return -1; /* bail out */
|
||||
}
|
||||
|
||||
if (ret && seq->seqbase.first) {
|
||||
ret = BKE_sequencer_base_recursive_apply(&seq->seqbase, apply_func, arg);
|
||||
ret = BKE_sequencer_base_recursive_apply(&seq->seqbase, apply_fn, arg);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
@ -1139,7 +1139,7 @@ int BKE_sequencer_cmp_time_startdisp(const void *a, const void *b)
|
|||
return (seq_a->startdisp > seq_b->startdisp);
|
||||
}
|
||||
|
||||
static int clear_scene_in_allseqs_cb(Sequence *seq, void *arg_pt)
|
||||
static int clear_scene_in_allseqs_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
if (seq->scene == (Scene *)arg_pt) {
|
||||
seq->scene = NULL;
|
||||
|
@ -1155,7 +1155,7 @@ void BKE_sequencer_clear_scene_in_allseqs(Main *bmain, Scene *scene)
|
|||
for (scene_iter = bmain->scenes.first; scene_iter; scene_iter = scene_iter->id.next) {
|
||||
if (scene_iter != scene && scene_iter->ed) {
|
||||
BKE_sequencer_base_recursive_apply(
|
||||
&scene_iter->ed->seqbase, clear_scene_in_allseqs_cb, scene);
|
||||
&scene_iter->ed->seqbase, clear_scene_in_allseqs_fn, scene);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1185,7 +1185,7 @@ static void seqbase_unique_name(ListBase *seqbasep, SeqUniqueInfo *sui)
|
|||
}
|
||||
}
|
||||
|
||||
static int seqbase_unique_name_recursive_cb(Sequence *seq, void *arg_pt)
|
||||
static int seqbase_unique_name_recursive_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
if (seq->seqbase.first) {
|
||||
seqbase_unique_name(&seq->seqbase, (SeqUniqueInfo *)arg_pt);
|
||||
|
@ -1217,7 +1217,7 @@ void BKE_sequence_base_unique_name_recursive(ListBase *seqbasep, Sequence *seq)
|
|||
while (sui.match) {
|
||||
sui.match = 0;
|
||||
seqbase_unique_name(seqbasep, &sui);
|
||||
BKE_sequencer_base_recursive_apply(seqbasep, seqbase_unique_name_recursive_cb, &sui);
|
||||
BKE_sequencer_base_recursive_apply(seqbasep, seqbase_unique_name_recursive_fn, &sui);
|
||||
}
|
||||
|
||||
BLI_strncpy(seq->name + 2, sui.name_dest, sizeof(seq->name) - 2);
|
||||
|
@ -3499,7 +3499,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context,
|
|||
|
||||
is_frame_update = (orig_data.cfra != scene->r.cfra) || (orig_data.subframe != scene->r.subframe);
|
||||
|
||||
if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main) {
|
||||
if ((sequencer_view3d_fn && do_seq_gl && camera) && is_thread_main) {
|
||||
char err_out[256] = "unknown";
|
||||
const int width = (scene->r.xsch * scene->r.size) / 100;
|
||||
const int height = (scene->r.ysch * scene->r.size) / 100;
|
||||
|
@ -3520,7 +3520,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context,
|
|||
/* opengl offscreen render */
|
||||
depsgraph = BKE_scene_get_depsgraph(context->bmain, scene, view_layer, true);
|
||||
BKE_scene_graph_update_for_newframe(depsgraph, context->bmain);
|
||||
ibuf = sequencer_view3d_cb(
|
||||
ibuf = sequencer_view3d_fn(
|
||||
/* set for OpenGL render (NULL when scrubbing) */
|
||||
depsgraph,
|
||||
scene,
|
||||
|
|
|
@ -206,7 +206,7 @@ static void SOUND_OT_open_mono(wmOperatorType *ot)
|
|||
|
||||
static void sound_update_animation_flags(Scene *scene);
|
||||
|
||||
static int sound_update_animation_flags_cb(Sequence *seq, void *user_data)
|
||||
static int sound_update_animation_flags_fn(Sequence *seq, void *user_data)
|
||||
{
|
||||
struct FCurve *fcu;
|
||||
Scene *scene = (Scene *)user_data;
|
||||
|
@ -258,7 +258,7 @@ static void sound_update_animation_flags(Scene *scene)
|
|||
scene->id.tag |= LIB_TAG_DOIT;
|
||||
|
||||
SEQ_BEGIN (scene->ed, seq) {
|
||||
BKE_sequencer_recursive_apply(seq, sound_update_animation_flags_cb, scene);
|
||||
BKE_sequencer_recursive_apply(seq, sound_update_animation_flags_fn, scene);
|
||||
}
|
||||
SEQ_END;
|
||||
|
||||
|
|
|
@ -587,7 +587,7 @@ void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot)
|
|||
ot->prop = prop;
|
||||
}
|
||||
|
||||
static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoadFunc seq_load_func)
|
||||
static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoadFn seq_load_fn)
|
||||
{
|
||||
Scene *scene = CTX_data_scene(C); /* only for sound */
|
||||
Editing *ed = BKE_sequencer_editing_get(scene, true);
|
||||
|
@ -617,7 +617,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad
|
|||
/* Set seq_load.name, else all video/audio files get the same name! ugly! */
|
||||
BLI_strncpy(seq_load.name, file_only, sizeof(seq_load.name));
|
||||
|
||||
seq = seq_load_func(C, ed->seqbasep, &seq_load);
|
||||
seq = seq_load_fn(C, ed->seqbasep, &seq_load);
|
||||
if (seq) {
|
||||
sequencer_add_apply_overlap(C, op, seq);
|
||||
if (seq_load.seq_sound) {
|
||||
|
@ -631,7 +631,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad
|
|||
Sequence *seq;
|
||||
|
||||
/* single file */
|
||||
seq = seq_load_func(C, ed->seqbasep, &seq_load);
|
||||
seq = seq_load_fn(C, ed->seqbasep, &seq_load);
|
||||
if (seq) {
|
||||
sequencer_add_apply_overlap(C, op, seq);
|
||||
if (seq_load.seq_sound) {
|
||||
|
@ -672,7 +672,7 @@ static void sequencer_add_cancel(bContext *UNUSED(C), wmOperator *op)
|
|||
op->customdata = NULL;
|
||||
}
|
||||
|
||||
static bool sequencer_add_draw_check_prop(PointerRNA *UNUSED(ptr),
|
||||
static bool sequencer_add_draw_check_fn(PointerRNA *UNUSED(ptr),
|
||||
PropertyRNA *prop,
|
||||
void *UNUSED(user_data))
|
||||
{
|
||||
|
@ -740,7 +740,7 @@ static void sequencer_add_draw(bContext *UNUSED(C), wmOperator *op)
|
|||
/* main draw call */
|
||||
RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
|
||||
uiDefAutoButsRNA(
|
||||
layout, &ptr, sequencer_add_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
|
||||
layout, &ptr, sequencer_add_draw_check_fn, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false);
|
||||
|
||||
/* image template */
|
||||
RNA_pointer_create(NULL, &RNA_ImageFormatSettings, imf, &imf_ptr);
|
||||
|
|
|
@ -1239,7 +1239,7 @@ static void sequencer_check_scopes(SequencerScopes *scopes, ImBuf *ibuf)
|
|||
}
|
||||
}
|
||||
|
||||
static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scope_cb)(ImBuf *ibuf))
|
||||
static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scope_fn)(ImBuf *ibuf))
|
||||
{
|
||||
ImBuf *display_ibuf = IMB_dupImBuf(ibuf);
|
||||
ImBuf *scope;
|
||||
|
@ -1247,7 +1247,7 @@ static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scop
|
|||
IMB_colormanagement_imbuf_make_display_space(
|
||||
display_ibuf, &scene->view_settings, &scene->display_settings);
|
||||
|
||||
scope = make_scope_cb(display_ibuf);
|
||||
scope = make_scope_fn(display_ibuf);
|
||||
|
||||
IMB_freeImBuf(display_ibuf);
|
||||
|
||||
|
@ -1980,7 +1980,7 @@ typedef struct CacheDrawData {
|
|||
} CacheDrawData;
|
||||
|
||||
/* Called as a callback */
|
||||
static bool draw_cache_view_init_cb(void *userdata, size_t item_count)
|
||||
static bool draw_cache_view_init_fn(void *userdata, size_t item_count)
|
||||
{
|
||||
if (item_count == 0) {
|
||||
return true;
|
||||
|
@ -1998,7 +1998,7 @@ static bool draw_cache_view_init_cb(void *userdata, size_t item_count)
|
|||
}
|
||||
|
||||
/* Called as a callback */
|
||||
static bool draw_cache_view_iter_cb(
|
||||
static bool draw_cache_view_iter_fn(
|
||||
void *userdata, struct Sequence *seq, int nfra, int cache_type, float UNUSED(cost))
|
||||
{
|
||||
CacheDrawData *drawdata = userdata;
|
||||
|
@ -2162,7 +2162,7 @@ static void draw_cache_view(const bContext *C)
|
|||
userdata.composite_vbo = GPU_vertbuf_create_with_format(&format);
|
||||
userdata.final_out_vbo = GPU_vertbuf_create_with_format(&format);
|
||||
|
||||
BKE_sequencer_cache_iterate(scene, &userdata, draw_cache_view_init_cb, draw_cache_view_iter_cb);
|
||||
BKE_sequencer_cache_iterate(scene, &userdata, draw_cache_view_init_fn, draw_cache_view_iter_fn);
|
||||
|
||||
draw_cache_view_batch(userdata.raw_vbo, userdata.raw_vert_count, 1.0f, 0.1f, 0.02f, 0.4f);
|
||||
draw_cache_view_batch(
|
||||
|
|
|
@ -2359,7 +2359,7 @@ void SEQUENCER_OT_split(struct wmOperatorType *ot)
|
|||
#undef SEQ_SIDE_MOUSE
|
||||
|
||||
/* duplicate operator */
|
||||
static int apply_unique_name_cb(Sequence *seq, void *arg_pt)
|
||||
static int apply_unique_name_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
Scene *scene = (Scene *)arg_pt;
|
||||
char name[sizeof(seq->name) - 2];
|
||||
|
@ -2389,7 +2389,7 @@ static int sequencer_add_duplicate_exec(bContext *C, wmOperator *UNUSED(op))
|
|||
BLI_movelisttolist(ed->seqbasep, &nseqbase);
|
||||
|
||||
for (; seq; seq = seq->next) {
|
||||
BKE_sequencer_recursive_apply(seq, apply_unique_name_cb, scene);
|
||||
BKE_sequencer_recursive_apply(seq, apply_unique_name_fn, scene);
|
||||
}
|
||||
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
|
||||
|
@ -3461,7 +3461,7 @@ static int sequencer_copy_exec(bContext *C, wmOperator *op)
|
|||
BLI_movelisttolist(ed->seqbasep, &nseqbase);
|
||||
|
||||
for (seq = first_seq; seq; seq = seq->next) {
|
||||
BKE_sequencer_recursive_apply(seq, apply_unique_name_cb, scene);
|
||||
BKE_sequencer_recursive_apply(seq, apply_unique_name_fn, scene);
|
||||
}
|
||||
|
||||
seqbase_clipboard.first = first_seq;
|
||||
|
@ -3538,7 +3538,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
|
|||
|
||||
/* make sure the pasted strips have unique names between them */
|
||||
for (iseq = iseq_first; iseq; iseq = iseq->next) {
|
||||
BKE_sequencer_recursive_apply(iseq, apply_unique_name_cb, scene);
|
||||
BKE_sequencer_recursive_apply(iseq, apply_unique_name_fn, scene);
|
||||
}
|
||||
|
||||
/* ensure pasted strips don't overlap */
|
||||
|
|
|
@ -450,7 +450,7 @@ typedef struct MakeHistogramViewData {
|
|||
uint32_t (*bins)[HIS_STEPS];
|
||||
} MakeHistogramViewData;
|
||||
|
||||
static void make_histogram_view_from_ibuf_byte_cb_ex(void *__restrict userdata,
|
||||
static void make_histogram_view_from_ibuf_byte_fn(void *__restrict userdata,
|
||||
const int y,
|
||||
const TaskParallelTLS *__restrict tls)
|
||||
{
|
||||
|
@ -504,7 +504,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf)
|
|||
settings.userdata_chunk = bins;
|
||||
settings.userdata_chunk_size = sizeof(bins);
|
||||
settings.func_finalize = make_histogram_view_from_ibuf_finalize;
|
||||
BLI_task_parallel_range(0, ibuf->y, &data, make_histogram_view_from_ibuf_byte_cb_ex, &settings);
|
||||
BLI_task_parallel_range(0, ibuf->y, &data, make_histogram_view_from_ibuf_byte_fn, &settings);
|
||||
|
||||
nr = nb = ng = 0;
|
||||
for (x = 0; x < HIS_STEPS; x++) {
|
||||
|
@ -551,7 +551,7 @@ BLI_INLINE int get_bin_float(float f)
|
|||
return (int)(((f + 0.25f) / 1.5f) * 512);
|
||||
}
|
||||
|
||||
static void make_histogram_view_from_ibuf_float_cb_ex(void *__restrict userdata,
|
||||
static void make_histogram_view_from_ibuf_float_fn(void *__restrict userdata,
|
||||
const int y,
|
||||
const TaskParallelTLS *__restrict tls)
|
||||
{
|
||||
|
@ -590,7 +590,7 @@ static ImBuf *make_histogram_view_from_ibuf_float(ImBuf *ibuf)
|
|||
settings.userdata_chunk = bins;
|
||||
settings.userdata_chunk_size = sizeof(bins);
|
||||
settings.func_finalize = make_histogram_view_from_ibuf_finalize;
|
||||
BLI_task_parallel_range(0, ibuf->y, &data, make_histogram_view_from_ibuf_float_cb_ex, &settings);
|
||||
BLI_task_parallel_range(0, ibuf->y, &data, make_histogram_view_from_ibuf_float_fn, &settings);
|
||||
|
||||
nr = nb = ng = 0;
|
||||
for (x = 0; x < HIS_STEPS; x++) {
|
||||
|
|
|
@ -935,6 +935,6 @@ void ED_spacetype_sequencer(void)
|
|||
|
||||
/* set the sequencer callback when not in background mode */
|
||||
if (G.background == 0) {
|
||||
sequencer_view3d_cb = ED_view3d_draw_offscreen_imbuf_simple;
|
||||
sequencer_view3d_fn = ED_view3d_draw_offscreen_imbuf_simple;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -427,7 +427,7 @@ static void rna_Sequence_use_crop_set(PointerRNA *ptr, bool value)
|
|||
}
|
||||
}
|
||||
|
||||
static int transform_seq_cmp_cb(Sequence *seq, void *arg_pt)
|
||||
static int transform_seq_cmp_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
SequenceSearchData *data = arg_pt;
|
||||
|
||||
|
@ -446,7 +446,7 @@ static Sequence *sequence_get_by_transform(Editing *ed, StripTransform *transfor
|
|||
data.data = transform;
|
||||
|
||||
/* irritating we need to search for our sequence! */
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, transform_seq_cmp_cb, &data);
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, transform_seq_cmp_fn, &data);
|
||||
|
||||
return data.seq;
|
||||
}
|
||||
|
@ -479,7 +479,7 @@ static void rna_SequenceTransform_update(Main *UNUSED(bmain),
|
|||
BKE_sequence_invalidate_cache_preprocessed(scene, seq);
|
||||
}
|
||||
|
||||
static int crop_seq_cmp_cb(Sequence *seq, void *arg_pt)
|
||||
static int crop_seq_cmp_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
SequenceSearchData *data = arg_pt;
|
||||
|
||||
|
@ -498,7 +498,7 @@ static Sequence *sequence_get_by_crop(Editing *ed, StripCrop *crop)
|
|||
data.data = crop;
|
||||
|
||||
/* irritating we need to search for our sequence! */
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, crop_seq_cmp_cb, &data);
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, crop_seq_cmp_fn, &data);
|
||||
|
||||
return data.seq;
|
||||
}
|
||||
|
@ -822,7 +822,7 @@ static void rna_Sequence_sound_update(Main *UNUSED(bmain), Scene *scene, Pointer
|
|||
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS | ID_RECALC_AUDIO);
|
||||
}
|
||||
|
||||
static int seqproxy_seq_cmp_cb(Sequence *seq, void *arg_pt)
|
||||
static int seqproxy_seq_cmp_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
SequenceSearchData *data = arg_pt;
|
||||
|
||||
|
@ -840,7 +840,7 @@ static Sequence *sequence_get_by_proxy(Editing *ed, StripProxy *proxy)
|
|||
data.seq = NULL;
|
||||
data.data = proxy;
|
||||
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, seqproxy_seq_cmp_cb, &data);
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, seqproxy_seq_cmp_fn, &data);
|
||||
return data.seq;
|
||||
}
|
||||
|
||||
|
@ -876,7 +876,7 @@ static void rna_Sequence_opacity_set(PointerRNA *ptr, float value)
|
|||
seq->blend_opacity = value * 100.0f;
|
||||
}
|
||||
|
||||
static int colbalance_seq_cmp_cb(Sequence *seq, void *arg_pt)
|
||||
static int colbalance_seq_cmp_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
SequenceSearchData *data = arg_pt;
|
||||
|
||||
|
@ -910,7 +910,7 @@ static Sequence *sequence_get_by_colorbalance(Editing *ed,
|
|||
data.data = cb;
|
||||
|
||||
/* irritating we need to search for our sequence! */
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, colbalance_seq_cmp_cb, &data);
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, colbalance_seq_cmp_fn, &data);
|
||||
|
||||
*r_smd = data.smd;
|
||||
|
||||
|
@ -1014,7 +1014,7 @@ static void rna_SequenceEditor_overlay_frame_set(PointerRNA *ptr, int value)
|
|||
}
|
||||
}
|
||||
|
||||
static int modifier_seq_cmp_cb(Sequence *seq, void *arg_pt)
|
||||
static int modifier_seq_cmp_fn(Sequence *seq, void *arg_pt)
|
||||
{
|
||||
SequenceSearchData *data = arg_pt;
|
||||
|
||||
|
@ -1034,7 +1034,7 @@ static Sequence *sequence_get_by_modifier(Editing *ed, SequenceModifierData *smd
|
|||
data.data = smd;
|
||||
|
||||
/* irritating we need to search for our sequence! */
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, modifier_seq_cmp_cb, &data);
|
||||
BKE_sequencer_base_recursive_apply(&ed->seqbase, modifier_seq_cmp_fn, &data);
|
||||
|
||||
return data.seq;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue