changeset in /hg/icedtea6: 2009-01-22 Omair Majid <omajid at redh...

[Omair Majid]

changeset c29bbfa41f2b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c29bbfa41f2b
description:
	2009-01-22  Omair Majid  <omajid at redhat.com>
	            Ioana Ivan <iivan at redhat.com>

	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
	    (start): Return silently if already started.
	    (stop): Return silently if already stopped.

diffstat:

2 files changed, 11 insertions(+), 7 deletions(-)
ChangeLog                                                                |    7 ++++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java |   11 +++-------

diffs (51 lines):

diff -r 15437352b69c -r c29bbfa41f2b ChangeLog
--- 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  Deepak Bhole <dbhole at redhat.
+2009-01-22  Omair Majid  <omajid at redhat.com>
+			Ioana Ivan <iivan at 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 at redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Use
diff -r 15437352b69c -r c29bbfa41f2b pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- 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 final class PulseAudioClip extend
 	public byte[] native_update_volume() {
 		return stream.native_update_volume();
 	}
-	
+
 	@Override
 	public float getCachedVolume() {
 		return stream.getCachedVolume();
@@ -521,12 +521,8 @@ public final class PulseAudioClip extend
 
 	@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 @@ public final class PulseAudioClip extend
 			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()) {