changes.

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

diff --git a/Robust/src/Tests/ssJava/mp3decoder/Player.java b/Robust/src/Tests/ssJava/mp3decoder/Player.java
index 2c54b3d741cc763e31dd94a6e9fcf1f0fb202e71..d06bfb6ed98f5ce6c4b0a97320cb78a19affad5c 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/Player.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Player.java
@@ -112,7 +112,6 @@ public class Player {
   public boolean play(@LOC("IN") int frames) throws JavaLayerException {\r
     @LOC("IN") boolean ret = true;\r
 \r
-    int count = 0;\r
     SSJAVA: while (frames-- > 0 && ret) {\r
       ret = decodeFrame();\r
     }\r
@@ -171,8 +170,7 @@ public class Player {
    * \r
    * @return true if there are no more frames to decode, false otherwise.\r
    */\r
-  @LATTICE("O<TH,THISLOC=TH")\r
-  @RETURNLOC("O")\r
+  @LATTICE("C,O<THIS,THIS<IN,C*,THISLOC=THIS,RETURNLOC=O")\r
   protected boolean decodeFrame() throws JavaLayerException {\r
     try {\r
       // AudioDevice out = audio;\r
@@ -180,7 +178,7 @@ public class Player {
       // return false;\r
 \r
       // Header h = bitstream.readFrame();\r
-      Header h = BitstreamWrapper.readFrame();\r
+      @LOC("IN") Header h = BitstreamWrapper.readFrame();\r
 \r
       if (h == null)\r
         return false;\r
@@ -189,10 +187,10 @@ public class Player {
       decoder.decodeFrame(h);\r
 \r
       // eom debug\r
-      int sum = 0;\r
-      short[] outbuf = SampleBufferWrapper.getOutput().getBuffer();\r
+      @LOC("C") int sum = 0;\r
+      @LOC("C") short[] outbuf = SampleBufferWrapper.getBuffer();\r
       // short[] outbuf = output.getBuffer();\r
-      for (int i = 0; i < SampleBufferWrapper.getOutput().getBufferLength(); i++) {\r
+      for (@LOC("C") int i = 0; i < SampleBufferWrapper.getBufferLength(); i++) {\r
         // System.out.println(outbuf[i]);\r
         sum += outbuf[i];\r
       }\r