Changeset 6668

Timestamp:

06/20/09 12:55:39 (15 months ago)

Author:

dbaelde

Message:

Remove the "strict" parameter of random(), replacing random(strict=true)
by the new operator rotate(). This is probably clearer.

Files:

• trunk/liquidsoap/src/operators/switch.ml (modified) (3 diffs)

trunk/liquidsoap/src/operators/switch.ml

@@ -455 +455 @@
 
 let () =
-    Lang.add_operator "random" ~category:Lang.TrackProcessing
+  let add name strict descr weight_descr =
+    Lang.add_operator name ~descr ~category:Lang.TrackProcessing
       (common @
        [ "weights", Lang.list_t Lang.int_t, Some (Lang.list []),
-         Some "Weights of the children in the choice." ;
-         "strict", Lang.bool_t, Some (Lang.bool false),
-         Some "Do not use random but cycle over the uniform distribution." ;
+         Some weight_descr ;
          "", Lang.list_t Lang.source_t, None, None ])
-      ~descr:"At the beginning of every track, select a random ready child."
       (fun p _ ->
          let children = Lang.to_source_list (List.assoc "" p) in
@@ -473 +471 @@
              Utils.make_list (List.length children) 1
          in
-         let strict = Lang.to_bool (List.assoc "strict" p) in
          let children =
            if List.length weights <> List.length children then
@@ -488 +485 @@
          in
            new random ~replay_meta strict ts children)
+  in
+    add "random" false
+      "At the beginning of every track, select a random ready child."
+      "Weights of the children (padded with 1), defining for each child \
+       the probability that it is selected." ;
+    add "rotate" true
+      "Rotate between the sources."
+      "Weights of the children (padded with 1), defining for each child \
+       how many tracks are played from it per round, if that many are \
+       actually available."