drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed type of reverb presets from int to short" into gingerbread

Browse Source
This commit is contained in:
Eric Laurent
2010-08-26 11:01:06 -07:00
committed by Android (Google) Code Review
parent 1b400c7763 71450f8139
commit c6d7a8953d
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.xml
View File

@ -92922,7 +92922,7 @@
>
</field>
<field name="PRESET_LARGEHALL"
type="int"
type="short"
transient="false"
volatile="false"
value="5"
@ -92933,7 +92933,7 @@
>
</field>
<field name="PRESET_LARGEROOM"
type="int"
type="short"
transient="false"
volatile="false"
value="3"
@ -92944,7 +92944,7 @@
>
</field>
<field name="PRESET_MEDIUMHALL"
type="int"
type="short"
transient="false"
volatile="false"
value="4"
@ -92955,7 +92955,7 @@
>
</field>
<field name="PRESET_MEDIUMROOM"
type="int"
type="short"
transient="false"
volatile="false"
value="2"
@ -92966,7 +92966,7 @@
>
</field>
<field name="PRESET_NONE"
type="int"
type="short"
transient="false"
volatile="false"
value="0"
@ -92977,7 +92977,7 @@
>
</field>
<field name="PRESET_PLATE"
type="int"
type="short"
transient="false"
volatile="false"
value="6"
@ -92988,7 +92988,7 @@
>
</field>
<field name="PRESET_SMALLROOM"
type="int"
type="short"
transient="false"
volatile="false"
value="1"

14
media/java/android/media/PresetReverb.java
View File

@ -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.