RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed macro

This commit is contained in:
Dave Schuyler 2004-09-03 01:23:06 +00:00
parent 17701818ff
commit 515bf13183
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/audiotraits/milesAudioSound.cxx
View File

@ -30,7 +30,7 @@ TypeHandle MilesAudioSound::_type_handle;
#define NEED_MILES_LENGTH_WORKAROUND
#if (((MSS_MAJOR_VERSION == 6) && (MSS_MINOR_VERSION >= 5)) || (MSS_MAJOR_VERSION >= 7))
#define MILES_6_5
#define MILES_6_5_OR_HIGHER
#endif
#ifndef NDEBUG //[
@ -360,7 +360,7 @@ set_volume(float volume) {
_volume=volume;
// Account for the category of sound:
volume*=_manager->get_volume();
#ifdef MILES_6_5
#ifdef MILES_6_5_OR_HIGHER
// Change to Miles volume, range 0 to 1.0:
F32 milesVolume=volume;
milesVolume=min(milesVolume,1.0f);
@ -375,7 +375,7 @@ set_volume(float volume) {
// ...it's a midi file.
// 0 delay, set to this volume immediately
#ifdef MILES_6_5
#ifdef MILES_6_5_OR_HIGHER
F32 midiVolDelay =0.0f;
#else
S32 midiVolDelay =0;
@ -385,7 +385,7 @@ set_volume(float volume) {
audio_debug(" volume for this midi is now "<<milesVolume);
} else {
// ...it's a wav or mp3.
#ifdef MILES_6_5
#ifdef MILES_6_5_OR_HIGHER
// Convert balance of -1.0..1.0 to 0-1.0:
F32 milesBalance=(F32)((_balance+1.0f)*0.5f);
#else