Merge pull request #17 from GuitarML/feature-model-level-adjust

Added optional level_adjust param to models for adjusting overall volume of model

plugins/SmartAmp/SmartAmp.jucer

@@ -8,9 +8,9 @@
       <FILE id="h9gaSb" name="amp_clean.png" compile="0" resource="1" file="../../resources/amp_clean.png"/>
       <FILE id="R8YnqS" name="amp_lead.png" compile="0" resource="1" file="../../resources/amp_lead.png"/>
       <FILE id="u62tqr" name="amp_off.png" compile="0" resource="1" file="../../resources/amp_off.png"/>
-      <FILE id="Qawvu2" name="bluej_clean_p0088.json" compile="0" resource="1"
+      <FILE id="XoWq0R" name="bluej_clean_p0088.json" compile="0" resource="1"
             file="../../models/bluej_clean_p0088.json"/>
-      <FILE id="duZ4fD" name="bluej_fullD_p0153.json" compile="0" resource="1"
+      <FILE id="ov9ufS" name="bluej_fullD_p0153.json" compile="0" resource="1"
             file="../../models/bluej_fullD_p0153.json"/>
       <FILE id="jmOgHo" name="knob_silver.png" compile="0" resource="1" file="../../resources/knob_silver.png"/>
       <FILE id="Kaw2lp" name="led_blue_off.png" compile="0" resource="1"

plugins/SmartAmp/Source/PluginProcessor.cpp

@@ -163,8 +163,9 @@ void WaveNetVaAudioProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuff
         //    Master Volume 
         buffer.applyGain(ampMaster);
 
-        if (amp_lead == 1 && custom_tone == 0 ) {// add extra clean boost because this particular clean model is very quiet
-            buffer.applyGain(8.0);
+        //    Apply levelAdjust from model param (for adjusting quiet or loud models)
+        if ( waveNet.levelAdjust != 0.0 ) {
+            buffer.applyGain(waveNet.levelAdjust);
         }
 
     }
@@ -206,25 +207,27 @@ void WaveNetVaAudioProcessor::loadConfigAmp()
 
     if (amp_lead == 0) { // if lead on 
         WaveNetLoader loader2(BinaryData::bluej_fullD_p0153_json);
+        float levelAdjust = loader2.levelAdjust;
         int numChannels2 = loader2.numChannels;
         int inputChannels2 = loader2.inputChannels;
         int outputChannels2 = loader2.outputChannels;
         int filterWidth2 = loader2.filterWidth;
         std::vector<int> dilations2 = loader2.dilations;
         std::string activation2 = loader2.activation;
         waveNet.setParams(inputChannels2, outputChannels2, numChannels2, filterWidth2, activation2,
-            dilations2);
+            dilations2, levelAdjust);
         loader2.loadVariables(waveNet);
     } else { // else if clean on
         WaveNetLoader loader2(BinaryData::bluej_clean_p0088_json);
+        float levelAdjust = loader2.levelAdjust;
         int numChannels2 = loader2.numChannels;
         int inputChannels2 = loader2.inputChannels;
         int outputChannels2 = loader2.outputChannels;
         int filterWidth2 = loader2.filterWidth;
         std::vector<int> dilations2 = loader2.dilations;
         std::string activation2 = loader2.activation;
         waveNet.setParams(inputChannels2, outputChannels2, numChannels2, filterWidth2, activation2,
-            dilations2);
+            dilations2, levelAdjust);
         loader2.loadVariables(waveNet);
     }
 
@@ -235,14 +238,15 @@ void WaveNetVaAudioProcessor::loadConfig(File configFile)
 {
     this->suspendProcessing(true);
     WaveNetLoader loader(dummyVar, configFile);
+    float levelAdjust = loader.levelAdjust;
     int numChannels = loader.numChannels;
     int inputChannels = loader.inputChannels;
     int outputChannels = loader.outputChannels;
     int filterWidth = loader.filterWidth;
     std::vector<int> dilations = loader.dilations;
     std::string activation = loader.activation;
     waveNet.setParams(inputChannels, outputChannels, numChannels, filterWidth, activation,
-        dilations);
+        dilations, levelAdjust);
     loader.loadVariables(waveNet);
     this->suspendProcessing(false);
 }

plugins/SmartAmp/Source/PluginProcessor.h

@@ -93,7 +93,6 @@ class WaveNetVaAudioProcessor  : public AudioProcessor
 
 private:
     WaveNet waveNet; // Amp Clean Channel / Lead Channel
-
     Eq4Band eq4band; // Amp EQ
 
 

plugins/SmartAmp/Source/WaveNet.cpp

@@ -105,8 +105,9 @@ void WaveNet::setWeight(std::vector<float> W, int layerIdx, std::string name)
 
 void WaveNet::setParams(int newInputChannels, int newOutputChannels, int newConvChannels,
                         int newFilterWidth, std::string newActivation,
-                        std::vector<int> newDilations)
+                        std::vector<int> newDilations, float levelAdjust_in)
 {
+    levelAdjust = levelAdjust_in;
     inputChannels = newInputChannels;
     outputChannels = newOutputChannels;
     activation = newActivation;

plugins/SmartAmp/Source/WaveNet.h

@@ -25,8 +25,9 @@ class WaveNet
     void setWeight(std::vector<float> W, int layerIdx, std::string name);
     void setParams(int newInputChannels, int newOutputChannels, int newConvChannels,
                    int newFilterWidth, std::string newActivation,
-                   std::vector<int> newDilations);
-
+                   std::vector<int> newDilations, float levelAdjust_in);
+    float levelAdjust = 0.0;
+
 private:
     ConvolutionStack convStack;
     ConvolutionLayer inputLayer;

plugins/SmartAmp/Source/WaveNetLoader.cpp

@@ -16,7 +16,10 @@ WaveNetLoader::WaveNetLoader(var jsonFile)
 {
     // Edit this line to point to your binary json file in project resources
     config = JSON::parse(jsonFile);
-
+    if (config.hasProperty("level_adjust"))
+    {
+        levelAdjust = config["level_adjust"];
+    }
     numChannels = config["residual_channels"];
     inputChannels = config["input_channels"];
     outputChannels = config["output_channels"];
@@ -30,6 +33,10 @@ WaveNetLoader::WaveNetLoader(var jsonFile, File configFile)
     // Edit this line to point to your binary json file in project resources
     config = JSON::parse(configFile);
 
+    if (config.hasProperty("level_adjust"))
+    {
+        levelAdjust = config["level_adjust"];
+    }
     numChannels = config["residual_channels"];
     inputChannels = config["input_channels"];
     outputChannels = config["output_channels"];

plugins/SmartAmp/Source/WaveNetLoader.h

@@ -22,6 +22,7 @@ class WaveNetLoader
 public:
     WaveNetLoader(var jsonFile);
     WaveNetLoader(var jsonFile, File configFile);
+    float levelAdjust;
     int numChannels;
     int inputChannels;
     int outputChannels;