changes: taking decoder initilization out from ssjava loop since it is called only...

[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 b4048110abcf6530a85506b18686c9ab9b4597df..b0f2356088df75a59dfb3aa96e022c5d92812c0e 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/Player.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Player.java
@@ -19,7 +19,7 @@
  */\r
 \r
 \r
-import java.io.InputStream;\r
+//import java.io.InputStream;\r
 \r
        \r
 /**\r
@@ -67,32 +67,40 @@ public class Player
 \r
        private int                     lastPosition = 0;\r
        \r
+       private Header header;\r
+       \r
        /**\r
         * Creates a new <code>Player</code> instance. \r
         */\r
        public Player(InputStream stream) throws JavaLayerException\r
        {\r
-               //this(stream, null);   \r
+               this(stream, null);     \r
        }\r
 \r
-       /* temporarily disabled by eom\r
+\r
        public Player(InputStream stream, AudioDevice device) throws JavaLayerException\r
        {\r
                bitstream = new Bitstream(stream);              \r
                decoder = new Decoder();\r
+               \r
+               // decoder initialization\r
+               // taking out from ssjava loop \r
+               header = bitstream.readFrame();  \r
+               decoder.initialize(header, bitstream);\r
                                \r
-               if (device!=null)\r
-               {               \r
-                       audio = device;\r
-               }\r
-               else\r
-               {                       \r
-                       FactoryRegistry r = FactoryRegistry.systemRegistry();\r
-                       audio = r.createAudioDevice();\r
-               }\r
-               audio.open(decoder);\r
+//             if (device!=null)\r
+//             {               \r
+//                     audio = device;\r
+//             }\r
+//             else\r
+//             {                       \r
+//                     FactoryRegistry r = FactoryRegistry.systemRegistry();\r
+//                     audio = r.createAudioDevice();\r
+//             }\r
+               \r
+               device.open(decoder);\r
        }\r
-       */\r
+       \r
        \r
        public void play() throws JavaLayerException\r
        {\r
@@ -110,7 +118,7 @@ public class Player
        {\r
                boolean ret = true;\r
                \r
-           SSJAVA:\r
+            SSJAVA:\r
                while (frames-- > 0 && ret)\r
                {\r
                        ret = decodeFrame();                    \r
@@ -206,13 +214,13 @@ public class Player
                        //if (out==null)\r
                        //      return false;\r
 \r
-                       Header h = bitstream.readFrame();       \r
-                       \r
-                       if (h==null)\r
-                               return false;\r
+//                     Header h = bitstream.readFrame();       \r
+//                     \r
+//                     if (h==null)\r
+//                             return false;\r
                                \r
                        // sample buffer set when decoder constructed\r
-                       SampleBuffer output = (SampleBuffer)decoder.decodeFrame(h, bitstream);\r
+                       SampleBuffer output = (SampleBuffer)decoder.decodeFrame(header, bitstream);\r
                                                                                                                                                                                                                                                                                                        \r
                        //synchronized (this)\r
                        //{\r
@@ -248,6 +256,5 @@ public class Player
 */             \r
                return true;\r
        }\r
-\r
        \r
 }\r