Fix broken AVTransport

Fixes issue #59

CHANGELOG.md

@@ -1,5 +1,8 @@
 # swyh-rs Changelog
 
+- 1.3.25 (May 4 2022 dheijl)
+  - Fix broken AVTransport (again), fixes issue #59
+
 - 1.3.24 (April 20 2022 dheijl)
   - refactor rendering control code (pull up common OH and AV play template generation)  
   - explicit stop playing for Openhome renderers too before starting play, Moode needs it

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 authors = ["dheijl <[email protected]>"]
 edition = "2021"
 name = "swyh-rs"
-version = "1.3.24"
+version = "1.3.25"
 description = "Stream What You Hear written in Rust"
 license = "MIT"
 repository = "https://github.com/dheijl/swyh-rs/"
@@ -19,7 +19,7 @@ bitflags = "1.3.2"
 cpal = "0.13.5"
 crossbeam-channel = "0.5.4"
 dirs = "4.0.0"
-fltk = { version = "1.3.5", features = ["use-ninja"] }
+fltk = { version = "1.3.6", features = ["use-ninja"] }
 #fltk-flow = "0.1.4"
 htmlescape = "0.3.1"
 ifcfg = "0.1.2"
@@ -43,7 +43,7 @@ xml-rs = "0.8.4"
 winapi = { version = "0.3.9", features = ["winuser", "std"] }
 winres = "0.1.12"
 [target.'cfg(unix)'.dependencies]
-libc = "0.2.124"
+libc = "0.2.125"
 
 [patch.crates-io]
 #fltk = { git = "https://github.com/fltk-rs/fltk-rs" }

src/openhome/rendercontrol.rs

@@ -232,7 +232,6 @@ impl Renderer {
         // build the hashmap with the formatting vars for the OH and AV play templates
         let mut fmt_vars = HashMap::new();
         let (host, port) = self.parse_url(&self.dev_url, log);
-        let url = format!("http://{host}:{port}{}", self.oh_control_url);
         let addr = format!("{local_addr}:{server_port}");
         let local_url = format!("http://{addr}/stream/swyh.wav");
         fmt_vars.insert("server_uri".to_string(), local_url);
@@ -273,6 +272,7 @@ impl Renderer {
             .supported_protocols
             .contains(SupportedProtocols::OPENHOME)
         {
+            let url = format!("http://{host}:{port}{}", self.oh_control_url);
             log(format!(
             "OH Start playing on {} host={host} port={port} from {local_addr} using OpenHome Playlist",
             self.dev_name));
@@ -281,6 +281,7 @@ impl Renderer {
             .supported_protocols
             .contains(SupportedProtocols::AVTRANSPORT)
         {
+            let url = format!("http://{host}:{port}{}", self.av_control_url);
             log(format!(
             "AV Start playing on {} host={host} port={port} from {local_addr} using AvTransport Play",
             self.dev_name));

swyh-rs.iss

@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=swyh-rs
-AppVersion=1.3.24
+AppVersion=1.3.25
 WizardStyle=modern
 DefaultDirName={autopf}\swyh-rs
 DefaultGroupName=swyh-rs