audiofx: Misc fixes

 * Don't resend EQ parameters on device switch, they are already sent.
 * Synchronize a few things around parameters.
 * Adjust spacebass again clear user parameters when switching devices.

Change-Id: I74b3984e0f8ea603fcad0038c1cd081a4bfc81c0

2 files changed, 12 insertions, 6 deletions

diff --git a/src/com/cyngn/audiofx/activity/EqualizerManager.java b/src/com/cyngn/audiofx/activity/EqualizerManager.java
index 7fa85cb..03e9853 100644
--- a/src/com/cyngn/audiofx/activity/EqualizerManager.java
+++ b/src/com/cyngn/audiofx/activity/EqualizerManager.java
@@ -209,7 +209,7 @@ public class EqualizerManager {
     }
 
     void onPostDeviceChanged() {
-        setPreset(mCurrentPreset);
+        setPreset(mCurrentPreset, false);
     }
 
     public Preset getCurrentPreset() {
@@ -332,7 +332,7 @@ public class EqualizerManager {
      *
      * @param newPresetIndex the new preset index.
      */
-    public void setPreset(final int newPresetIndex) {
+    public void setPreset(final int newPresetIndex, boolean updateBackend) {
         mCurrentPreset = newPresetIndex;
         updateEqControls(); // do this before callback is propogated
 
@@ -349,7 +349,13 @@ public class EqualizerManager {
 
         setPref(Constants.DEVICE_AUDIOFX_EQ_PRESET_LEVELS, EqUtils.floatLevelsToString(newlevels));
 
-        mConfig.updateService(AudioFxService.EQ_CHANGED);
+        if (updateBackend) {
+            mConfig.updateService(AudioFxService.EQ_CHANGED);
+        }
+    }
+
+    public void setPreset(final int newPresetIndex) {
+        setPreset(newPresetIndex, true);
     }
 
     private void updateEqControls() {
diff --git a/src/com/cyngn/audiofx/activity/MasterConfigControl.java b/src/com/cyngn/audiofx/activity/MasterConfigControl.java
index 32514c4..6aba0f6 100644
--- a/src/com/cyngn/audiofx/activity/MasterConfigControl.java
+++ b/src/com/cyngn/audiofx/activity/MasterConfigControl.java
@@ -164,17 +164,17 @@ public class MasterConfigControl {
         return mEqManager;
     }
 
-    public void setCurrentDeviceEnabled(boolean isChecked) {
+    public synchronized void setCurrentDeviceEnabled(boolean isChecked) {
         getPrefs().edit().putBoolean(Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE, isChecked).apply();
         getCallbacks().notifyGlobalToggle(isChecked);
         updateService(AudioFxService.ALL_CHANGED);
     }
 
-    public boolean isCurrentDeviceEnabled() {
+    public synchronized boolean isCurrentDeviceEnabled() {
         return getPrefs().getBoolean(Constants.DEVICE_AUDIOFX_GLOBAL_ENABLE, false);
     }
 
-    public SharedPreferences getGlobalPrefs() {
+    public synchronized SharedPreferences getGlobalPrefs() {
         return mContext.getSharedPreferences(Constants.AUDIOFX_GLOBAL_FILE, 0);
     }