finally got mixer meter to work on all devices ... i think

djshaji · Mar 15, 2023 · 271ce44 · 271ce44
1 parent 08171f7
commit 271ce44
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 5 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.shajikhan.ladspa.amprack"
         minSdk 23
         targetSdk 31
-        versionCode 47
-        versionName '3.01'
+        versionCode 48
+        versionName '3.02'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/app/src/main/cpp/Meter.h b/app/src/main/cpp/Meter.h
@@ -115,11 +115,13 @@ class Meter {
 
         for (int i = 0; i < bufferUsedOutput; i++) {
             for (int j = 0; j < sbuffer[i].pos; j++) {
-                if (sbuffer[i].data[j] > max)
+                if (sbuffer[i].data[j] > max && sbuffer[i].data[j] > 0.01 && sbuffer[i].data[j] < 1.01)
                     max = sbuffer[i].data[j];
             }
         }
 
+//        max = sbuffer[0].data[0];
+
 //        LOGD ("%f", max);
         envOutput->CallStaticVoidMethod(mainActivityOutput, setMixerMeterOutput, (jfloat) max, false);
         bufferUsedOutput = 0;
@@ -158,7 +160,7 @@ class Meter {
 
         for (int i = 0; i < bufferUsed; i++) {
             for (int j = 0; j < sbuffer[i].pos; j++) {
-                if (sbuffer[i].data[j] > max)
+                if (sbuffer[i].data[j] > max && sbuffer[i].data[j] > 0.01 && sbuffer[i].data[j] < 1.01)
                     max = sbuffer[i].data[j];
             }
         }

diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java b/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java
@@ -2345,16 +2345,19 @@ static void setMixerMeter (float inputValue, float outputValue) {
         outputMeter.setProgress((int) (outputValue * 100));
     }
     static void setMixerMeterSwitch (float inputValue, boolean isInput) {
+//        Log.d(TAG, "setMixerMeterSwitch() called with: inputValue = [" + inputValue + "], isInput = [" + isInput + "]");
         if (isInput)
             inputMeter.setProgress((int) (inputValue * 100));
         else
             outputMeter.setProgress((int) (inputValue * 100));
     }
 
     static void setMixerMeterInput (float inputValue) {
+//        Log.d(TAG, "setMixerMeterInput() called with: inputValue = [" + inputValue + "]");
         inputMeter.setProgress((int) (inputValue * 100));
     }
     static void setMixerMeterOutput (float outputValue) {
+//        Log.d(TAG, "setMixerMeterOutput() called with: outputValue = [" + outputValue + "]");
         outputMeter.setProgress((int) (outputValue * 100));
     }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">Amp Rack</string>
     <string name="app_version">Version 3 Nighthawk</string>
-    <string name="build_id">328</string>
+    <string name="build_id">333</string>
     <string name="onboard_theme_chooser">
         Choose a theme for the UI. Choose Material Theme for Native
         Android Material Design, or Tube Amp theme based on the new