annotated

[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 ffafed306bd0d687aa6e6cae2d8e60563ae8a28a..4d0643597566c589f0be1a28abdebc9c0fc3ecaa 100644 (file)
--- a/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
+++ b/Robust/src/Tests/ssJava/mp3decoder/Decoder.java
@@ -34,7 +34,7 @@ public class Decoder implements DecoderErrors
        /**\r
         * The Bistream from which the MPEG audio frames are read.\r
         */\r
-       //private Bitstream                             stream;\r
+       private Bitstream                               stream;\r
        \r
        /**\r
         * The Obuffer instance that will receive the decoded\r
@@ -134,7 +134,7 @@ public class Decoder implements DecoderErrors
        {\r
                if (!initialized)\r
                {\r
-                       initialize(header);\r
+                   initialize(header,stream);\r
                }\r
                \r
                int layer = header.layer();\r
@@ -262,7 +262,7 @@ public class Decoder implements DecoderErrors
                return decoder;\r
        }\r
        \r
-       private void initialize(Header header)\r
+        public void initialize(Header header, Bitstream stream)\r
                throws DecoderException\r
        {\r
                \r
@@ -287,7 +287,17 @@ public class Decoder implements DecoderErrors
 \r
                outputChannels = channels;\r
                outputFrequency = header.frequency();\r
-               \r
+\r
+               l3decoder = new LayerIIIDecoder(stream, header, filter1, filter2, \r
+                                               output, OutputChannels.BOTH_CHANNELS);\r
+               l2decoder = new LayerIIDecoder();\r
+               l2decoder.create(stream, header, filter1, filter2, \r
+                                output, OutputChannels.BOTH_CHANNELS);\r
+\r
+               l1decoder = new LayerIDecoder();\r
+               l1decoder.create(stream,header, filter1, filter2, \r
+                                output, OutputChannels.BOTH_CHANNELS); \r
+\r
                initialized = true;\r
        }\r
        \r