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

Commit c6d7a895 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

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

parents 1b400c77 71450f81

api/current.xml

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

>

</field>

</field>

<field name="PRESET_LARGEHALL"

<field name="PRESET_LARGEHALL"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="5"

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

>

</field>

</field>

<field name="PRESET_LARGEROOM"

<field name="PRESET_LARGEROOM"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="3"

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

>

</field>

</field>

<field name="PRESET_MEDIUMHALL"

<field name="PRESET_MEDIUMHALL"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="4"

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

>

</field>

</field>

<field name="PRESET_MEDIUMROOM"

<field name="PRESET_MEDIUMROOM"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="2"

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

>

</field>

</field>

<field name="PRESET_NONE"

<field name="PRESET_NONE"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="0"

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

>

</field>

</field>

<field name="PRESET_PLATE"

<field name="PRESET_PLATE"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="6"

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

>

</field>

</field>

<field name="PRESET_SMALLROOM"

<field name="PRESET_SMALLROOM"

 type="int"

 type="short"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

 value="1"

 value="1"

media/java/android/media/PresetReverb.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -71,31 +71,31 @@ public class PresetReverb extends AudioEffect { 
    /**

    /**

     * No reverb or reflections

     * 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

     * 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

     * 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

     * 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

     * 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

     * 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

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

     * Registered listener for parameter changes.