[vlma-devel] commit: Add a "type" to StreamingStrategy. (Adrien Grand )

git version control git at videolan.org
Mon Nov 10 01:17:41 CET 2008


vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sun Nov  9 21:59:44 2008 +0100| [28625a29feb692bc1eb5f7068947975c55c6c6e9] | committer: Adrien Grand 

Add a "type" to StreamingStrategy.

Only Broadcast and VoD are supported for the moment. This field is the
same as what is supplied to VLM when programming a media
(new (name) vod|broadcast|schedule).

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

 .../main/java/org/videolan/vlma/model/Order.java   |   16 ++++-
 .../org/videolan/vlma/model/StreamingStrategy.java |   29 ++++++++-
 .../java/org/videolan/vlma/VLMaServiceImpl.java    |    7 +-
 .../org/videolan/vlma/order/FilesOrderSender.java  |    4 +-
 .../java/org/videolan/vlma/order/OrderSender.java  |    9 ++-
 ...odStreamWatcher.java => RtspStreamWatcher.java} |   10 ++--
 .../vlma/watcher/StreamWatcherDispatcher.java      |   10 ++--
 .../java/org/videolan/vlma/VLMaServiceTest.java    |    2 +-
 vlma-daemon/src/main/resources/config.properties   |    1 +
 vlma-daemon/src/main/resources/daemon.xml          |    4 +-
 .../videolan/vlma/web/media/MediaProgramAdd.java   |   65 ++++++++++++--------
 .../vlma/web/media/MediaProgramAddController.java  |   20 +++---
 vlma-webapp/src/main/resources/messages.properties |    1 +
 .../src/main/resources/messages_fr.properties      |    1 +
 .../WEB-INF/jsp/media/mediaprogramadd_right.jsp    |   56 +++++++++++++++--
 15 files changed, 168 insertions(+), 67 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlma.git/?a=commitdiff;h=28625a29feb692bc1eb5f7068947975c55c6c6e9


More information about the vlma-devel mailing list