diff options
author | Peter Schlaile <peter@schlaile.de> | 2007-11-18 20:39:30 +0300 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2007-11-18 20:39:30 +0300 |
commit | dc6ac56d318ad9f2952a1d91dba13f1bd723768a (patch) | |
tree | 9ac90aea3a0bacea065a4922ce106f1252120971 /source/blender/python/api2_2x | |
parent | 6d5396fc65fe81f0d999d12df6b64156358b1e60 (diff) |
General cleanup in sequencer:
- Seperated StripData into
StripData
TStripData
where StripData holds only image-filenames and TStripData holds
the working information needed for ImBuf caching.
=> Large drop in memory usage, if you used a lot of movie and meta strips.
=> Fixed bugs in "duplicate" on the way (imbufs where copied around without
taking reference counting seriously...)
=> Code is much cleaner now
- Added defines for TStripData->ok
Finally figured out, what the magic values ment and named them properly :)
- Got rid of Sequence->curelem.
Reason: very bad idea(tm) for multi threading with more than one render
thread. Still not there, but this was a real show stopper on the way.
Diffstat (limited to 'source/blender/python/api2_2x')
-rw-r--r-- | source/blender/python/api2_2x/sceneSequence.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/python/api2_2x/sceneSequence.c b/source/blender/python/api2_2x/sceneSequence.c index 6ddaaf345c3..fee1bde149c 100644 --- a/source/blender/python/api2_2x/sceneSequence.c +++ b/source/blender/python/api2_2x/sceneSequence.c @@ -156,7 +156,6 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce) for(a=0; a<seq->len; a++) { name = PyString_AsString(PyList_GetItem( list, a )); strncpy(se->name, name, FILE_MAXFILE-1); - se->ok= 1; se++; } @@ -179,16 +178,10 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce) strip->len= totframe; strip->us= 1; strncpy(strip->dir, sound->name, FILE_MAXDIR-1); - strip->stripdata= se= MEM_callocN(totframe*sizeof(StripElem), "stripelem"); + strip->stripdata= se= MEM_callocN(sizeof(StripElem), "stripelem"); /* name sound in first strip */ strncpy(se->name, sound->name, FILE_MAXFILE-1); - - for(a=1; a<=totframe; a++, se++) { - se->ok= 2; /* why? */ - se->ibuf= 0; - se->nr= a; - } } else if (BPy_Scene_Check(py_data)) { /* scene */ @@ -205,8 +198,6 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce) sizeof(seq->name) - 2); strip->len= seq->len; strip->us= 1; - if(seq->len>0) strip->stripdata= MEM_callocN(seq->len*sizeof(StripElem), "stripelem"); - } else { /* movie, pydata is a path to a movie file */ char *name = PyString_AsString ( py_data ); |