rename masterVolume to outputVolume (#610)

rename masterVolume to outputVolume and rename Master to Main

Author: therewasaguy

examples/Compressor/sketch.js

@@ -50,7 +50,7 @@ function setup() {
 
   compressor = new p5.Compressor();
 
-  // Disconnect soundfile from master output.
+  // Disconnect soundfile from main output.
   // Then, connect it to the filter, so that we only hear the filtered sound
   soundFile.disconnect();
   compressor.process(soundFile);

examples/FFT_frequency_spectrum/sketch.js

@@ -44,8 +44,7 @@ function setup() {
   p = createP(description);
   var p2 = createP('Draw the array returned by FFT.analyze( ). This represents the frequency spectrum, from lowest to highest frequencies.');
 
-  // set the master volume;
-  masterVolume(.5);
+  outputVolume(0.5);
 }
 
 function draw() {

examples/Filter_BandPass/sketch.js

@@ -19,7 +19,7 @@ function setup() {
 
   noise = new p5.Noise();
 
-  noise.disconnect(); // Disconnect soundfile from master output...
+  noise.disconnect(); // Disconnect soundfile from main output...
   filter.process(noise); // ...and connect to filter so we'll only hear BandPass.
   noise.start();
 
@@ -58,4 +58,4 @@ function draw() {
 function updateDescription() {
     description = 'Playing! Press any key to pause. Filter Frequency = ' + filterFreq + ' Filter Width = ' + filterWidth;
     p.html(description);
-}
+}

examples/Filter_LowPass/sketch.js

@@ -27,7 +27,7 @@ function setup() {
 
   filter = new p5.LowPass();
 
-  // Disconnect soundfile from master output.
+  // Disconnect soundFile from main output.
   // Then, connect it to the filter, so that we only hear the filtered sound
   soundFile.disconnect();
   soundFile.connect(filter);
@@ -68,4 +68,4 @@ function draw() {
 function updateDescription() {
     description = 'Filter Frequency = ' + filterFreq + ' Filter Res = ' + filterRes;
     p.html(description);
-}
+}

examples/Reverb_convolve/sketch.js

@@ -30,7 +30,7 @@ function preload() {
 }
 
 function setup() {
-  // disconnect from master output...
+  // disconnect from main output...
   sound.disconnect();
   // ... and process with cVerb so that we only hear the reverb
   cVerb.process(sound);
@@ -53,4 +53,4 @@ function mousePressed() {
 
   // display the current Impulse Response name (the filepath)
   p.html('Convolution Impulse Response: ' + cVerb.impulses[currentIR].name);
-}
+}

examples/Reverb_convolve_FFT/sketch.js

@@ -36,7 +36,7 @@ function setup() {
   createCanvas(710, 400);
   rawImpulse = loadSound('../files/' + cVerb.impulses[currentIR].name);
 
-  // disconnect from master output...
+  // disconnect from main output...
   sound.disconnect();
   // ... and process with cVerb 
   // so that we only hear the reverb
@@ -84,4 +84,4 @@ function mousePressed() {
 
 function keyPressed() {
   rawImpulse.play();
-}
+}

examples/amplitude_analysis/sketch.js

@@ -79,10 +79,10 @@ function keyPressed(e) {
 
 function mouseClicked() {
   if (mouseX > 0 && mouseX < width && mouseY > 0 && mouseY < height) {
-    if ( getMasterVolume() == 0) {
-      masterVolume(0, 1);
+    if ( getOutputVolume() == 0) {
+      outputVolume(0, 1);
     } else {
-      masterVolume(0.1),1;
+      outputVolume(0.1),1;
     }
   }
 }

examples/distortion/sketch.js

@@ -17,7 +17,7 @@ function setup() {
   env.setADSR(0.01, 0.2, 0.1, 0.3);
   env.setRange(1.0, 0.0);
 
-  osc = new p5.SawOsc(); // connects to master output by default
+  osc = new p5.SawOsc(); // connects to main output by default
   osc.start(0);
   osc.freq(220);
   osc.amp(env);

examples/envAmpFreq/sketch.js

@@ -16,7 +16,7 @@ function setup() {
   freqEnv.setRange(300, 5000);
 
 
-  osc = new p5.Oscillator(); // connects to master output by default
+  osc = new p5.Oscillator(); // connects to main output by default
   osc.start(0);
   osc.freq(220);
   // osc.freq(env.scale(0,1,800,300));
@@ -32,4 +32,4 @@ function mousePressed() {
 function mouseReleased() {
   env.triggerRelease();
   freqEnv.triggerRelease();
-}
+}

examples/envExp/sketch.js

@@ -47,7 +47,7 @@ function setup() {
   myPart.start();
   fft = new p5.FFT();
   fft.setInput(osc);
-  masterVolume(0);
+  outputVolume(0);
   endPoint = width / numWaveforms;
   noStroke();
   background(20);