[vlma-devel] commit: Add a new streaming strategy. (Adrien Maglo )

[git version control]

vlma | branch: master | Adrien Maglo <magsoft at videolan.org> | Thu Oct  9 23:02:15 2008 +0200| [3b4cc0ceefb569274898e6616c0b6e504a66ff09] | committer: Adrien Maglo 

Add a new streaming strategy.
Add also the rtsp port in the configuration file.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=3b4cc0ceefb569274898e6616c0b6e504a66ff09
---

 .../org/videolan/vlma/model/StreamingStrategy.java |    2 +-
 vlma-daemon/src/main/resources/config.properties   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/vlma-api/src/main/java/org/videolan/vlma/model/StreamingStrategy.java b/vlma-api/src/main/java/org/videolan/vlma/model/StreamingStrategy.java
index 044c1f4..cd7346e 100644
--- a/vlma-api/src/main/java/org/videolan/vlma/model/StreamingStrategy.java
+++ b/vlma-api/src/main/java/org/videolan/vlma/model/StreamingStrategy.java
@@ -35,7 +35,7 @@ public class StreamingStrategy implements Serializable {
     private static final long serialVersionUID = -75919931677731393L;
 
     public static enum Protocol {
-        UDP_MULTICAST, HTTP;
+        UDP_MULTICAST, HTTP, VOD;
     }
 
     public static enum Announcement {
diff --git a/vlma-daemon/src/main/resources/config.properties b/vlma-daemon/src/main/resources/config.properties
index 8cb33a6..8a127bb 100644
--- a/vlma-daemon/src/main/resources/config.properties
+++ b/vlma-daemon/src/main/resources/config.properties
@@ -35,6 +35,7 @@ vlma.notification.cpu_load.threshold = 5.0
 vlma.notification.vlc_cpu.threshold = 80.0
 vlma.notification.vlc_mem.threshold = 80.0
 vlma.streaming.http.port = 8001
+vlma.streaming.rtsp.port = 5554
 vlma.streaming = UDP_MULTICAST
 vlma.streaming.udp.ipbank.min = 239.255.0.1
 vlma.streaming.udp.ipbank.max = 239.255.255.255