[kaffe] CVS kaffe (doogie): Remove unused static variables(actually fixes a warning about assigning a
Kaffe CVS
cvs-commits at kaffe.org
Fri Dec 10 13:39:30 PST 2004
PatchSet 5598
Date: 2004/12/10 21:34:54
Author: doogie
Branch: HEAD
Tag: (none)
Log:
Remove unused static variables(actually fixes a warning about assigning a
constant value to a static that isn't also final).
Members:
ChangeLog:1.3143->1.3144
libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:1.2->1.3
libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:1.2->1.3
libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:1.2->1.3
libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:1.2->1.3
libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3143 kaffe/ChangeLog:1.3144
--- kaffe/ChangeLog:1.3143 Fri Dec 10 21:29:34 2004
+++ kaffe/ChangeLog Fri Dec 10 21:34:54 2004
@@ -1,5 +1,15 @@
2004-12-10 Adam Heath <doogie at brainfood.com>
+ * libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java,
+ libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java,
+ libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java,
+ libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java,
+ libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:
+ Remove unused static variables(actually fixes a warning about assigning a
+ constant value to a static that isn't also final).
+
+2004-12-10 Adam Heath <doogie at brainfood.com>
+
* libraries/javalib/gnu/regexp/RE.java,
libraries/javalib/java/util/regex/Pattern.java:
Use braces around assignments in conditions.
Index: kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java
diff -u kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:1.2 kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:1.3
--- kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:1.2 Mon Mar 22 11:25:43 2004
+++ kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java Fri Dec 10 21:34:57 2004
@@ -369,16 +369,6 @@
public class AlsaBaseDataLineGainControl
extends FloatControl
{
- /*
- * These variables should be static. However, Java 1.1
- * doesn't allow this. So they aren't.
- */
- private /*static*/ final float MAX_GAIN = 90.0F;
- private /*static*/ final float MIN_GAIN = -96.0F;
-
- // TODO: recheck this value
- private /*static*/ final int GAIN_INCREMENTS = 1000;
-
// private float m_fGain;
// private boolean m_bMuted;
Index: kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java
diff -u kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:1.2 kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:1.3
--- kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:1.2 Mon Mar 22 11:25:43 2004
+++ kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java Fri Dec 10 21:34:57 2004
@@ -218,16 +218,6 @@
public class AlsaSourceDataLineGainControl
extends FloatControl
{
- /*
- * These variables should be static. However, Java 1.1
- * doesn't allow this. So they aren't.
- */
- private /*static*/ final float MAX_GAIN = 90.0F;
- private /*static*/ final float MIN_GAIN = -96.0F;
-
- // TODO: recheck this value
- private /*static*/ final int GAIN_INCREMENTS = 1000;
-
// private float m_fGain;
// private boolean m_bMuted;
Index: kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java
diff -u kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:1.2 kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:1.3
--- kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:1.2 Mon Mar 22 11:25:43 2004
+++ kaffe/libraries/javalib/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java Fri Dec 10 21:34:57 2004
@@ -211,16 +211,6 @@
public class AlsaTargetDataLineGainControl
extends FloatControl
{
- /*
- * These variables should be static. However, Java 1.1
- * doesn't allow this. So they aren't.
- */
- private /*static*/ final float MAX_GAIN = 90.0F;
- private /*static*/ final float MIN_GAIN = -96.0F;
-
- // TODO: recheck this value
- private /*static*/ final int GAIN_INCREMENTS = 1000;
-
// private float m_fGain;
// private boolean m_bMuted;
Index: kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java
diff -u kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:1.2 kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:1.3
--- kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:1.2 Mon Mar 22 11:25:44 2004
+++ kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java Fri Dec 10 21:34:58 2004
@@ -344,15 +344,6 @@
public class EsdSourceDataLineGainControl
extends FloatControl
{
- /*
- * These variables should be static. However, Java 1.1
- * doesn't allow this. So they aren't.
- */
- private /*static*/ final float MAX_GAIN = 24.0F;
- private /*static*/ final float MIN_GAIN = -96.0F;
-
-
-
/*package*/ EsdSourceDataLineGainControl()
{
super(FloatControl.Type.MASTER_GAIN, // or VOLUME ?
Index: kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java
diff -u kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:1.2 kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:1.3
--- kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:1.2 Mon Mar 22 11:25:44 2004
+++ kaffe/libraries/javalib/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java Fri Dec 10 21:34:58 2004
@@ -221,16 +221,6 @@
public class EsdTargetDataLineGainControl
extends FloatControl
{
- /*
- * These variables should be static. However, Java 1.1
- * doesn't allow this. So they aren't.
- */
- private /*static*/ final float MAX_GAIN = 90.0F;
- private /*static*/ final float MIN_GAIN = -96.0F;
-
- // TODO: recheck this value
- private /*static*/ final int GAIN_INCREMENTS = 1000;
-
// private float m_fGain;
// private boolean m_bMuted;
More information about the kaffe
mailing list