diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
commit | 874c29cea8e6f9bc411fccf2d6f4cb07e94328d0 (patch) | |
tree | 5971e577cf7c02e05a1e37b5ad058c71a6744877 /intern/SoundSystem/SoundDefines.h | |
parent | 7555bfa793a2b0fc187c6211c56986f35b2d7b09 (diff) | |
parent | c5bc4e4fb1a33eda8c31f2ea02e91f32f74c8fa5 (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
Diffstat (limited to 'intern/SoundSystem/SoundDefines.h')
-rw-r--r-- | intern/SoundSystem/SoundDefines.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/intern/SoundSystem/SoundDefines.h b/intern/SoundSystem/SoundDefines.h index 450fde187b5..5238507c866 100644 --- a/intern/SoundSystem/SoundDefines.h +++ b/intern/SoundSystem/SoundDefines.h @@ -38,7 +38,6 @@ enum { snd_e_dummydevice = 0, - snd_e_fmoddevice, snd_e_openaldevice }; @@ -49,15 +48,6 @@ enum /* openal related stuff */ #define AL_LOOPING 0x1007 -/* fmod related stuff */ -#ifdef WIN32 -#define MIXRATE 22050 -#else -#define MIXRATE 44100 -#endif -#define NUM_FMOD_MIN_HW_CHANNELS 16 -#define NUM_FMOD_MAX_HW_CHANNELS 16 - /* activelist defines */ enum { |