diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-02 14:16:31 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-02 14:16:31 +0400 |
| commit | 96cc6818255a351c83858339704922a463749f22 (patch) | |
| tree | cd0dcb3a4899cadb81d30e68a87123e7822724ef | |
| parent | d31bfdc78f52c26c465c73579098544f6ce945aa (diff) | |
Fix for sound structures to work with makesdna.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 0fb69f8ab5c..2a9b31389b8 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4040,13 +4040,11 @@ static void lib_link_scene(FileData *fd, Main *main) SEQ_BEGIN(sce->ed, seq) { if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo); if(seq->scene) seq->scene= newlibadr(fd, sce->id.lib, seq->scene); + // AUD_XXX if(seq->sound) { - printf("old sound: %d\n", seq->sound); seq->sound= newlibadr(fd, sce->id.lib, seq->sound); - printf("new sound: %d\n", seq->sound); if (seq->sound) { seq->sound->id.us++; - seq->sound->flags |= SOUND_FLAGS_SEQUENCE; seq->sound_handle= sound_new_handle(sce, seq->sound, seq->startdisp, seq->enddisp, seq->startofs); } } @@ -4095,6 +4093,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) sce->theDag = NULL; sce->dagisvalid = 0; sce->obedit= NULL; + // AUD_XXX memset(&sce->sound_handles, 0, sizeof(sce->sound_handles)); /* set users to one by default, not in lib-link, this will increase it for compo nodes */ diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 158d70d62cc..89897d8c4a5 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -68,7 +68,7 @@ typedef struct bSample { typedef struct SoundHandle { struct SoundHandle *next, *prev; struct bSound *source; - void* handle; + void *handle; int state; int startframe; int endframe; @@ -76,6 +76,7 @@ typedef struct SoundHandle { int mute; int changed; float volume; + float pad; } SoundHandle; // AUD_XXX @@ -132,8 +133,8 @@ typedef struct bSound { // AUD_XXX NEW int type; int changed; - struct bSound* child_sound; - void* cache; + struct bSound *child_sound; + void *cache; // SOUND_TYPE_LIMITER float start, end; |