diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-26 15:51:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 15:51:37 -0700 |
| commit | 0a84244d92685a0bef4ec2778b95af3705b1ce16 (patch) | |
| tree | 4c2576a0ca5ef44122a33ceb3d39102dabc4d100 /media | |
| parent | 4252a5a4b49f55c93664bd20da31d6af92fc0a29 (diff) | |
| parent | d0faf5a2dd892228bbfbf1e43aba95f60c6bca05 (diff) | |
| download | frameworks_base-0a84244d92685a0bef4ec2778b95af3705b1ce16.zip frameworks_base-0a84244d92685a0bef4ec2778b95af3705b1ce16.tar.gz frameworks_base-0a84244d92685a0bef4ec2778b95af3705b1ce16.tar.bz2 | |
am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'
* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
Changed type of reverb presets from int to short
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/PresetReverb.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/java/android/media/PresetReverb.java b/media/java/android/media/PresetReverb.java index 1ec36fc..65175ff 100644 --- a/media/java/android/media/PresetReverb.java +++ b/media/java/android/media/PresetReverb.java @@ -71,31 +71,31 @@ public class PresetReverb extends AudioEffect { /** * No reverb or reflections */ - public static final int PRESET_NONE = 0; + public static final short PRESET_NONE = 0; /** * Reverb preset representing a small room less than five meters in length */ - public static final int PRESET_SMALLROOM = 1; + public static final short PRESET_SMALLROOM = 1; /** * Reverb preset representing a medium room with a length of ten meters or less */ - public static final int PRESET_MEDIUMROOM = 2; + public static final short PRESET_MEDIUMROOM = 2; /** * Reverb preset representing a large-sized room suitable for live performances */ - public static final int PRESET_LARGEROOM = 3; + public static final short PRESET_LARGEROOM = 3; /** * Reverb preset representing a medium-sized hall */ - public static final int PRESET_MEDIUMHALL = 4; + public static final short PRESET_MEDIUMHALL = 4; /** * Reverb preset representing a large-sized hall suitable for a full orchestra */ - public static final int PRESET_LARGEHALL = 5; + public static final short PRESET_LARGEHALL = 5; /** * Reverb preset representing a synthesis of the traditional plate reverb */ - public static final int PRESET_PLATE = 6; + public static final short PRESET_PLATE = 6; /** * Registered listener for parameter changes. |