Changeset 7144

Timestamp:

02/09/10 00:01:28 (7 months ago)

Author:

dbaelde

Message:

Fix #remaining in input.harbor/http: infinity when relaying, and the amount
of buffered data only when not streaming.
Also fix the max>buffer check: the case of equality is also non-functional.

Location:

trunk/liquidsoap/src/sources

Files:

• harbor_input.ml (modified) (3 diffs)
• http_source.ml (modified) (3 diffs)

trunk/liquidsoap/src/sources/harbor_input.ml

@@ -36 +36 @@
   inherit Generated.source
             (Generator.create ~overfull:(`Drop_old max_ticks) `Undefined)
-            ~empty_on_abort:false ~bufferize
+            ~empty_on_abort:false ~bufferize as generated
 
   val mutable relaying = false
@@ -195 +195 @@
   method is_taken = relaying
 
+  method remaining =
+    if relaying then
+      if buffering then 0 else -1
+    else
+      generated#remaining
+
 end
 
@@ -304 +310 @@
          let bufferize = Lang.to_float (List.assoc "buffer" p) in
          let max = Lang.to_float (List.assoc "max" p) in
-         if bufferize > max then
+         if bufferize >= max then
            raise (Lang.Invalid_value
                     (List.assoc "max" p,

trunk/liquidsoap/src/sources/http_source.ml

@@ -194 +194 @@
     Generated.source
       (Generator.create ~overfull:(`Drop_old max_ticks) `Undefined)
-      ~empty_on_abort:false ~bufferize
+      ~empty_on_abort:false ~bufferize as generated
 
   method stype = Source.Fallible
@@ -448 +448 @@
   method sleep = poll_should_stop <- true
 
+  method remaining =
+    if relaying then
+      if buffering then 0 else -1
+    else
+      generated#remaining
+
 end
 
@@ -546 +552 @@
        let timeout = Lang.to_float (List.assoc "timeout" p) in
        let max = Lang.to_float (List.assoc "max" p) in
-       if bufferize > max then
+       if bufferize >= max then
          raise (Lang.Invalid_value
                   (List.assoc "max" p,