Beginning of un updated developer documentation and beginning of playlist documentation

[vlc] / doc / vlm.txt

diff --git a/doc/vlm.txt b/doc/vlm.txt
index 51b22a33e845b45cf8752053c93e067b17033641..72e4950c8a4e172686998b41852fae442490ab56 100644 (file)
--- a/doc/vlm.txt
+++ b/doc/vlm.txt
@@ -61,8 +61,10 @@ Note: an element is a media or a schedule.
         "del all" destroys all elements.
         "del media" destroys all medias.
         "del schedule" destroys all schedules.
-    control (name) (command)
-        Changes the state of the (name) media.
+    control (name) [instance_name] (command)
+        Changes the state of the (instance_name) instance of (name) media.
+        If (instance_name) is not specified, the control command affects the
+        default instance.
         See Commands section for more information.
     save (config_file)
         Saves all media and schedule configurations in the (config_file)
@@ -100,6 +102,12 @@ Note: an element is a media or a schedule.
             If a media with "loop" option receives the "play" command
             and finally finishes to play the last input of the list, it
             will automatically restart to play the input list.
+        mux (mux_name)
+            Used for vod only.
+            Only needs to be specified if you want the elementary streams
+            to be sent encapsulated instead of raw. The (mux_name) should be
+            a fourcc describing the encapsulation type (eg. mp2t for MPEG TS,
+            or mp2t for MPEG PS).
 
     Schedule Properties Syntax:
         enabled|disabled