aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2011-03-29 10:22:20 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2011-03-29 10:22:20 +0000
commitb5c18d41cc8a7118828dafcd50fa152fa4276b92 (patch)
tree8843a498e680056f3b82f42d94c2ce39fce7de9c /src
parentac8a0298cd0c1a47ab007cb98132e38a0c933075 (diff)
downloadjitsi-b5c18d41cc8a7118828dafcd50fa152fa4276b92.zip
jitsi-b5c18d41cc8a7118828dafcd50fa152fa4276b92.tar.gz
jitsi-b5c18d41cc8a7118828dafcd50fa152fa4276b92.tar.bz2
Assigns the range from 0% to 200% to the playback volume scale in the call dialog.
Diffstat (limited to 'src')
-rw-r--r--src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/audio/PortAudioRenderer.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/audio/PortAudioRenderer.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/audio/PortAudioRenderer.java
index 4b3648b..b7f0bbd 100644
--- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/audio/PortAudioRenderer.java
+++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/renderer/audio/PortAudioRenderer.java
@@ -192,13 +192,11 @@ public class PortAudioRenderer
Arrays.fill(buffer, offset, offset + length, (byte) 0);
else
{
- float db = gainControl.getDB();
+ // Assign the maximum of 200% to the volume scale.
+ float level = gainControl.getLevel() * 2;
- if (db != 0)
+ if (level != 1)
{
- // factor = pow(10, dB/10)
- double factor = Math.pow(10, (db / 10d));
-
for (int i = offset, toIndex = offset + length;
i < toIndex;
i += 2)
@@ -207,8 +205,9 @@ public class PortAudioRenderer
short s = (short) ((buffer[i] & 0xff) | (buffer[i1] << 8));
/* Clip, don't wrap. */
- int si = (int) (s * factor);
+ int si = s;
+ si = (int) (si * level);
if (si > Short.MAX_VALUE)
s = Short.MAX_VALUE;
else if (si < Short.MIN_VALUE)