X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fmedia%2FMediaHandlerRealAudio.java;h=62dc5a2be508e34025466f1e7b5f7a998feb6440;hb=c505321bf98713dd46373cb657fe2e7a7d01ff76;hp=23416a838d704214619055edbf8fa22c207711fc;hpb=7dd0a928f51603b7ab705933fb8d4c90ef7a2514;p=mir.git

diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index 23416a83..62dc5a2b 100755
--- a/source/mircoders/media/MediaHandlerRealAudio.java
+++ b/source/mircoders/media/MediaHandlerRealAudio.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,29 +18,28 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package  mircoders.media;
 
-import java.util.*;
 import java.io.StringReader;
 
-import freemarker.template.SimpleList;
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.media.MediaExc;
+import mir.media.MediaFailure;
+import mir.media.MirMedia;
+import mir.misc.FileUtil;
+import mir.misc.StringUtil;
 import freemarker.template.SimpleHash;
-
-import mir.media.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
+import freemarker.template.SimpleList;
 
 
 
@@ -52,15 +51,17 @@ import mir.storage.*;
  * @see mir.media.MediaHandlerGeneric
  * @see mir.media.MirMedia
  * @author john <john@manifestor.org>, mh <heckmann@hbe.ca>
- * @version $Id: MediaHandlerRealAudio.java,v 1.13 2002/11/28 07:28:24 mh Exp $
+ * @version $Id: MediaHandlerRealAudio.java,v 1.19 2003/04/21 12:42:48 idfx Exp $
  */
 
 
-public class MediaHandlerRealAudio extends MediaHandlerAudio implements
-  MirMedia
+public class MediaHandlerRealAudio extends MediaHandlerAudio implements MirMedia
 {
-  public void produce (Entity ent, Entity mediaTypeEnt )
-    throws MirMediaException {
+  public MediaHandlerRealAudio() {
+    logger = new LoggerWrapper("Media.Audio.Real");
+  }
+
+  public void produce (Entity ent, Entity mediaTypeEnt ) throws MediaExc, MediaFailure {
 
     // first see if the file exists
     super.produce(ent, mediaTypeEnt);
@@ -68,8 +69,8 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
     String baseName = ent.getId();
     String date = ent.getValue("date");
     String datePath = StringUtil.webdbDate2path(date);
-    String rtspDir = MirConfig.getProp("Producer.RealMedia.Path");
-    String rtspMediaHost = MirConfig.getProp("Producer.RealMedia.Host");
+    String rtspDir = configuration.getString("Producer.RealMedia.Path");
+    String rtspMediaHost = configuration.getString("Producer.RealMedia.Host");
 
     String RealMediaPointer = rtspMediaHost+ent.getValue("publish_path");
     String RealMediaFile = datePath+ent.getId()+".ram";
@@ -77,9 +78,10 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
       //write an rm (ram?. -mh) file
       FileUtil.write(super.getStoragePath()+"/"+RealMediaFile,
                       new StringReader(RealMediaPointer), "US-ASCII");
-    } catch (Exception e) {
-      theLog.printError(e.toString());
-      throw new MirMediaException(e.toString());
+    }
+    catch (Throwable e) {
+      logger.error("MediaHandlerRealAudio.produce: " + e.toString());
+      throw new MediaFailure(e);
     }
   }
 
@@ -90,7 +92,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
     //String stringSize = ent.getValue("size");
     //int size = Integer.parseInt(stringSize, 10)/1024;
     theList.add(ent);
-   
+
     String basePath=StringUtil.regexpReplace(ent.getValue("publish_path"),
                                             ".ra$","");
 
@@ -98,17 +100,16 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
     // somehow
     SimpleHash ramHash = new SimpleHash();
     ramHash.put("publish_path", basePath+".ram");
-    ramHash.put("publish_server", MirConfig.getProp("Producer.Media.Host"));
+    ramHash.put("publish_server", configuration.getString("Producer.Media.Host"));
     ramHash.put("title", "stream URL");
     theList.add(ramHash);
 
     return theList;
-
   }
 
   public String getStoragePath()
   {
-    return MirConfig.getProp("Producer.RealMedia.Path");
+    return configuration.getString("Producer.RealMedia.Path");
   }
 
   public String getDescr(Entity mediaType)
@@ -118,10 +119,10 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements
 
   public String getPublishHost()
   {
-    return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host"));
+    return StringUtil.removeSlash(configuration.getString("Producer.RealMedia.Host"));
   }
 
 }
-        
-        
+
+