added audio volume control

see (#41, #21)
VideoBleep · Dec 26, 2014 · 2f61fd3 · 2f61fd3
1 parent 907d9d1
commit 2f61fd3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/config/BleepoutParameters.cpp b/src/config/BleepoutParameters.cpp
@@ -21,7 +21,8 @@ BleepoutParameters::BleepoutParameters(BleepoutConfig& appConfig)
 , ballsToAdd(0)
 , enableSyphon(true)
 , syphonAppName(appConfig.syphonAppName())
-, syphonServerName(appConfig.syphonServerName()) {
+, syphonServerName(appConfig.syphonServerName())
+, audioVolume(.5) {
   for (const auto& round : _appConfig.roundConfigs()) {
     _queuedRoundNames.push_back(round->name());
   }

diff --git a/src/config/BleepoutParameters.h b/src/config/BleepoutParameters.h
@@ -44,6 +44,7 @@ class BleepoutParameters {
   bool enableSyphon;
   std::string syphonAppName;
   std::string syphonServerName;
+  float audioVolume;
 private:
   ofParameterGroup _params;
   BleepoutConfig& _appConfig;

diff --git a/src/core/AdminController.cpp b/src/core/AdminController.cpp
@@ -74,6 +74,7 @@ struct AdminUIControls {
   ofxUIButton* startRound;
   ofxUIButton* endRound;
   ofxUILabel* remainingTime;
+  ofxUISlider* audioVolume;
 
   ~AdminUIControls() {
     for (auto& slot : roundQueueSlots)
@@ -163,6 +164,7 @@ void AdminController::setup() {
   _controls->syphonAppName->setTriggerType(OFX_UI_TEXTINPUT_ON_UNFOCUS);
   _controls->syphonServerName = _gui->addTextInput("Syphon Server", _appParams.syphonServerName);
   _controls->syphonServerName->setTriggerType(OFX_UI_TEXTINPUT_ON_UNFOCUS);
+  _controls->audioVolume = _gui->addSlider("Audio Volume", 0, 1, &_appParams.audioVolume);
 
   ofAddListener(_gui->newGUIEvent, this,
                 &AdminController::onUIEvent);

diff --git a/src/core/AudioManager.cpp b/src/core/AudioManager.cpp
@@ -37,7 +37,17 @@ void AudioManager::setup() {
 }
 
 void AudioManager::update() {
-  //...
+  _roundStartedSound.setVolume(_appParams.audioVolume);
+  _roundEndedSound.setVolume(_appParams.audioVolume);
+  _brickDestroyedSound.setVolume(_appParams.audioVolume);
+  _collisionSound.setVolume(_appParams.audioVolume);
+  _modifierAppliedSound.setVolume(_appParams.audioVolume);
+  _modifierRemovedSound.setVolume(_appParams.audioVolume);
+  _ballDestroyedSound.setVolume(_appParams.audioVolume);
+  _brickDestroyedSound.setVolume(_appParams.audioVolume);
+  _playerLivesChangedSound.setVolume(_appParams.audioVolume);
+  _playerLostSound.setVolume(_appParams.audioVolume);
+  _countdownTimerTickSound.setVolume(_appParams.audioVolume);
 }
 
 void AudioManager::attachTo(BleepoutApp &app) {