From 515bf13183abce5f0cee8187f54587e32b60918c Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Fri, 3 Sep 2004 01:23:06 +0000 Subject: [PATCH] changed macro --- panda/src/audiotraits/milesAudioSound.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/audiotraits/milesAudioSound.cxx b/panda/src/audiotraits/milesAudioSound.cxx index bb27888a3c..bd74cd3867 100644 --- a/panda/src/audiotraits/milesAudioSound.cxx +++ b/panda/src/audiotraits/milesAudioSound.cxx @@ -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 "<