From ab9f2231d05bc0b7ab0f121d127854fda3fb71f3 Mon Sep 17 00:00:00 2001
From: amenkov <unknown>
Date: Thu, 7 Oct 2010 18:23:13 +0400
Subject: [PATCH] 6986335: 10 regtest failures (test/javax/sound/midi/Gervil)
 due AudioFloatConverter.PCM_FLOAT not found Reviewed-by: dav

---
 .../midi/Gervill/AudioFloatConverter/ToFloatArray.java    | 2 +-
 .../Gervill/SoftAudioSynthesizer/DummySourceDataLine.java | 8 ++++----
 .../midi/Gervill/SoftSynthesizer/DummySourceDataLine.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java b/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
index 639b9db34..52c0491f1 100644
--- a/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
+++ b/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java
@@ -47,7 +47,7 @@ public class ToFloatArray {
         for (int big = 0; big < 2; big+=1)
         for (int bits = 32; bits <= 64; bits+=32) {
             AudioFormat frm = new AudioFormat(
-                    AudioFloatConverter.PCM_FLOAT,
+                    AudioFormat.Encoding.PCM_FLOAT,
                     44100, bits, 1, bits/8,
                     44100, big==1);
             byte[] buff = new byte[testarray.length * frm.getFrameSize()];
diff --git a/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java b/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
index ae8ea1089..9f3ff0c95 100644
--- a/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
+++ b/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java
@@ -84,16 +84,16 @@ public class DummySourceDataLine implements SourceDataLine {
                         AudioSystem.NOT_SPECIFIED, bits, channels, channels
                                 * bits / 8, AudioSystem.NOT_SPECIFIED, true));
             }
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, true));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, true));
         }
diff --git a/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java b/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
index ae8ea1089..9f3ff0c95 100644
--- a/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
+++ b/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java
@@ -84,16 +84,16 @@ public class DummySourceDataLine implements SourceDataLine {
                         AudioSystem.NOT_SPECIFIED, bits, channels, channels
                                 * bits / 8, AudioSystem.NOT_SPECIFIED, true));
             }
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 32, channels, channels * 4,
                     AudioSystem.NOT_SPECIFIED, true));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, false));
-            formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT,
+            formats.add(new AudioFormat(Encoding.PCM_FLOAT,
                     AudioSystem.NOT_SPECIFIED, 64, channels, channels * 8,
                     AudioSystem.NOT_SPECIFIED, true));
         }
-- 
GitLab