bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Code cleanup: remove redundant struct and some space cleanup

Browse Source
This commit is contained in:
Sergey Sharybin 2012-08-08 11:15:38 +00:00
parent 2457e89481
commit 03a3e4f165
3 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/blenkernel/BKE_sequencer.h
View File

@ -92,9 +92,8 @@ typedef struct SeqRenderData {
float motion_blur_shutter;
} SeqRenderData;
SeqRenderData seq_new_render_data(
struct Main *bmain, struct Scene *scene,
int rectx, int recty, int preview_render_size);
SeqRenderData seq_new_render_data(struct Main *bmain, struct Scene *scene, int rectx, int recty,
int preview_render_size);
/* Wipe effect */
enum {
@ -106,7 +105,6 @@ enum {
DO_CLOCK_WIPE
};
struct SeqEffectHandle {
/* constructors & destructor */
/* init is _only_ called on first creation */
@ -143,11 +141,8 @@ struct SeqEffectHandle {
* float-rects or byte-rects
* (mixed cases are handled one layer up...) */
struct ImBuf * (*execute)(SeqRenderData context,
struct Sequence *seq, float cfra,
float facf0, float facf1,
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
struct ImBuf *ibuf3);
struct ImBuf * (*execute)(SeqRenderData context, struct Sequence *seq, float cfra, float facf0, float facf1,
struct ImBuf *ibuf1, struct ImBuf *ibuf2, struct ImBuf *ibuf3);
};
/* ********************* prototypes *************** */
@ -175,8 +170,8 @@ void BKE_sequencer_editing_free(struct Scene *scene);
void BKE_sequencer_sort(struct Scene *scene);
struct Sequence *BKE_sequencer_active_get(struct Scene *scene);
int BKE_sequencer_active_get_pair(struct Scene *scene,
struct Sequence **seq_act, struct Sequence **seq_other);
int BKE_sequencer_active_get_pair(struct Scene *scene, struct Sequence **seq_act,
struct Sequence **seq_other);
void BKE_sequencer_active_set(struct Scene *scene, struct Sequence *seq);
struct Mask *BKE_sequencer_mask_get(struct Scene *scene);
@ -185,7 +180,7 @@ int seqbase_recursive_apply(struct ListBase *seqbase, int (*apply_func)(struct S
int seq_recursive_apply(struct Sequence *seq, int (*apply_func)(struct Sequence *, void *), void *arg);
/* maintenance functions, mostly for RNA */
// extern
/* extern */
void seq_free_sequence(struct Scene *scene, struct Sequence *seq);
void seq_free_clipboard(void);
@ -196,18 +191,15 @@ void reload_sequence_new_file(struct Scene *scene, struct Sequence *seq, int loc
int evaluate_seq_frame(struct Scene *scene, int cfra);
struct StripElem *give_stripelem(struct Sequence *seq, int cfra);
// intern
/* intern */
void update_changed_seq_and_deps(struct Scene *scene, struct Sequence *changed_seq, int len_change, int ibuf_change);
int input_have_to_preprocess(
SeqRenderData context, struct Sequence *seq, float cfra);
int input_have_to_preprocess(SeqRenderData context, struct Sequence *seq, float cfra);
struct SeqIndexBuildContext *seq_proxy_rebuild_context(struct Main *bmain, struct Scene *scene, struct Sequence *seq);
void seq_proxy_rebuild(struct SeqIndexBuildContext *context,
short *stop, short *do_update, float *progress);
void seq_proxy_rebuild(struct SeqIndexBuildContext *context, short *stop, short *do_update, float *progress);
void seq_proxy_rebuild_finish(struct SeqIndexBuildContext *context, short stop);
/* **********************************************************************
* seqcache.c
*
@ -225,16 +217,14 @@ void seq_stripelem_cache_destruct(void);
void seq_stripelem_cache_cleanup(void);
/* returned ImBuf is properly refed and has to be freed */
struct ImBuf *seq_stripelem_cache_get(SeqRenderData context, struct Sequence *seq,
float cfra, seq_stripelem_ibuf_t type);
struct ImBuf *seq_stripelem_cache_get(SeqRenderData context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type);
/* passed ImBuf is properly refed, so ownership is *not*
* transfered to the cache.
* you can pass the same ImBuf multiple times to the cache without problems.
*/
void seq_stripelem_cache_put(SeqRenderData context, struct Sequence *seq,
float cfra, seq_stripelem_ibuf_t type, struct ImBuf *nval);
void seq_stripelem_cache_put(SeqRenderData context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type, struct ImBuf *nval);
/* **********************************************************************
* seqeffects.c
@ -271,8 +261,7 @@ void seq_translate(struct Scene *scene, struct Sequence *seq, int delta);
void seq_sound_init(struct Scene *scene, struct Sequence *seq);
struct Sequence *seq_foreground_frame_get(struct Scene *scene, int frame);
struct ListBase *seq_seqbase(struct ListBase *seqbase, struct Sequence *seq);
struct Sequence *seq_metastrip(ListBase *seqbase /* = ed->seqbase */,
struct Sequence *meta /* = NULL */, struct Sequence *seq);
struct Sequence *seq_metastrip(ListBase *seqbase /* = ed->seqbase */, struct Sequence *meta /* = NULL */, struct Sequence *seq);
void seq_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs);
void seq_dupe_animdata(struct Scene *scene, const char *name_src, const char *name_dst);
@ -338,4 +327,4 @@ extern SequencerDrawView sequencer_view3d_cb;
extern ListBase seqbase_clipboard;
extern int seqbase_clipboard_frame;
#endif // __BKE_SEQUENCER_H__
#endif /* __BKE_SEQUENCER_H__ */

33
source/blender/blenkernel/intern/seqeffects.c
View File

@ -252,7 +252,7 @@ static void do_alphaover_effect_float(float facf0, float facf1, int x, int y, f
static ImBuf *do_alphaover_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0,
float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_alphaover_effect_float(
@ -415,7 +415,7 @@ static void do_alphaunder_effect_float(float facf0, float facf1, int x, int y,
static ImBuf *do_alphaunder_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
float facf0, float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_alphaunder_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@ -760,7 +760,7 @@ static void do_gammacross_effect_float(float facf0, float UNUSED(facf1), int x,
static ImBuf *do_gammacross_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
float facf0, float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
build_gammatabs();
@ -867,7 +867,7 @@ static void do_add_effect_float(float facf0, float facf1, int x, int y, float *r
static ImBuf *do_add_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_add_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@ -969,7 +969,7 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r
static ImBuf *do_sub_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_sub_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@ -1164,7 +1164,7 @@ static void do_mul_effect_float(float facf0, float facf1, int x, int y, float *r
static ImBuf *do_mul_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_mul_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@ -1198,7 +1198,7 @@ static void precalc_wipe_zone(WipeZone *wipezone, WipeVars *wipe, int xo, int yo
wipezone->pythangle = 1.0f / sqrtf(wipezone->angle * wipezone->angle + 1.0f);
}
// This function calculates the blur band for the wipe effects
/* This function calculates the blur band for the wipe effects */
static float in_band(float width, float dist, int side, int dir)
{
float alpha;
@ -1460,7 +1460,7 @@ static void init_wipe_effect(Sequence *seq)
if (seq->effectdata)
MEM_freeN(seq->effectdata);
seq->effectdata = MEM_callocN(sizeof(struct WipeVars), "wipevars");
seq->effectdata = MEM_callocN(sizeof(WipeVars), "wipevars");
}
static int num_inputs_wipe(void)
@ -1602,7 +1602,7 @@ static void do_wipe_effect_float(Sequence *seq, float facf0, float UNUSED(facf1)
static ImBuf *do_wipe_effect(SeqRenderData context, Sequence *seq, float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_wipe_effect_float(seq, facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@ -1625,7 +1625,7 @@ static void init_transform_effect(Sequence *seq)
if (seq->effectdata)
MEM_freeN(seq->effectdata);
seq->effectdata = MEM_callocN(sizeof(struct TransformVars), "transformvars");
seq->effectdata = MEM_callocN(sizeof(TransformVars), "transformvars");
transform = (TransformVars *) seq->effectdata;
@ -1742,7 +1742,7 @@ static void do_transform(Scene *scene, Sequence *seq, float UNUSED(facf0), int x
static ImBuf *do_transform_effect(SeqRenderData context, Sequence *seq, float UNUSED(cfra), float facf0,
float UNUSED(facf1), ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
do_transform(context.scene, seq, facf0, context.rectx, context.recty, ibuf1, out);
@ -2172,7 +2172,7 @@ static void init_glow_effect(Sequence *seq)
if (seq->effectdata)
MEM_freeN(seq->effectdata);
seq->effectdata = MEM_callocN(sizeof(struct GlowVars), "glowvars");
seq->effectdata = MEM_callocN(sizeof(GlowVars), "glowvars");
glow = (GlowVars *)seq->effectdata;
glow->fMini = 0.25;
@ -2230,7 +2230,7 @@ static void do_glow_effect_float(Sequence *seq, int render_size, float facf0, fl
static ImBuf *do_glow_effect(SeqRenderData context, Sequence *seq, float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
int render_size = 100 * context.rectx / context.scene->r.xsch;
@ -2255,7 +2255,7 @@ static void init_solid_color(Sequence *seq)
if (seq->effectdata)
MEM_freeN(seq->effectdata);
seq->effectdata = MEM_callocN(sizeof(struct SolidColorVars), "solidcolor");
seq->effectdata = MEM_callocN(sizeof(SolidColorVars), "solidcolor");
cv = (SolidColorVars *)seq->effectdata;
cv->col[0] = cv->col[1] = cv->col[2] = 0.5;
@ -2372,7 +2372,7 @@ static int num_inputs_multicam(void)
return 0;
}
static int early_out_multicam(struct Sequence *UNUSED(seq), float UNUSED(facf0), float UNUSED(facf1))
static int early_out_multicam(Sequence *UNUSED(seq), float UNUSED(facf0), float UNUSED(facf1))
{
return -1;
}
@ -2494,7 +2494,7 @@ static void init_speed_effect(Sequence *seq)
if (seq->effectdata)
MEM_freeN(seq->effectdata);
seq->effectdata = MEM_callocN(sizeof(struct SpeedControlVars), "speedcontrolvars");
seq->effectdata = MEM_callocN(sizeof(SpeedControlVars), "speedcontrolvars");
v = (SpeedControlVars *)seq->effectdata;
v->globalSpeed = 1.0;
@ -2863,7 +2863,6 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
return rval;
}
struct SeqEffectHandle get_sequence_effect(Sequence *seq)
{
struct SeqEffectHandle rval = {NULL};

13
source/blender/blenkernel/intern/sequencer.c
View File

@ -84,7 +84,6 @@ static ImBuf *seq_render_strip_stack(SeqRenderData context, ListBase *seqbasep,
static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra);
static void seq_free_animdata(Scene *scene, Sequence *seq);
/* **** XXX ******** */
#define SELECT 1
ListBase seqbase_clipboard;
@ -560,7 +559,7 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
case SEQ_TYPE_IMAGE:
{
/* Hack? */
size_t olen = MEM_allocN_len(seq->strip->stripdata) / sizeof(struct StripElem);
size_t olen = MEM_allocN_len(seq->strip->stripdata) / sizeof(StripElem);
seq->len = olen;
seq->len -= seq->anim_startofs;
@ -740,7 +739,7 @@ static int seqbase_unique_name_recursive_cb(Sequence *seq, void *arg_pt)
return 1;
}
void seqbase_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq)
void seqbase_unique_name_recursive(ListBase *seqbasep, Sequence *seq)
{
SeqUniqueInfo sui;
char *dot;
@ -1245,7 +1244,7 @@ static void seq_proxy_build_frame(SeqRenderData context, Sequence *seq, int cfra
IMB_freeImBuf(ibuf);
}
struct SeqIndexBuildContext *seq_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq)
SeqIndexBuildContext *seq_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq)
{
SeqIndexBuildContext *context;
Sequence *nseq;
@ -3262,7 +3261,7 @@ static void seq_update_sound_recursive(Scene *scene, ListBase *seqbasep, bSound
}
}
void seq_update_sound(struct Scene *scene, struct bSound *sound)
void seq_update_sound(Scene *scene, bSound *sound)
{
if (scene->ed) {
seq_update_sound_recursive(scene, &scene->ed->seqbase, sound);
@ -3732,7 +3731,7 @@ Sequence *sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo
return seq;
}
static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence *seq, int dupe_flag)
static Sequence *seq_dupli(Scene *scene, Scene *scene_to, Sequence *seq, int dupe_flag)
{
Scene *sce_audio = scene_to ? scene_to : scene;
Sequence *seqn = MEM_dupallocN(seq);
@ -3816,7 +3815,7 @@ static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence
return seqn;
}
Sequence *seq_dupli_recursive(struct Scene *scene, struct Scene *scene_to, Sequence *seq, int dupe_flag)
Sequence *seq_dupli_recursive(Scene *scene, Scene *scene_to, Sequence *seq, int dupe_flag)
{
Sequence *seqn = seq_dupli(scene, scene_to, seq, dupe_flag);
if (seq->type == SEQ_TYPE_META) {