aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java22
1 files changed, 5 insertions, 17 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java b/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
index f170af0b..7d58d3a6 100644
--- a/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
+++ b/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
@@ -23,7 +23,6 @@ import java.io.Serializable;
import android.content.Context;
import android.media.audiofx.BassBoost;
import android.media.audiofx.Equalizer;
-import android.os.Build;
import android.util.Log;
import github.daneren2005.dsub.util.FileUtil;
@@ -43,7 +42,7 @@ public class EqualizerController {
private boolean loudnessAvailable = false;
private LoudnessEnhancerController loudnessEnhancerController;
private boolean released = false;
- private int audioSessionId = 0;
+ private final int audioSessionId;
public EqualizerController(Context context, int audioSessionId) {
this.context = context;
@@ -54,10 +53,8 @@ public class EqualizerController {
private void init() {
equalizer = new Equalizer(0, audioSessionId);
bass = new BassBoost(0, audioSessionId);
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- loudnessAvailable = true;
- loudnessEnhancerController = new LoudnessEnhancerController(context, audioSessionId);
- }
+ loudnessAvailable = true;
+ loudnessEnhancerController = new LoudnessEnhancerController(audioSessionId);
}
public void saveSettings() {
@@ -146,15 +143,11 @@ public class EqualizerController {
private static class EqualizerSettings implements Serializable {
- private short[] bandLevels;
- private short preset;
- private boolean enabled;
+ private final short[] bandLevels;
+ private final boolean enabled;
private short bass;
private int loudness;
- public EqualizerSettings() {
-
- }
public EqualizerSettings(Equalizer equalizer, BassBoost boost, LoudnessEnhancerController loudnessEnhancerController) {
enabled = equalizer.getEnabled();
bandLevels = new short[equalizer.getNumberOfBands()];
@@ -162,11 +155,6 @@ public class EqualizerController {
bandLevels[i] = equalizer.getBandLevel(i);
}
try {
- preset = equalizer.getCurrentPreset();
- } catch (Exception x) {
- preset = -1;
- }
- try {
bass = boost.getRoundedStrength();
} catch(Exception e) {
bass = 0;