fix(chromecast): resolve issue with play_next

tsirysndr · Feb 4, 2023 · 125840e · 125840e
1 parent e0a4b15
commit 125840e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/graphql/src/lib.rs b/graphql/src/lib.rs
@@ -201,13 +201,23 @@ pub fn update_tracks_url<T: RemoteCoverUrl + RemoteTrackUrl>(
     }
 }
 
-pub fn update_track_url<T: RemoteTrackUrl>(devices: Vec<Device>, result: T) -> Result<T, Error> {
+pub fn update_track_url<T: RemoteTrackUrl>(
+    devices: Vec<Device>,
+    result: T,
+    will_play_on_chromecast: bool,
+) -> Result<T, Error> {
     let base_url = match devices
         .clone()
         .into_iter()
         .find(|device| device.is_current_device)
     {
-        Some(device) => Some(format!("http://{}:{}", device.host, device.port)),
+        Some(device) => {
+            let host = match will_play_on_chromecast {
+                true => device.ip,
+                false => device.host,
+            };
+            Some(format!("http://{}:{}", host, device.port))
+        }
         None => None,
     };
 

diff --git a/graphql/src/schema/tracklist.rs b/graphql/src/schema/tracklist.rs
@@ -296,7 +296,7 @@ impl TracklistMutation {
         if device.receiver.is_some() {
             let receiver = device.receiver.as_mut().unwrap();
             let will_play_on_chromecast = receiver.device_type() == "chromecast";
-            track = update_track_url(devices.clone(), track)?;
+            track = update_track_url(devices.clone(), track, will_play_on_chromecast)?;
             let t: types::Track = track.into();
             track = update_cover_url(devices.clone(), t.clone(), will_play_on_chromecast)
                 .unwrap_or_else(|_| t.clone())