diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-07-12 16:57:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 16:57:45 +0000 |
| commit | e45b351bbf81e4212e87cdb0a536df3d7d50435a (patch) | |
| tree | bd78895feaf61da0e02b8f15ae689190961acf60 /src/com/android | |
| parent | 4d1ca42c153e291cd03b49a77144e163f64578c9 (diff) | |
| parent | 4fb8174a191b5a33f18b3d63c79423cd229bc559 (diff) | |
| download | platform_packages_apps_MusicFX-e45b351bbf81e4212e87cdb0a536df3d7d50435a.tar.gz platform_packages_apps_MusicFX-e45b351bbf81e4212e87cdb0a536df3d7d50435a.tar.bz2 platform_packages_apps_MusicFX-e45b351bbf81e4212e87cdb0a536df3d7d50435a.zip | |
Fix UI behavior for virtualizer effect
am: 4fb8174a19
Change-Id: Ica84e7b55409ed63b84eef25972b33421546bbb0
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/musicfx/ActivityMusic.java | 22 | ||||
| -rw-r--r-- | src/com/android/musicfx/ControlPanelEffect.java | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java index f8daa1d..29c4c4a 100644 --- a/src/com/android/musicfx/ActivityMusic.java +++ b/src/com/android/musicfx/ActivityMusic.java @@ -30,9 +30,11 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.IntentFilter; +import android.media.AudioFormat; import android.media.AudioManager; import android.media.audiofx.AudioEffect; import android.media.audiofx.AudioEffect.Descriptor; +import android.media.audiofx.Virtualizer; import android.os.Bundle; import android.util.Log; import android.view.Gravity; @@ -260,9 +262,7 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener { if (effect.type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) { mVirtualizerSupported = true; - if (effect.uuid.equals(UUID.fromString("1d4033c0-8557-11df-9f2d-0002a5d5c51b"))) { - mVirtualizerIsHeadphoneOnly = true; - } + mVirtualizerIsHeadphoneOnly = !isVirtualizerTransauralSupported(); } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) { mBassBoostSupported = true; } else if (effect.type.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)) { @@ -809,4 +809,20 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener { toast.setGravity(Gravity.CENTER, toast.getXOffset() / 2, toast.getYOffset() / 2); toast.show(); } + + private static boolean isVirtualizerTransauralSupported() { + Virtualizer virt = null; + boolean transauralSupported = false; + try { + virt = new Virtualizer(0, android.media.AudioSystem.newAudioSessionId()); + transauralSupported = virt.canVirtualize(AudioFormat.CHANNEL_OUT_STEREO, + Virtualizer.VIRTUALIZATION_MODE_TRANSAURAL); + } catch (Exception e) { + } finally { + if (virt != null) { + virt.release(); + } + } + return transauralSupported; + } } diff --git a/src/com/android/musicfx/ControlPanelEffect.java b/src/com/android/musicfx/ControlPanelEffect.java index 25845b8..e3b2e6b 100644 --- a/src/com/android/musicfx/ControlPanelEffect.java +++ b/src/com/android/musicfx/ControlPanelEffect.java @@ -111,7 +111,7 @@ public class ControlPanelEffect { // Defaults final static boolean GLOBAL_ENABLED_DEFAULT = false; private final static boolean VIRTUALIZER_ENABLED_DEFAULT = true; - private final static int VIRTUALIZER_STRENGTH_DEFAULT = 1000; + private final static int VIRTUALIZER_STRENGTH_DEFAULT = 0; private final static boolean BASS_BOOST_ENABLED_DEFAULT = true; private final static int BASS_BOOST_STRENGTH_DEFAULT = 667; private final static boolean PRESET_REVERB_ENABLED_DEFAULT = false; |