merged 1.1 branch into head

[mir.git] / source / mircoders / media / MediaHandlerRealAudio.java

diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index 5e5367b..c6f5d02 100755 (executable)
--- a/source/mircoders/media/MediaHandlerRealAudio.java
+++ b/source/mircoders/media/MediaHandlerRealAudio.java
@@ -29,31 +29,24 @@
  */
 package  mircoders.media;
 
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
+import java.io.File;
+import java.io.FileOutputStream;
 
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
 import mir.media.MediaHandler;
-import mir.misc.FileUtil;
 import mir.misc.StringUtil;
+import mir.util.IORoutines;
 
 
 
 /**
  * Handles realAudio .it manages the ram file.
  *
- * 03.2002 - reworked Realmedia handling. -mh
- *
- * @see mir.media.MediaHandlerGeneric
- * @see mir.media.MediaHandler
  * @author john <john@manifestor.org>, mh <heckmann@hbe.ca>
- * @version $Id: MediaHandlerRealAudio.java,v 1.21 2004/11/06 20:04:00 idfx Exp $
+ * @version $Id: MediaHandlerRealAudio.java,v 1.22 2007/04/08 21:46:35 idfx Exp $
  */
 
 
@@ -68,48 +61,27 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements MediaHan
     // first see if the file exists
     super.produce(ent, mediaTypeEnt);
 
-    String baseName = ent.getId();
     String date = ent.getFieldValue("date");
     String datePath = StringUtil.webdbDate2path(date);
-    String rtspDir = configuration.getString("Producer.RealMedia.Path");
     String rtspMediaHost = configuration.getString("Producer.RealMedia.Host");
 
     String RealMediaPointer = rtspMediaHost+ent.getFieldValue("publish_path");
     String RealMediaFile = datePath+ent.getId()+".ram";
     try {
-      //write an rm (ram?. -mh) file
-      FileUtil.write(super.getStoragePath()+"/"+RealMediaFile,
-                      new StringReader(RealMediaPointer), "US-ASCII");
+      //write a ram file
+
+      IORoutines.writeStream(RealMediaPointer, "us-ascii",
+          new FileOutputStream(getBaseStoragePath() + File.separator + datePath + File.separator + RealMediaFile));
+      reportChange(getBaseStoragePath() + File.separator + datePath + File.separator + RealMediaFile);
     }
     catch (Throwable e) {
-      logger.error("MediaHandlerRealAudio.produce: " + e.toString());
+      logger.error("Error while producing realmedia: " + e.toString(), e);
+
       throw new MediaFailure(e);
     }
   }
 
-  public List getURL(Entity ent, Entity mediaTypeEnt)
-  {
-    List theList = new Vector();
-
-    //String stringSize = ent.getFieldValue("size");
-    //int size = Integer.parseInt(stringSize, 10)/1024;
-    theList.add(ent);
-
-    String basePath=StringUtil.regexpReplace(ent.getFieldValue("publish_path"),
-                                            ".ra$","");
-
-    // @todo the texts ("title") below urgently need to be sanely localizaeble
-    // somehow
-    Map ramHash = new HashMap();
-    ramHash.put("publish_path", basePath+".ram");
-    ramHash.put("publish_server", configuration.getString("Producer.Media.Host"));
-    ramHash.put("title", "stream URL");
-    theList.add(ramHash);
-
-    return theList;
-  }
-
-  public String getStoragePath()
+  public String getBaseStoragePath()
   {
     return configuration.getString("Producer.RealMedia.Path");
   }