Mercurial > hg > release > icedtea6-1.4.1
view pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java @ 1322:a08ebb168e2f
2009-01-21 Omair Majid <omajid@redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java:
Remove unused variables volume and muted.
(PulseAudioClip): Remove variable volume.
(open): Remove muteControl, volume and muted.
(native_setVolume): Rename to native_set_volume.
(native_update_volume): New function.
(isMuted): Remove.
(setMuted): Remove.
(setVolume): Rename to setCachedVolume.
(getVolume): Rename to getCachedVolume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMuteControl.java:
Remove file. Mute relied on chaning the volume only through the api. That
assumption is invalid as the user can change volume through pulseaudio's
controls.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java
(isMuted): Remove.
(setMuted): Remove.
(native_setVolume): Rename to native_set_volume.
(native_update_volume): New function.
(getVolume): Rename to getCachedVolume.
(setVolume): Rename to setCachedVolume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java:
Remove muted and muteControl. Rename volume to cachedVolume.
(PulseAudioPort): Remove muteControl.
(isMuted): Remove function.
(setMuted): Remove.
(native_setVolume): Rename to native_set_volume.
(native_updateVolumeInfo): Rename to native_update_volume.
(setVolume): Rename to setCachedVolume.
(getVolume): Rename to getCachedVolume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java:
Remove muteControl, muted and volume.
(open): Remove muteControl.
(native_setVolume): Rename to native_set_volume.
(native_update_volume): New function.
(isMuted): Remove.
(setMuted): Remove.
(getVolume): Rename to getCachedVolume.
(setVolume): Rename to setCachedVolume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
(native_setVolume): Rename to native_set_volume.
(native_updateVolumeInfo): Rename to native_update_volume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
(native_setVolume): Rename to native_set_volume.
(native_updateVolumeInfo): Rename to native_update_volume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java
(setValue): Dont check for mute.
(getValue): Query pulseaudio for any change in volume.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
New variable cachedVolume.
(native_setVolume): Rename to native_set_volume.
(native_update_volume): New function.
(getCachedVolume): New function.
(setCachedVolume): New function.
(update_channels_and_volume): New function.
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
(sink_input_volume_change_complete): Remove.
(sink_input_change_volume): Remove.
(Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume):
Remove.
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
(Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1updateVolumeInfo):
Rename to
Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1update_1volume.
(Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1setVolume):
Rename to
Java_org_classpath_icedtea_pulseaudio_PulseAudioSourcePort_native_1set_1volume.
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
(Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1updateVolumeInfo):
Rename to
Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1update_1volume.
(Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1setVolume):
Rename to
Java_org_classpath_icedtea_pulseaudio_PulseAudioTargetPort_native_1set_1volume.
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1setVolume): Rename
to Java_org_classpath_icedtea_pulseaudio_Stream_native_1set_1volume.
(get_sink_input_volume_callback): New function.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1update_1volume): New
function.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
(testSupportedControls): Update to not check for MuteControl.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java
(testVolumeAndMute): Rename to testVolume. Remove test for MuteControl.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
(testVolumeAndMute): Likewise.
(testSupportedControls): Update to not check for MuteControl.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java
(testControls): Update to not check for MuteControl.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java
(testControls): Likewise.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Wed, 21 Jan 2009 17:17:47 -0500 |
parents | 8bf089d06e19 |
children |
line wrap: on
line source
/* PulseAudioVolumeControl.java Copyright (C) 2008 Red Hat, Inc. This file is part of IcedTea. IcedTea is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. IcedTea is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with IcedTea; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ package org.classpath.icedtea.pulseaudio; import javax.sound.sampled.FloatControl; final class PulseAudioVolumeControl extends FloatControl { static final int MAX_VOLUME = 65536; static final int MIN_VOLUME = 0; protected PulseAudioVolumeControl(PulseAudioPlaybackLine line, EventLoop eventLoop) { /* * the initial volume is ignored by pulseaudio. */ super(FloatControl.Type.VOLUME, MIN_VOLUME, MAX_VOLUME, 1, -1, line .getCachedVolume(), "pulseaudio units", "Volume Off", "Default Volume", "Full Volume"); this.line = line; this.eventLoop = eventLoop; } private EventLoop eventLoop; private PulseAudioPlaybackLine line; @Override public synchronized void setValue(float newValue) { if (newValue > MAX_VOLUME || newValue < MIN_VOLUME) { throw new IllegalArgumentException("invalid value"); } if (!line.isOpen()) { return; } setStreamVolume(newValue); line.setCachedVolume(newValue); } protected synchronized void setStreamVolume(float newValue) { Operation op; synchronized (eventLoop.threadLock) { op = new Operation(line.native_set_volume(newValue)); } op.waitForCompletion(); op.releaseReference(); } public synchronized float getValue() { Operation op; synchronized (eventLoop.threadLock) { op = new Operation(line.native_update_volume()); } op.waitForCompletion(); op.releaseReference(); return line.getCachedVolume(); } }