[matroska] r866 - trunk/JEBML/src/org/ebml/matroska/jmf

Author: jcsston
Date: 2004-10-07 13:22:33 +0400 (Thu, 07 Oct 2004)
New Revision: 866

Modified:
   trunk/JEBML/src/org/ebml/matroska/jmf/JMFPullSourceStreamDataSource.java
   trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexer.java
   trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexerTrack.java
Log:
Updated JMF Input Plugin to MatroskaFile reading class changes.

Modified: trunk/JEBML/src/org/ebml/matroska/jmf/JMFPullSourceStreamDataSource.java
===================================================================
--- trunk/JEBML/src/org/ebml/matroska/jmf/JMFPullSourceStreamDataSource.java	2004-10-07 08:15:33 UTC (rev 865)
+++ trunk/JEBML/src/org/ebml/matroska/jmf/JMFPullSourceStreamDataSource.java	2004-10-07 09:22:33 UTC (rev 866)
@@ -1,6 +1,7 @@
 package org.ebml.matroska.jmf;
 
-import org.ebml.DataSource;
+import org.ebml.*;
+import org.ebml.io.*;
 
 /**
  * <p>Title: JEBML</p>
@@ -94,4 +95,4 @@
     }
     return -1;
   }
-}
\ No newline at end of file
+}

Modified: trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexer.java
===================================================================
--- trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexer.java	2004-10-07 08:15:33 UTC (rev 865)
+++ trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexer.java	2004-10-07 09:22:33 UTC (rev 866)
@@ -1,6 +1,6 @@
 package org.ebml.matroska.jmf;
 
-import org.ebml.matroska.MatroskaFile;
+import org.ebml.matroska.*;
 import java.io.*;
 import java.util.*;
 import javax.media.*;
@@ -134,7 +134,7 @@
       seekable = file.isSeekable();
     }
     ArrayList demuxTracks = new ArrayList();
-    MatroskaFile.MatroskaFileTrack [] fileTracks = file.getTrackList();
+    MatroskaFileTrack [] fileTracks = file.getTrackList();
     for (int t = 0; t < fileTracks.length; t++) {
       MatroskaDemultiplexerTrack track = new MatroskaDemultiplexerTrack(file, fileTracks[t].TrackNo);
       if (track.isEnabled())
@@ -301,4 +301,4 @@
        return null;
    }
 
-}
\ No newline at end of file
+}

Modified: trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexerTrack.java
===================================================================
--- trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexerTrack.java	2004-10-07 08:15:33 UTC (rev 865)
+++ trunk/JEBML/src/org/ebml/matroska/jmf/MatroskaDemultiplexerTrack.java	2004-10-07 09:22:33 UTC (rev 866)
@@ -1,6 +1,6 @@
 package org.ebml.matroska.jmf;
 
-import org.ebml.matroska.MatroskaFile;
+import org.ebml.matroska.*;
 import javax.media.Track;
 import javax.media.Format;
 import javax.media.Time;
@@ -32,7 +32,7 @@
   }
 
   public void init() {
-    MatroskaFile.MatroskaFileTrack track = file.getTrack(TrackNo);
+    MatroskaFileTrack track = file.getTrack(TrackNo);
     if (track.CodecID.compareTo("V_MS/VFW/FOURCC") == 0) {
 
     } else if (track.CodecID.compareTo("A_MPEG/L3") == 0) {
@@ -64,7 +64,7 @@
   }
   public void readFrame(Buffer buffer) {
     //System.out.println("MatroskaDemultiplexerTrack.readFrame(buffer = " + buffer + ")");
-    MatroskaFile.MatroskaFrame frame = file.getNextFrame(TrackNo);
+    MatroskaFileFrame frame = file.getNextFrame(TrackNo);
     if (frame == null) {
       buffer.setDiscard(true);
       buffer.setEOM(true);
@@ -96,4 +96,4 @@
   public Time getDuration() {
     return new Time(file.getDuration());
   }
-}
\ No newline at end of file
+}