Mercurial > hg > release > icedtea6-1.4.1
changeset 1331:c29bbfa41f2b
2009-01-22 Omair Majid <omajid@redhat.com>
Ioana Ivan <iivan@redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
(start): Return silently if already started.
(stop): Return silently if already stopped.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Thu, 22 Jan 2009 14:18:45 -0500 |
parents | 15437352b69c |
children | eb8b5c5aa4db |
files | ChangeLog pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java |
diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 22 13:36:49 2009 -0500 +++ b/ChangeLog Thu Jan 22 14:18:45 2009 -0500 @@ -1,3 +1,10 @@ +2009-01-22 Omair Majid <omajid@redhat.com> + Ioana Ivan <iivan@redhat.com> + + * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java + (start): Return silently if already started. + (stop): Return silently if already stopped. + 2009-01-22 Deepak Bhole <dbhole@redhat.com> * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Use
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Thu Jan 22 13:36:49 2009 -0500 +++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Thu Jan 22 14:18:45 2009 -0500 @@ -431,7 +431,7 @@ public byte[] native_update_volume() { return stream.native_update_volume(); } - + @Override public float getCachedVolume() { return stream.getCachedVolume(); @@ -521,12 +521,8 @@ @Override public void start() { - if (!isOpen) { - throw new IllegalStateException("Line not open"); - } - if (isStarted) { - throw new IllegalStateException("already started"); + return; } super.start(); @@ -547,8 +543,9 @@ throw new IllegalStateException("Line not open"); } + /* do what start does and ignore if called at the wrong time */ if (!isStarted) { - throw new IllegalStateException("not started, so cant stop"); + return; } if (clipThread.isAlive()) {