[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45267] trunk/blender/source/blender: style cleanup: sequencer
Campbell Barton
ideasman42 at gmail.com
Fri Mar 30 00:26:21 CEST 2012
Revision: 45267
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45267
Author: campbellbarton
Date: 2012-03-29 22:26:11 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
style cleanup: sequencer
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_buttons.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-03-29 20:58:25 UTC (rev 45266)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-03-29 22:26:11 UTC (rev 45267)
@@ -79,11 +79,11 @@
# include "AUD_C-API.h"
#endif
-static ImBuf* seq_render_strip_stack(
- SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown);
+static ImBuf *seq_render_strip_stack(
+ SeqRenderData context, ListBase *seqbasep, float cfra, int chanshown);
-static ImBuf * seq_render_strip(
- SeqRenderData context, Sequence * seq, float cfra);
+static ImBuf *seq_render_strip(
+ SeqRenderData context, Sequence *seq, float cfra);
static void seq_free_animdata(Scene *scene, Sequence *seq);
@@ -92,29 +92,29 @@
#define SELECT 1
ListBase seqbase_clipboard;
int seqbase_clipboard_frame;
-SequencerDrawView sequencer_view3d_cb= NULL; /* NULL in background mode */
+SequencerDrawView sequencer_view3d_cb = NULL; /* NULL in background mode */
void printf_strip(Sequence *seq)
{
fprintf(stderr, "name: '%s', len:%d, start:%d, (startofs:%d, endofs:%d), (startstill:%d, endstill:%d), machine:%d, (startdisp:%d, enddisp:%d)\n",
- seq->name, seq->len, seq->start, seq->startofs, seq->endofs, seq->startstill, seq->endstill, seq->machine, seq->startdisp, seq->enddisp);
+ seq->name, seq->len, seq->start, seq->startofs, seq->endofs, seq->startstill, seq->endstill, seq->machine, seq->startdisp, seq->enddisp);
fprintf(stderr, "\tseq_tx_set_final_left: %d %d\n\n", seq_tx_get_final_left(seq, 0), seq_tx_get_final_right(seq, 0));
}
int seqbase_recursive_apply(ListBase *seqbase, int (*apply_func)(Sequence *seq, void *), void *arg)
{
Sequence *iseq;
- for (iseq= seqbase->first; iseq; iseq= iseq->next) {
+ for (iseq = seqbase->first; iseq; iseq = iseq->next) {
if (seq_recursive_apply(iseq, apply_func, arg) == -1)
- return -1; /* bail out */
+ return -1; /* bail out */
}
return 1;
}
int seq_recursive_apply(Sequence *seq, int (*apply_func)(Sequence *, void *), void *arg)
{
- int ret= apply_func(seq, arg);
+ int ret = apply_func(seq, arg);
if (ret == -1)
return -1; /* bail out */
@@ -142,8 +142,8 @@
void seq_free_strip(Strip *strip)
{
strip->us--;
- if (strip->us>0) return;
- if (strip->us<0) {
+ if (strip->us > 0) return;
+ if (strip->us < 0) {
printf("error: negative users in strip\n");
return;
}
@@ -192,8 +192,8 @@
if (scene) {
Editing *ed = scene->ed;
- if (ed->act_seq==seq)
- ed->act_seq= NULL;
+ if (ed->act_seq == seq)
+ ed->act_seq = NULL;
if (seq->scene_sound && ELEM(seq->type, SEQ_SOUND, SEQ_SCENE))
sound_remove_scene_sound(scene, seq->scene_sound);
@@ -208,7 +208,7 @@
{
Sequence *iseq;
- for (iseq= seq->seqbase.first; iseq; iseq= iseq->next) {
+ for (iseq = seq->seqbase.first; iseq; iseq = iseq->next) {
seq_free_sequence_recurse(scene, iseq);
}
@@ -221,8 +221,8 @@
if (scene->ed == NULL && alloc) {
Editing *ed;
- ed= scene->ed= MEM_callocN( sizeof(Editing), "addseq");
- ed->seqbasep= &ed->seqbase;
+ ed = scene->ed = MEM_callocN(sizeof(Editing), "addseq");
+ ed->seqbasep = &ed->seqbase;
}
return scene->ed;
}
@@ -231,8 +231,8 @@
{
Sequence *seq, *nseq;
- for (seq= seq_parent->seqbase.first; seq; seq= nseq) {
- nseq= seq->next;
+ for (seq = seq_parent->seqbase.first; seq; seq = nseq) {
+ nseq = seq->next;
seq_free_clipboard_recursive(seq);
}
@@ -243,11 +243,11 @@
{
Sequence *seq, *nseq;
- for (seq= seqbase_clipboard.first; seq; seq= nseq) {
- nseq= seq->next;
+ for (seq = seqbase_clipboard.first; seq; seq = nseq) {
+ nseq = seq->next;
seq_free_clipboard_recursive(seq);
}
- seqbase_clipboard.first= seqbase_clipboard.last= NULL;
+ seqbase_clipboard.first = seqbase_clipboard.last = NULL;
}
void seq_free_editing(Scene *scene)
@@ -256,15 +256,16 @@
MetaStack *ms;
Sequence *seq;
- if (ed==NULL)
+ if (ed == NULL)
return;
- SEQ_BEGIN(ed, seq) {
+ SEQ_BEGIN(ed, seq)
+ {
seq_free_sequence(scene, seq);
}
SEQ_END
- while ((ms= ed->metastack.first)) {
+ while ((ms = ed->metastack.first)) {
BLI_remlink(&ed->metastack, ms);
MEM_freeN(ms);
}
@@ -277,8 +278,8 @@
* ********************************************************************** */
SeqRenderData seq_new_render_data(
- struct Main * bmain, struct Scene * scene,
- int rectx, int recty, int preview_render_size)
+ struct Main *bmain, struct Scene *scene,
+ int rectx, int recty, int preview_render_size)
{
SeqRenderData rval;
@@ -293,7 +294,7 @@
return rval;
}
-int seq_cmp_render_data(const SeqRenderData * a, const SeqRenderData * b)
+int seq_cmp_render_data(const SeqRenderData *a, const SeqRenderData *b)
{
if (a->preview_render_size < b->preview_render_size) {
return -1;
@@ -347,7 +348,7 @@
return 0;
}
-unsigned int seq_hash_render_data(const SeqRenderData * a)
+unsigned int seq_hash_render_data(const SeqRenderData *a)
{
unsigned int rval = a->rectx + a->recty;
@@ -371,7 +372,7 @@
{
Sequence *seq;
- for (seq=seqbase->first; seq; seq=seq->next) {
+ for (seq = seqbase->first; seq; seq = seq->next) {
(*tot)++;
if (seq->seqbase.first)
@@ -383,13 +384,13 @@
{
Sequence *seq;
- for (seq=seqbase->first; seq; seq=seq->next) {
- seq->depth= depth;
+ for (seq = seqbase->first; seq; seq = seq->next) {
+ seq->depth = depth;
if (seq->seqbase.first)
- seq_build_array(&seq->seqbase, array, depth+1);
+ seq_build_array(&seq->seqbase, array, depth + 1);
- **array= seq;
+ **array = seq;
(*array)++;
}
}
@@ -398,8 +399,8 @@
{
Sequence **array;
- *seqarray= NULL;
- *tot= 0;
+ *seqarray = NULL;
+ *tot = 0;
if (ed == NULL)
return;
@@ -412,7 +413,7 @@
if (*tot == 0)
return;
- *seqarray= array= MEM_mallocN(sizeof(Sequence *)*(*tot), "SeqArray");
+ *seqarray = array = MEM_mallocN(sizeof(Sequence *) * (*tot), "SeqArray");
if (use_pointer)
seq_build_array(ed->seqbasep, &array, 0);
else
@@ -425,18 +426,18 @@
seq_array(ed, &iter->array, &iter->tot, use_pointer);
if (iter->tot) {
- iter->cur= 0;
- iter->seq= iter->array[iter->cur];
- iter->valid= 1;
+ iter->cur = 0;
+ iter->seq = iter->array[iter->cur];
+ iter->valid = 1;
}
}
void seq_next(SeqIterator *iter)
{
if (++iter->cur < iter->tot)
- iter->seq= iter->array[iter->cur];
+ iter->seq = iter->array[iter->cur];
else
- iter->valid= 0;
+ iter->valid = 0;
}
void seq_end(SeqIterator *iter)
@@ -444,7 +445,7 @@
if (iter->array)
MEM_freeN(iter->array);
- iter->valid= 0;
+ iter->valid = 0;
}
/*
@@ -457,11 +458,11 @@
*/
static void do_seq_count_cb(ListBase *seqbase, int *totseq,
- int (*test_func)(Sequence * seq))
+ int (*test_func)(Sequence *seq))
{
Sequence *seq;
- seq= seqbase->first;
+ seq = seqbase->first;
while (seq) {
int test = test_func(seq);
if (test & BUILD_SEQAR_COUNT_CURRENT) {
@@ -470,48 +471,48 @@
if (seq->seqbase.first && (test & BUILD_SEQAR_COUNT_CHILDREN)) {
do_seq_count_cb(&seq->seqbase, totseq, test_func);
}
- seq= seq->next;
+ seq = seq->next;
}
}
static void do_build_seqar_cb(ListBase *seqbase, Sequence ***seqar, int depth,
- int (*test_func)(Sequence * seq))
+ int (*test_func)(Sequence *seq))
{
Sequence *seq;
- seq= seqbase->first;
+ seq = seqbase->first;
while (seq) {
int test = test_func(seq);
- seq->depth= depth;
+ seq->depth = depth;
if (seq->seqbase.first && (test & BUILD_SEQAR_COUNT_CHILDREN)) {
- do_build_seqar_cb(&seq->seqbase, seqar, depth+1, test_func);
+ do_build_seqar_cb(&seq->seqbase, seqar, depth + 1, test_func);
}
if (test & BUILD_SEQAR_COUNT_CURRENT) {
- **seqar= seq;
+ **seqar = seq;
(*seqar)++;
}
- seq= seq->next;
+ seq = seq->next;
}
}
void build_seqar_cb(ListBase *seqbase, Sequence ***seqar, int *totseq,
- int (*test_func)(Sequence * seq))
+ int (*test_func)(Sequence *seq))
{
Sequence **tseqar;
- *totseq= 0;
+ *totseq = 0;
do_seq_count_cb(seqbase, totseq, test_func);
- if (*totseq==0) {
- *seqar= NULL;
+ if (*totseq == 0) {
+ *seqar = NULL;
return;
}
- *seqar= MEM_mallocN(sizeof(void *)* *totseq, "seqar");
- tseqar= *seqar;
+ *seqar = MEM_mallocN(sizeof(void *) * *totseq, "seqar");
+ tseqar = *seqar;
do_build_seqar_cb(seqbase, seqar, 0, test_func);
- *seqar= tseqar;
+ *seqar = tseqar;
}
@@ -521,7 +522,7 @@
/* for sound we go over full meta tree to update bounds of the sound strips,
* since sound is played outside of evaluating the imbufs, */
- for (seq=metaseq->seqbase.first; seq; seq=seq->next) {
+ for (seq = metaseq->seqbase.first; seq; seq = seq->next) {
if (seq->type == SEQ_META) {
seq_update_sound_bounds_recursive(scene, seq);
}
@@ -534,7 +535,7 @@
if (seq->start + seq->len - seq->endofs > metaseq->start + metaseq->len - metaseq->endofs)
endofs = seq->start + seq->len - metaseq->start - metaseq->len + metaseq->endofs;
- sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs, seq->start+seq->len - endofs, startofs);
+ sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs, seq->start + seq->len - endofs, startofs);
}
}
}
@@ -542,18 +543,18 @@
void calc_sequence_disp(Scene *scene, Sequence *seq)
{
- if (seq->startofs && seq->startstill) seq->startstill= 0;
- if (seq->endofs && seq->endstill) seq->endstill= 0;
+ if (seq->startofs && seq->startstill) seq->startstill = 0;
+ if (seq->endofs && seq->endstill) seq->endstill = 0;
- seq->startdisp= seq->start + seq->startofs - seq->startstill;
- seq->enddisp= seq->start+seq->len - seq->endofs + seq->endstill;
+ seq->startdisp = seq->start + seq->startofs - seq->startstill;
+ seq->enddisp = seq->start + seq->len - seq->endofs + seq->endstill;
- seq->handsize= 10.0; /* 10 frames */
- if ( seq->enddisp-seq->startdisp < 10 ) {
- seq->handsize= (float)(0.5*(seq->enddisp-seq->startdisp));
+ seq->handsize = 10.0; /* 10 frames */
+ if (seq->enddisp - seq->startdisp < 10) {
+ seq->handsize = (float)(0.5 * (seq->enddisp - seq->startdisp));
}
- else if (seq->enddisp-seq->startdisp > 250) {
- seq->handsize= (float)((seq->enddisp-seq->startdisp)/25);
+ else if (seq->enddisp - seq->startdisp > 250) {
+ seq->handsize = (float)((seq->enddisp - seq->startdisp) / 25);
}
if (ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
@@ -569,18 +570,18 @@
int min, max;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list