ofMultiSoundPlayer: added volume parameter listener

Author: roymacdonald

src/SoundObjects/VUMeter.cpp

@@ -260,7 +260,7 @@ ofColor& VUMeter::getPeakHoldColor(){
 }
 //--------------------------------------------------------------
 ofColor& VUMeter::getBorderColor(){
-	static std::unique_ptr<ofColor> i = std:: make_unique<ofColor>(70);
+	static std::unique_ptr<ofColor> i = std::make_unique<ofColor>(70);
 	return *i;
 }
 //--------------------------------------------------------------

src/ofxMultiSoundPlayer.cpp

@@ -21,6 +21,7 @@ ofxMultiSoundPlayer::ofxMultiSoundPlayer() {
 	setNumInstances(0);
 
 	volume.set("Volume", 1, 0, 1);
+    volListener = volume.newListener(this, &ofxMultiSoundPlayer::volumeChanged);
 }
 //--------------------------------------------------------------
 bool ofxMultiSoundPlayer::canPlayInstance(){
@@ -143,13 +144,13 @@ void ofxMultiSoundPlayer::audioOut(ofSoundBuffer& outputBuffer){
 //========================END RUNNING ON AUDIO THREAD===============================
 //========================SETTERS===============================
 void ofxMultiSoundPlayer::setVolume(float vol, int index){
-	if(index <= -1){
+//	if(index <= -1){
 		volume = vol;
-	}else{
+//	}else{
 		updateInstance([&](ofxSingleSoundPlayer* inst){
 			inst->volume = vol;
 		},index, "ofxMultiSoundPlayer::setVolume");
-	}
+//	}
 }
 //--------------------------------------------------------------
 void ofxMultiSoundPlayer::setPan(float _pan, int index){
@@ -426,3 +427,13 @@ size_t ofxMultiSoundPlayer::getNumFrames() const {
 	}
 	return 0;
 }
+
+
+void ofxMultiSoundPlayer::volumeChanged(float&){
+    if(bVolumeChangedByParameter)return;
+    bVolumeChangedByParameter = true;
+    setVolume(volume.get());
+    
+    bVolumeChangedByParameter = false;
+}
+

src/ofxMultiSoundPlayer.h

@@ -122,6 +122,9 @@ class ofxMultiSoundPlayer:  public ofxBaseSoundPlayer {
 	ofxSoundMixer _mixer;
 
 	ofEventListeners endEventListeners;
+    ofEventListener volListener;
+    void volumeChanged(float&);
+    bool bVolumeChangedByParameter = false;
 
 	void onInstanceEnd(size_t&);
 };