Revision: 22137
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22137
Author: nexyon
Date: 2009-08-02 12:16:31 +0200 (Sun, 02 Aug 2009)
Log Message:
-----------
Fix for sound structures to work with makesdna.
Modified Paths:
--------------
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
Modified: branches/soundsystem/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soundsystem/source/blender/blenloader/intern/readfile.c
2009-08-02 07:55:42 UTC (rev 22136)
+++ branches/soundsystem/source/blender/blenloader/intern/readfile.c
2009-08-02 10:16:31 UTC (rev 22137)
@@ -4040,13 +4040,11 @@
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 @@
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 */
Modified: branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
===================================================================
--- branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
2009-08-02 07:55:42 UTC (rev 22136)
+++ branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
2009-08-02 10:16:31 UTC (rev 22137)
@@ -68,7 +68,7 @@
typedef struct SoundHandle {
struct SoundHandle *next, *prev;
struct bSound *source;
- void* handle;
+ void *handle;
int state;
int startframe;
int endframe;
@@ -76,6 +76,7 @@
int mute;
int changed;
float volume;
+ float pad;
} SoundHandle;
// AUD_XXX
@@ -132,8 +133,8 @@
// 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
