diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-08 16:55:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-08 16:55:31 +0300 |
| commit | ec7df03c867d28316708e9b91bec5cef0aee832e (patch) | |
| tree | 3f560939b745032e235d9ac789c4117d669d6462 /source/blender/blenkernel/intern/sound.c | |
| parent | 4c318539b2f6abdf8f2a02376b6fcb8d30a4b12e (diff) | |
Warning fixes, one actual bug found in sequencer sound wave drawing. Also
changed some malloc to MEM_mallocN while trying to track down a memory leak.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 7b451bd5a98..03fe1b8df7b 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -282,7 +282,7 @@ void sound_free(struct bSound* sound) static float sound_get_volume(Scene* scene, Sequence* sequence, float time) { - struct FCurve* fcu = id_data_find_fcurve(scene, sequence, &RNA_Sequence, "volume", 0); + struct FCurve* fcu = id_data_find_fcurve(&scene->id, sequence, &RNA_Sequence, "volume", 0); if(fcu) return evaluate_fcurve(fcu, time * FPS); else @@ -386,5 +386,5 @@ void sound_seek_scene(struct bContext *C) int sound_read_sound_buffer(bSound* sound, float* buffer, int length) { - AUD_readSound(sound->cache, buffer, length); + return AUD_readSound(sound->cache, buffer, length); } |