From 4bc32235dfb2e037a563948daf503ce2418d8bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 5 Jun 2018 19:03:21 +0200
Subject: [PATCH] Use best connection to chromecast

---
 server/public/assets/js/functions.js |  7 +++++++
 server/public/assets/js/listeners.js | 12 ++++++------
 server/public/assets/js/player.js    |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js
index 7ae15d0d..546cd417 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -435,6 +435,13 @@ function setup_no_connection_listener(){
     });
 }
 
+function updateChromecastMetadata() {
+    if(!chromecastAvailable) return;
+    var image = 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg';
+    if(Player.np.thumbnail) image = Player.np.thumbnail;
+    chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:Player.np.title, image: image, images: [image]});
+}
+
 function setup_now_playing_listener(){
     socket.on("np", Player.now_playing_listener);
 }
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index da00e801..db0edbdf 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -278,7 +278,7 @@ initializeCastApi = function() {
             case cast.framework.SessionState.SESSION_STARTED:
                 castSession = cast.framework.CastContext.getInstance().getCurrentSession();
                 castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener)
-                chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg', images: ['https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg']});
+                updateChromecastMetadata();
                 //chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
                 chromecastAvailable = true;
                 paused = false;
@@ -296,9 +296,9 @@ initializeCastApi = function() {
                 castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase(), source: videoSource, thumbnail: Player.np.thumbnail})
                 castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title, source: full_playlist[0].source, thumbnail: full_playlist[0].thumbnail})
 
-                if(Helper.mobilecheck()) {
+                //if(Helper.mobilecheck()) {
                     socket.emit("get_id");
-                }
+                //}
                 hide_native(1);
                 if(Helper.mobilecheck()) {
                     Player.playVideo();
@@ -311,7 +311,7 @@ initializeCastApi = function() {
             case cast.framework.SessionState.SESSION_RESUMED:
                 castSession = cast.framework.CastContext.getInstance().getCurrentSession();
                 castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener);
-                chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg', images: ['https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg']});
+                updateChromecastMetadata();
                 //chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
                 chromecastAvailable = true;
                 paused = false;
@@ -322,9 +322,9 @@ initializeCastApi = function() {
                 } catch(event){
                     _seekTo = seekTo;
                 }
-                if(Helper.mobilecheck()) {
+                //if(Helper.mobilecheck()) {
                     socket.emit("get_id");
-                }
+                //}
                 castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase(), source: videoSource, thumbnail: Player.np.thumbnail})
                 castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title, source: full_playlist[0].source, thumbnail: full_playlist[0].thumbnail})
                 hide_native(1);
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 075c33c0..93c0d581 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -85,6 +85,7 @@ var Player = {
                 Player.cueVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
             }
         }
+        updateChromecastMetadata();
     },
 
     setThumbnail: function(conf, video_id) {