Document physical inputs and outputs for NDI+Live Mix.

The new layout is all stereo, 3x Main, the rest are Voice.

icedreammusic/ardour/NDI and Live Mix/README.md

@@ -0,0 +1,19 @@
+# NDI + Live Mix Ardour project
+
+- Audio interface: Steinberg UR-44
+
+## Physical connections
+
+### Inputs
+
+- Input Front 1: *unused*
+- Input Front 2: RODE NT-USB *via 3.5mm* - goes to **Local Mic**
+- Input Front 3: RODE NT1 5th gen *via XLR, +48V* - goes to **Local Mic**
+- Input Front 4: *unused*
+- Input Back 1: Denon Prime 4 L - goes to **DJ Mix**
+- Input Back 2: Denon Prime 4 R - goes to **DJ Mix**
+
+### Outputs
+
+- Output Front Headphones 1: **Mix 1** - for previewing processed output
+- Output Front Headphones 2: **Mix 2** - for previewing unprocessed output

icedreammusic/liquidsoap/metadata_api.liq

@@ -5,9 +5,6 @@
 metadata_api_hostname = environment.get(default="icedream-bitwave", "METADATA_API_HOSTNAME")
 
 def setup_harbor_metadata_api(~metadata_api_port=21338, ~id="", s) =
-    # HACK - work around https://github.com/savonet/liquidsoap/issues/2996
-    id = if id != "" then id else s.id() end
-
     s = drop_metadata(s) # stream metadata wipes out own data
     s = insert_metadata(s)
 

icedreammusic/liquidsoap/stream.liq

@@ -101,7 +101,7 @@ setup_harbor_stream_api(internal_icecast(
 setup_harbor_stream_api(internal_icecast(
     id="out_a_int_mp3_96",
     mount="/outa/mp3_96",
-    start=false,
+    start=true,
     format="audio/mpeg",
     encoding="ISO-8859-1",
     %ffmpeg(
@@ -192,7 +192,7 @@ if null.defined(streaminginternet_username) and null.defined(streaminginternet_p
         name=null.get(stream_name),
         description=null.get(stream_description),
         password=null.get(streaminginternet_password),
-        start=true,
+        start=false,
         %ogg(%flac),
         a,
     ))

icedreammusic/liquidsoap/stream_api.liq

@@ -30,15 +30,27 @@ def setup_harbor_stream_api(s) =
         ], data=json.stringify([]))
     end
 
+    def normalize_float(f) =
+        if float.is_infinite(f) or float.is_nan(f) then
+            0.
+        else
+            f
+        end
+    end
+
     def on_info(_) =
-        data = [
+        data = {
-            ("id", s.id()),
+            duration = normalize_float(s.duration()),
-            ("last_metadata", json.stringify(s.last_metadata())),
+            elapsed = normalize_float(s.elapsed()),
-            ("is_up", json.stringify(s.is_up())),
+            id = s.id(),
-            ("is_started", json.stringify(s.is_started())),
+            is_active = s.is_active(),
-            ("is_ready", json.stringify(s.is_ready())),
+            is_ready = s.is_ready(),
-            ("is_active", json.stringify(s.is_active())),
+            is_started = s.is_started(),
-        ]
+            is_up = s.is_up(),
+            last_metadata = s.last_metadata(),
+            remaining = normalize_float(s.remaining()),
+            time = normalize_float(s.time()),
+        }
         http.response(status_code=200, headers=[
             ("content-type","application/json"),
         ], data=json.stringify(data))