Mercurial > hg > release > icedtea7-2.1
changeset 2256:3f0dad02b228
PR icedtea/438: 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
| author | Jon VanAlten <jon.vanalten@redhat.com> |
|---|---|
| date | Fri, 04 Jun 2010 14:20:15 -0400 |
| parents | 85ec20ad5e63 |
| children | 57b31ab89534 |
| files | ChangeLog Makefile.am pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 11 13:08:48 2010 +0100 +++ b/ChangeLog Fri Jun 04 14:20:15 2010 -0400 @@ -1,3 +1,12 @@ +2010-06-04 Jon VanAlten <jon.vanalten@redhat.com> + + PR icedtea/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 + 2010-06-01 Xerxes Rånby <xerxes@zafena.se> * Makefile.am:
--- a/Makefile.am Fri Jun 11 13:08:48 2010 +0100 +++ b/Makefile.am Fri Jun 04 14:20:15 2010 -0400 @@ -1815,6 +1815,8 @@ $(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 JNLP_ABOUT_NEEDED cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Fri Jun 11 13:08:48 2010 +0100 +++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Fri Jun 04 14:20:15 2010 -0400 @@ -102,7 +102,9 @@ @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; } }