diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
| commit | 3f3c6f5f1fb336f8f0015d7857a1ae153fa2a80f (patch) | |
| tree | 27e2ae66dd589013c24592fe0803b440a7e014be /source/blender/blenkernel/intern/sound.c | |
| parent | 887fd19894047832fbb7a7300e5fc11438b1f3b2 (diff) | |
| parent | ccd31900ab9659b6fdc035fd91bff9f508334e22 (diff) | |
Merging from trunk up to r38119.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index eb8703877ba..2e517b0a9af 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -537,8 +537,9 @@ int sound_scene_playing(struct Scene *scene) int sound_read_sound_buffer(struct bSound* sound, float* buffer, int length, float start, float end) { AUD_Sound* limiter = AUD_limitSound(sound->cache, start, end); - return AUD_readSound(limiter, buffer, length); + int ret= AUD_readSound(limiter, buffer, length); AUD_unload(limiter); + return ret; } int sound_get_channels(struct bSound* sound) |