diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-26 15:54:10 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-26 15:54:10 +0400 |
| commit | 8a520165016f399002b03ec096be878a18aa3302 (patch) | |
| tree | 7bfbfcf0693023854c9d932916f433ed9feebe6b /source/blender/src/editsound.c | |
| parent | f64c5cacf707d7a1ef36b45ea4f5569a732802f6 (diff) | |
Let the game engine manage it's own sound scene. This is to fix bug 1415 (Patch from Peter den Bak)
http://projects.blender.org/tracker/index.php?func=detail&aid=1415&group_id=9&atid=125
Also release the OpenAL device & context. These were leaked before, and would cause an assertion.
Diffstat (limited to 'source/blender/src/editsound.c')
| -rw-r--r-- | source/blender/src/editsound.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c index b9695881068..b409804a9f8 100644 --- a/source/blender/src/editsound.c +++ b/source/blender/src/editsound.c @@ -514,7 +514,7 @@ int sound_get_filetype_from_header(bSound* sound, PackedFile* pf) { filetype = SAMPLE_OGG_VORBIS; } - else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2))) + else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "", 2))) { filetype = SAMPLE_MP3; } @@ -1015,9 +1015,6 @@ void sound_init_audio(void) SYS_SystemHandle hSystem = NULL; if(ghSoundScene==NULL) { - - printf("sound init audio\n"); - hSystem = SYS_GetSystem(); noaudio = SYS_GetCommandLineInt(hSystem,"noaudio",0); @@ -1043,5 +1040,6 @@ void sound_exit_audio(void) if(ghSoundScene) { SND_DeleteScene(ghSoundScene); SND_ReleaseDevice(); + ghSoundScene = NULL; } } |