changeset in /hg/pulseaudio: 2008-08-11 Omair Majid <omajid at redh...

[Omair Majid]

changeset ffc11c4c5c53 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=ffc11c4c5c53
description:
	2008-08-11 Omair Majid <omajid at redhat.com>

	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java: replaced volume value with constant
	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java: added a check in setValue() for a valid value
	    * src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java: added constants for min and max value
	    * unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java: modified the test to use the constants

diffstat:

4 files changed, 13 insertions(+), 3 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java      |    2 +-
src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java |    7 +++++++
src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java       |    5 ++++-
unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java      |    2 +-

diffs (66 lines):

diff -r e77e418081f7 -r ffc11c4c5c53 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Aug 11 16:55:35 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Aug 11 17:30:11 2008 -0400
@@ -125,7 +125,7 @@ public class PulseAudioSourceDataLine im
 	public PulseAudioSourceDataLine(EventLoop eventLoop) {
 		this.eventLoop = eventLoop;
 		this.listeners = new ArrayList<LineListener>();
-		this.volume = 65536;
+		this.volume = PulseAudioVolumeControl.MAX_VOLUME;
 
 		/*
 		 * FIXME puselaudio supports any sample rate (it can covert between
diff -r e77e418081f7 -r ffc11c4c5c53 src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java	Mon Aug 11 16:55:35 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioStreamVolumeControl.java	Mon Aug 11 17:30:11 2008 -0400
@@ -6,7 +6,10 @@ import org.classpath.icedtea.pulseaudio.
 import org.classpath.icedtea.pulseaudio.PulseAudioVolumeControl;
 
 public class PulseAudioStreamVolumeControl extends PulseAudioVolumeControl {
+	
+	@SuppressWarnings("unused")
 	private long streamPointer;
+	
 	private EventLoop eventLoop;
 	private PulseAudioSourceDataLine line;
 
@@ -31,6 +34,10 @@ public class PulseAudioStreamVolumeContr
 	}
 	
 	public synchronized void setValue(float newValue) {
+		if ( newValue > PulseAudioVolumeControl.MAX_VOLUME || newValue < PulseAudioStreamVolumeControl.MIN_VOLUME) {
+			throw new IllegalArgumentException("invalid value");
+		}
+		
 		if(!line.isMuted()) {
 			setStreamVolume(newValue);
 		}
diff -r e77e418081f7 -r ffc11c4c5c53 src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java	Mon Aug 11 16:55:35 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java	Mon Aug 11 17:30:11 2008 -0400
@@ -41,9 +41,12 @@ import javax.sound.sampled.FloatControl;
 import javax.sound.sampled.FloatControl;
 
 abstract class PulseAudioVolumeControl extends FloatControl {
+	
+	public static final int MAX_VOLUME = 65536;
+	public static final int MIN_VOLUME = 0;
 
 	protected PulseAudioVolumeControl(PulseAudioSourceDataLine line) {
-		super(FloatControl.Type.VOLUME, 0, 65536, 1, -1, line.getVolume(), "pulseaudio units", "Volume Off", "Default Volume", "Full Volume");
+		super(FloatControl.Type.VOLUME, MIN_VOLUME, MAX_VOLUME, 1, -1, line.getVolume(), "pulseaudio units", "Volume Off", "Default Volume", "Full Volume");
 	}
 
 
diff -r e77e418081f7 -r ffc11c4c5c53 unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java
--- a/unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java	Mon Aug 11 16:55:35 2008 -0400
+++ b/unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java	Mon Aug 11 17:30:11 2008 -0400
@@ -160,7 +160,7 @@ public class PulseSourceDataLineTest {
 				.getControl(BooleanControl.Type.MUTE);
 
 		mute.setValue(true);
-		volume.setValue(40000);
+		volume.setValue(PulseAudioStreamVolumeControl.MAX_VOLUME);
 
 		mute.setValue(false);