more changes to pass the flow-down rule

[IRC.git] / Robust / src / Tests / ssJava / mp3decoder / Decoder.java

diff --git a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
index febbd7c8d933328d404ab0ad30c0047a1428abb8..944868477e6c7bb3a0a154121b9436ff5ac92020 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
@@ -26,7 +26,7 @@
  * @version 0.0.7 12/12/99\r
  * @since 0.0.5\r
  */\r
-@LATTICE("OUT<DE,DE<FILTER,FILTER<FACTORS,FACTORS<EQ,EQ<PARAM,PARAM<INIT")\r
+@LATTICE("OUT<DE,DE<FILTER,FILTER<FACTORS,FACTORS<EQ,EQ<PARAM,PARAM<H,H<INIT,PARAM*,INIT*")\r
 @METHODDEFAULT("THIS,THISLOC=THIS,RETURNLOC=THIS")\r
 public class Decoder implements DecoderErrors {\r
 \r
@@ -139,14 +139,14 @@ public class Decoder implements DecoderErrors {
    * @return A SampleBuffer containing the decoded samples.\r
    */\r
   @LATTICE("THIS<VAR,THISLOC=THIS,VAR*")\r
-  public void decodeFrame(@LOC("VAR") Header header) throws DecoderException {\r
+  public void decodeFrame(@LOC("THIS,Decoder.H") Header header) throws DecoderException {\r
 \r
     if (!initialized) {\r
       @LOC("VAR") float scalefactor = 32700.0f;\r
 \r
-      @LOC("VAR") int mode = header.mode();\r
-      @LOC("VAR") int layer = header.layer();\r
-      @LOC("VAR") int channels = mode == Header.SINGLE_CHANNEL ? 1 : 2;\r
+      @LOC("THIS,Decoder.PARAM") int mode = header.mode();\r
+      @LOC("THIS,Decoder.PARAM") int layer = header.layer();\r
+      @LOC("THIS,Decoder.PARAM") int channels = mode == Header.SINGLE_CHANNEL ? 1 : 2;\r
 \r
       // set up output buffer if not set up by client.\r
       // if (output == null)\r
@@ -171,9 +171,9 @@ public class Decoder implements DecoderErrors {
       initialized = true;\r
     }\r
 \r
-    SampleBufferWrapper.getOutput().clear_buffer();\r
-    l3decoder.decodeFrame(header);\r
-    SampleBufferWrapper.getOutput().write_buffer(1);\r
+    SampleBufferWrapper.clear_buffer();\r
+    l3decoder.decode(header);\r
+    // SampleBufferWrapper.getOutput().write_buffer(1);\r
 \r
   }\r
 \r