From fc86e04861d3e93b9840a37dd8df77f037665a85 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 4 Jul 2020 12:26:06 -0500 Subject: [PATCH] Format RTSP paths exclusively in one place --- src/gst.rs | 6 +++--- src/main.rs | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gst.rs b/src/gst.rs index a070d5e..31afce7 100644 --- a/src/gst.rs +++ b/src/gst.rs @@ -32,7 +32,7 @@ impl RtspServer { } } - pub fn add_stream(&self, names: &[&str], stream_format: &StreamFormat) -> Result { + pub fn add_stream(&self, paths: &[&str], stream_format: &StreamFormat) -> Result { let mounts = self .server .get_mount_points() @@ -77,8 +77,8 @@ impl RtspServer { let _ = tx.send(app_src); // Receiver may be dropped, don't panic if so }); - for name in names { - mounts.add_factory(&format!("/{}", name), &factory); + for path in paths { + mounts.add_factory(path, &factory); } Ok(maybe_app_src) diff --git a/src/main.rs b/src/main.rs index 12394d9..161509a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,13 +74,16 @@ fn main() -> Result<(), Error> { // Set up each main and substream according to all the RTSP mount paths we support if arc_cam.stream == "both" || arc_cam.stream == "mainStream" { - let paths = &[&arc_cam.name, &*format!("{}/mainStream", arc_cam.name)]; + let paths = &[ + &*format!("/{}", arc_cam.name), + &*format!("/{}/mainStream", arc_cam.name), + ]; let mut output = rtsp.add_stream(paths, &stream_format).unwrap(); let main_camera = arc_cam.clone(); s.spawn(move |_| camera_loop(&*main_camera, "mainStream", &mut output)); } if arc_cam.stream == "both" || arc_cam.stream == "subStream" { - let paths = &[&*format!("{}/subStream", arc_cam.name)]; + let paths = &[&*format!("/{}/subStream", arc_cam.name)]; let mut output = rtsp.add_stream(paths, &substream_format).unwrap(); let sub_camera = arc_cam.clone(); s.spawn(move |_| camera_loop(&*sub_camera, "subStream", &mut output));