Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a84244d authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 

Merge commit 'd0faf5a2'

* commit 'd0faf5a2':
  Changed type of reverb presets from int to short
parents 4252a5a4 d0faf5a2

api/current.xml

+7 −7
Original line number Diff line number Diff line
@@ -100026,7 +100026,7 @@ 
>

</field>

<field name="PRESET_LARGEHALL"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="5"
@@ -100037,7 +100037,7 @@ 
>

</field>

<field name="PRESET_LARGEROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="3"
@@ -100048,7 +100048,7 @@ 
>

</field>

<field name="PRESET_MEDIUMHALL"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="4"
@@ -100059,7 +100059,7 @@ 
>

</field>

<field name="PRESET_MEDIUMROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="2"
@@ -100070,7 +100070,7 @@ 
>

</field>

<field name="PRESET_NONE"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="0"
@@ -100081,7 +100081,7 @@ 
>

</field>

<field name="PRESET_PLATE"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="6"
@@ -100092,7 +100092,7 @@ 
>

</field>

<field name="PRESET_SMALLROOM"

 type="int"

 type="short"

 transient="false"

 volatile="false"

 value="1"

media/java/android/media/PresetReverb.java

+7 −7
Original line number Diff line number Diff line
@@ -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.