/hg/icedtea6: Fix bug in PulseAudio backend http://icedtea.class...

[vanaltj at icedtea.classpath.org]

changeset f08bf2c87805 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f08bf2c87805
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Fri Jun 04 14:20:15 2010 -0400

	Fix bug in PulseAudio backend
	http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438
		* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.
	java: (isControlSupported): Correctly determine if control-
	type is supported.
		* Makefile.am (stamps/icedtea.stamp): Add PulseAudio sources
	to src.zip


diffstat:

3 files changed, 13 insertions(+), 1 deletion(-)
ChangeLog                                                                |    8 ++++++++
Makefile.am                                                              |    2 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java |    4 +++-

diffs (41 lines):

diff -r 7674917fa451 -r f08bf2c87805 ChangeLog
--- a/ChangeLog	Tue Jun 01 11:38:30 2010 +0200
+++ b/ChangeLog	Fri Jun 04 14:20:15 2010 -0400
@@ -1,3 +1,11 @@ 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafen
+2010-06-04 Jon VanAlten  <jon.vanalten at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java:
+	(isControlSupported): Correctly determine if control-type is
+	supported.
+	* Makefile.am
+	(stamps/icedtea.stamp): Add PulseAudio sources to src.zip
+
 2010-06-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* Makefile.am:
diff -r 7674917fa451 -r f08bf2c87805 Makefile.am
--- a/Makefile.am	Tue Jun 01 11:38:30 2010 +0200
+++ b/Makefile.am	Fri Jun 04 14:20:15 2010 -0400
@@ -1250,6 +1250,8 @@ if ENABLE_PULSE_JAVA
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 if WITH_VISUALVM
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
diff -r 7674917fa451 -r f08bf2c87805 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java	Tue Jun 01 11:38:30 2010 +0200
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java	Fri Jun 04 14:20:15 2010 -0400
@@ -102,7 +102,9 @@ abstract class PulseAudioLine implements
 	@Override
 	public boolean isControlSupported(Type control) {
 		for (Control myControl : controls) {
-			if (myControl.getType().getClass() == control.getClass()) {
+			//Control.Type's known descendants keep a set of
+			//static Types.
+			if (myControl.getType().equals(control)) {
 				return true;
 			}
 		}