Merge "Changed type of reverb presets from int to short" into gingerbread (c6d7a895) · Commits · e / os / android_frameworks_base

api/current.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -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"

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