diff --git a/eve/src/main.cpp b/eve/src/main.cpp index 4f056174e1..52f307c18f 100644 --- a/eve/src/main.cpp +++ b/eve/src/main.cpp @@ -35,6 +35,7 @@ const int HAND_TIMER_SLEEP_ITERATIONS = 50; const float EVE_PELVIS_HEIGHT = 0.565925f; const float AUDIO_INJECT_PROXIMITY = 0.4f; +const int EVE_VOLUME_BYTE = 190; bool stopReceiveAgentDataThread; @@ -116,7 +117,7 @@ int main(int argc, const char* argv[]) { AudioInjector eveAudioInjector("/etc/highfidelity/eve/resources/eve.raw"); // lower Eve's volume by setting the attentuation modifier (this is a value out of 255) - eveAudioInjector.setVolume(190); + eveAudioInjector.setVolume(EVE_VOLUME_BYTE); // set the position of the audio injector eveAudioInjector.setPosition(eve.getPosition()); diff --git a/injector/src/main.cpp b/injector/src/main.cpp index 9d2fa76c39..df751f50a1 100644 --- a/injector/src/main.cpp +++ b/injector/src/main.cpp @@ -23,6 +23,8 @@ char EC2_WEST_AUDIO_SERVER[] = "54.241.92.53"; const int AUDIO_UDP_LISTEN_PORT = 55443; +const int DEFAULT_INJECTOR_VOLUME = 0xFF; + // Command line parameter defaults bool loopAudio = true; float sleepIntervalMin = 1.00; @@ -30,7 +32,7 @@ float sleepIntervalMax = 2.00; char *sourceAudioFile = NULL; const char *allowedParameters = ":rb::t::c::a::f:"; float floatArguments[4] = {0.0f, 0.0f, 0.0f, 0.0f}; -unsigned char volume = 255; +unsigned char volume = DEFAULT_INJECTOR_VOLUME; void usage(void) { diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index fa05570d40..a5a696f927 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -15,10 +15,12 @@ #include "AudioInjector.h" +const int MAX_INJECTOR_VOLUME = 255; + AudioInjector::AudioInjector(const char* filename) : _position(), _bearing(0), - _volume(0xFF), + _volume(MAX_INJECTOR_VOLUME), _indexOfNextSlot(0), _isInjectingAudio(false) { @@ -45,7 +47,7 @@ AudioInjector::AudioInjector(int maxNumSamples) : _numTotalSamples(maxNumSamples), _position(), _bearing(0), - _volume(0xFF), + _volume(MAX_INJECTOR_VOLUME), _indexOfNextSlot(0), _isInjectingAudio(false) {