projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some codeformatting, license for the new classes
[mir.git]
/
source
/
mircoders
/
media
/
MediaHandlerRealVideo.java
diff --git
a/source/mircoders/media/MediaHandlerRealVideo.java
b/source/mircoders/media/MediaHandlerRealVideo.java
index
47ece1f
..
3fa2826
100755
(executable)
--- a/
source/mircoders/media/MediaHandlerRealVideo.java
+++ b/
source/mircoders/media/MediaHandlerRealVideo.java
@@
-31,16
+31,15
@@
package mircoders.media;
package mircoders.media;
-import java.util.*;
import java.io.StringReader;
import java.io.StringReader;
-import freemarker.template.SimpleList;
+import mir.entity.Entity;
+import mir.media.MirMedia;
+import mir.media.MirMediaException;
+import mir.misc.FileUtil;
+import mir.misc.StringUtil;
import freemarker.template.SimpleHash;
import freemarker.template.SimpleHash;
-
-import mir.media.*;
-import mir.entity.*;
-import mir.misc.*;
-import mir.storage.*;
+import freemarker.template.SimpleList;
@@
-51,8
+50,8
@@
import mir.storage.*;
*
* @see mir.media.MediaHandlerGeneric
* @see mir.media.MirMedia
*
* @see mir.media.MediaHandlerGeneric
* @see mir.media.MirMedia
- * @author john <john@manifestor.org>, mh <
heckmann@hbe.ca
>
- * @version
11.10.2001
+ * @author john <john@manifestor.org>, mh <
mh@nadir.org
>
+ * @version
$Id: MediaHandlerRealVideo.java,v 1.14 2003/01/25 17:50:35 idfx Exp $
*/
*/
@@
-68,8
+67,8
@@
public class MediaHandlerRealVideo extends MediaHandlerVideo implements
String baseName = ent.getId();
String date = ent.getValue("date");
String datePath = StringUtil.webdbDate2path(date);
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";
String RealMediaPointer = rtspMediaHost+ent.getValue("publish_path");
String RealMediaFile = datePath+ent.getId()+".ram";
@@
-98,7
+97,7
@@
public class MediaHandlerRealVideo extends MediaHandlerVideo implements
// somehow
SimpleHash ramHash = new SimpleHash();
ramHash.put("publish_path", basePath+".ram");
// 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);
ramHash.put("title", "stream URL");
theList.add(ramHash);
@@
-108,17
+107,17
@@
public class MediaHandlerRealVideo extends MediaHandlerVideo implements
public String getStoragePath()
{
public String getStoragePath()
{
- return
MirConfig.getProp
("Producer.RealMedia.Path");
+ return
configuration.getString
("Producer.RealMedia.Path");
}
public String getDescr(Entity mediaType)
{
}
public String getDescr(Entity mediaType)
{
- return "RealMedia
Video
";
+ return "RealMedia";
}
public String getPublishHost()
{
}
public String getPublishHost()
{
- return
MirConfig.getProp("Producer.RealMedia.Host"
);
+ return
StringUtil.removeSlash(configuration.getString("Producer.RealMedia.Host")
);
}
}
}
}