[Red5commits] [1565] fixed compilation errors in new location

[jbauch]

fixed compilation errors in new location


Timestamp: 11/22/06 16:31:26 EST (2 months ago) 
Change: 1565 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/test/org/red5/server/io/test/CuePointInjectionTest.java
java/server/trunk/test/org/red5/server/io/test/FLVServiceImplTest.java
java/server/trunk/test/org/red5/server/io/test/MetaDataInjectionTest.java
java/server/trunk/test/org/red5/server/io/test/MetaServiceTest.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1565

Index: /java/server/trunk/test/org/red5/server/io/test/MetaDataInjectionTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/io/test/MetaDataInjectionTest.java (revision 581)
+++ /java/server/trunk/test/org/red5/server/io/test/MetaDataInjectionTest.java (revision 1565)
@@ -31,10 +31,10 @@
 
 import org.apache.mina.common.ByteBuffer;
+import org.red5.io.ITag;
+import org.red5.io.ITagReader;
+import org.red5.io.ITagWriter;
 import org.red5.io.amf.Output;
 import org.red5.io.flv.IFLV;
 import org.red5.io.flv.IFLVService;
-import org.red5.io.flv.IReader;
-import org.red5.io.flv.ITag;
-import org.red5.io.flv.IWriter;
 import org.red5.io.flv.impl.FLVService;
 import org.red5.io.flv.impl.Tag;
@@ -79,15 +79,15 @@
 		
 		// Use service to grab FLV file
-		IFLV flv = service.getFLV(f);
+		IFLV flv = (IFLV) service.getStreamableFile(f);
 		
 		// Grab a writer for writing a new FLV
-		IWriter writer = flv.writer();
+		ITagWriter writer = flv.getWriter();
 		
 		// Create a reader for testing
 		File readfile = new File("tests/test_cue.flv");
-		IFLV readflv = service.getFLV(readfile);
+		IFLV readflv = (IFLV) service.getStreamableFile(readfile);
 		
 		// Grab a reader for reading a FLV in
-		IReader reader = readflv.reader();
+		ITagReader reader = readflv.getReader();
 		
 		// Inject MetaData
@@ -102,5 +102,5 @@
 	 * @throws IOException
 	 */
-	private void writeTagsWithInjection(IReader reader, IWriter writer) throws IOException {
+	private void writeTagsWithInjection(ITagReader reader, ITagWriter writer) throws IOException {
 				
 		IMetaCue cp = new MetaCue();
Index: /java/server/trunk/test/org/red5/server/io/test/MetaServiceTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/io/test/MetaServiceTest.java (revision 607)
+++ /java/server/trunk/test/org/red5/server/io/test/MetaServiceTest.java (revision 1565)
@@ -50,5 +50,5 @@
 		// set the MetaData
 		File tmp = new File("tests/test.flv");
-		IFLV flv = service.getFLV(tmp);
+		IFLV flv = (IFLV) service.getStreamableFile(tmp);
 		flv.setMetaService(metaService);
 		flv.setMetaData(meta);
Index: /java/server/trunk/test/org/red5/server/io/test/CuePointInjectionTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/io/test/CuePointInjectionTest.java (revision 581)
+++ /java/server/trunk/test/org/red5/server/io/test/CuePointInjectionTest.java (revision 1565)
@@ -39,4 +39,7 @@
 
 import org.apache.mina.common.ByteBuffer;
+import org.red5.io.ITag;
+import org.red5.io.ITagReader;
+import org.red5.io.ITagWriter;
 import org.red5.io.amf.AMF;
 import org.red5.io.amf.Output;
@@ -44,6 +47,4 @@
 import org.red5.io.flv.IFLVService;
 import org.red5.io.flv.impl.FLVService;
-import org.red5.io.flv.IReader;
-import org.red5.io.flv.ITag;
 import org.red5.io.flv.impl.Tag;
 import org.red5.io.flv.meta.MetaCue;
@@ -51,5 +52,4 @@
 import org.red5.io.flv.meta.ICueType;
 import org.red5.io.flv.meta.MetaData;
-import org.red5.io.flv.IWriter;
 import org.red5.io.object.Deserializer;
 import org.red5.io.object.Serializer;
@@ -93,15 +93,15 @@
 		
 		// Use service to grab FLV file
-		IFLV flv = service.getFLV(f);
+		IFLV flv = (IFLV) service.getStreamableFile(f);
 		
 		// Grab a writer for writing a new FLV
-		IWriter writer = flv.writer();
+		ITagWriter writer = flv.getWriter();
 		
 		// Create a reader for testing
 		File readfile = new File("tests/test_cue.flv");
-		IFLV readflv = service.getFLV(readfile);
+		IFLV readflv = (IFLV) service.getStreamableFile(readfile);
 		
 		// Grab a reader for reading a FLV in
-		IReader reader = readflv.reader();
+		ITagReader reader = readflv.getReader();
 		
 		// Inject MetaData
@@ -116,5 +116,5 @@
 	 * @throws IOException
 	 */
-	private void writeTagsWithInjection(IReader reader, IWriter writer) throws IOException {
+	private void writeTagsWithInjection(ITagReader reader, ITagWriter writer) throws IOException {
 				
 		IMetaCue cp = new MetaCue();
Index: /java/server/trunk/test/org/red5/server/io/test/FLVServiceImplTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/io/test/FLVServiceImplTest.java (revision 607)
+++ /java/server/trunk/test/org/red5/server/io/test/FLVServiceImplTest.java (revision 1565)
@@ -35,4 +35,7 @@
 
 import org.apache.mina.common.ByteBuffer;
+import org.red5.io.ITag;
+import org.red5.io.ITagReader;
+import org.red5.io.ITagWriter;
 import org.red5.io.amf.Output;
 import org.red5.io.flv.IFLV;
@@ -40,9 +43,6 @@
 import org.red5.io.flv.IFLVService;
 import org.red5.io.flv.impl.FLVService;
-import org.red5.io.flv.IReader;
-import org.red5.io.flv.ITag;
 import org.red5.io.flv.impl.Tag;
 import org.red5.io.flv.meta.MetaData;
-import org.red5.io.flv.IWriter;
 import org.red5.io.object.Deserializer;
 import org.red5.io.object.Serializer;
@@ -109,7 +109,7 @@
 		File f = new File("tests/test.flv");
 		System.out.println("test: " + f);
-		IFLV flv = service.getFLV(f);	
+		IFLV flv = (IFLV) service.getStreamableFile(f);	
 		System.out.println("test: " + flv);
-		IReader reader = flv.reader();
+		ITagReader reader = flv.getReader();
 		System.out.println("test: " + reader);
 		ITag tag = null;
@@ -202,5 +202,5 @@
 	*/
 	
-	private void writeTags(IReader reader, IWriter writer) throws IOException {
+	private void writeTags(ITagReader reader, ITagWriter writer) throws IOException {
 		
 		ITag tag = null;


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.