From de85d6cdbf1394f6d2ef639e3d9ad9792c0bcc30 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 12 Feb 2015 03:29:10 +1100 Subject: cleanup: rename enum type to blender convention --- source/blender/blenkernel/BKE_sequencer.h | 10 +++++----- source/blender/blenkernel/intern/seqcache.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 6b9c4faa3d2..7a47d7cecc1 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -253,25 +253,25 @@ typedef enum { SEQ_STRIPELEM_IBUF_COMP, SEQ_STRIPELEM_IBUF_STARTSTILL, SEQ_STRIPELEM_IBUF_ENDSTILL -} seq_stripelem_ibuf_t; +} eSeqStripElemIBuf; void BKE_sequencer_cache_destruct(void); void BKE_sequencer_cache_cleanup(void); /* returned ImBuf is properly refed and has to be freed */ -struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type); +struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context, struct Sequence *seq, float cfra, eSeqStripElemIBuf type); /* passed ImBuf is properly refed, so ownership is *not* * transferred to the cache. * you can pass the same ImBuf multiple times to the cache without problems. */ -void BKE_sequencer_cache_put(const SeqRenderData *context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type, struct ImBuf *nval); +void BKE_sequencer_cache_put(const SeqRenderData *context, struct Sequence *seq, float cfra, eSeqStripElemIBuf type, struct ImBuf *nval); void BKE_sequencer_cache_cleanup_sequence(struct Sequence *seq); -struct ImBuf *BKE_sequencer_preprocessed_cache_get(const SeqRenderData *context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type); -void BKE_sequencer_preprocessed_cache_put(const SeqRenderData *context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type, struct ImBuf *ibuf); +struct ImBuf *BKE_sequencer_preprocessed_cache_get(const SeqRenderData *context, struct Sequence *seq, float cfra, eSeqStripElemIBuf type); +void BKE_sequencer_preprocessed_cache_put(const SeqRenderData *context, struct Sequence *seq, float cfra, eSeqStripElemIBuf type, struct ImBuf *ibuf); void BKE_sequencer_preprocessed_cache_cleanup(void); void BKE_sequencer_preprocessed_cache_cleanup_sequence(struct Sequence *seq); diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index a1135bfc54b..41f17665065 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -46,7 +46,7 @@ typedef struct SeqCacheKey { struct Sequence *seq; SeqRenderData context; float cfra; - seq_stripelem_ibuf_t type; + eSeqStripElemIBuf type; } SeqCacheKey; typedef struct SeqPreprocessCacheElem { @@ -54,7 +54,7 @@ typedef struct SeqPreprocessCacheElem { struct Sequence *seq; SeqRenderData context; - seq_stripelem_ibuf_t type; + eSeqStripElemIBuf type; ImBuf *ibuf; } SeqPreprocessCacheElem; @@ -148,7 +148,7 @@ void BKE_sequencer_cache_cleanup_sequence(Sequence *seq) IMB_moviecache_cleanup(moviecache, seqcache_key_check_seq, seq); } -struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context, Sequence *seq, float cfra, seq_stripelem_ibuf_t type) +struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context, Sequence *seq, float cfra, eSeqStripElemIBuf type) { if (moviecache && seq) { SeqCacheKey key; @@ -164,7 +164,7 @@ struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context, Sequence *se return NULL; } -void BKE_sequencer_cache_put(const SeqRenderData *context, Sequence *seq, float cfra, seq_stripelem_ibuf_t type, ImBuf *i) +void BKE_sequencer_cache_put(const SeqRenderData *context, Sequence *seq, float cfra, eSeqStripElemIBuf type, ImBuf *i) { SeqCacheKey key; @@ -210,7 +210,7 @@ static void preprocessed_cache_destruct(void) preprocess_cache = NULL; } -ImBuf *BKE_sequencer_preprocessed_cache_get(const SeqRenderData *context, Sequence *seq, float cfra, seq_stripelem_ibuf_t type) +ImBuf *BKE_sequencer_preprocessed_cache_get(const SeqRenderData *context, Sequence *seq, float cfra, eSeqStripElemIBuf type) { SeqPreprocessCacheElem *elem; @@ -237,7 +237,7 @@ ImBuf *BKE_sequencer_preprocessed_cache_get(const SeqRenderData *context, Sequen return NULL; } -void BKE_sequencer_preprocessed_cache_put(const SeqRenderData *context, Sequence *seq, float cfra, seq_stripelem_ibuf_t type, ImBuf *ibuf) +void BKE_sequencer_preprocessed_cache_put(const SeqRenderData *context, Sequence *seq, float cfra, eSeqStripElemIBuf type, ImBuf *ibuf) { SeqPreprocessCacheElem *elem; -- cgit v1.2.3