We don't want to use drop_audio for output.graphics and output.sdl.

radioaktiv · Nov 4, 2019 · e908606 · e908606
1 parent 037de28
commit e908606
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/lang/lang.ml b/src/lang/lang.ml
@@ -184,6 +184,10 @@ let video_only =
   Constrained
     { Frame. audio = Fixed 0 ; video = Fixed 1 ; midi = Fixed 0 }
 
+let video =
+  Constrained
+    { Frame. audio = Any_fixed 0 ; video = Fixed 1 ; midi = Any_fixed 0 }
+
 let audio_video_any =
   Constrained
     { Frame. audio = Any_fixed 0 ; video = Any_fixed 0 ; midi = Fixed 0 }

diff --git a/src/lang/lang.mli b/src/lang/lang.mli
@@ -143,8 +143,12 @@ val audio_stereo : lang_kind_formats
 val audio_n : int -> lang_kind_formats
 val audio_variable : lang_kind_formats
 
+(** One video channel only. *)
 val video_only : lang_kind_formats
+(** [n] video channels only. *)
 val video_n : int -> lang_kind_formats
+(** One video channel, anything for other channels. *)
+val video : lang_kind_formats
 
 val midi_n : int -> lang_kind_formats
 val midi_only : lang_kind_formats

diff --git a/src/outputs/graphics_out.ml b/src/outputs/graphics_out.ml
@@ -53,7 +53,7 @@ object
 end
 
 let () =
-  let k = Lang.kind_type_of_kind_format ~fresh:1 Lang.video_only in
+  let k = Lang.kind_type_of_kind_format ~fresh:1 Lang.video in
   Lang.add_operator "output.graphics" ~active:true
     (Output.proto @ [
       "", Lang.source_t k, None, None

diff --git a/src/outputs/sdl_out.ml b/src/outputs/sdl_out.ml
@@ -97,7 +97,7 @@ object (self)
 end
 
 let () =
-  let k = Lang.kind_type_of_kind_format ~fresh:1 Lang.video_only in
+  let k = Lang.kind_type_of_kind_format ~fresh:1 Lang.video in
   Lang.add_operator "output.sdl" ~active:true
     (Output.proto @ [
       "", Lang.source_t k, None, None