[vlc-commits] chromecast: fix artworks never updated

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb  7 15:49:45 2018 +0100| [a96ac268a71dfa8a893c78bfe8037db21db04b95] | committer: Jean-Baptiste Kempf

chromecast: fix artworks never updated

We have to use a new url for each new artwork, because the CC will cache the
content.

(cherry picked from commit 16fbd47c2b1c87f61b9606fc3e6a14c0c85f2ac5)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a96ac268a71dfa8a893c78bfe8037db21db04b95
---

 modules/stream_out/chromecast/chromecast.h        |  1 +
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 44 +++++++++++++++++------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h b/modules/stream_out/chromecast/chromecast.h
index 920b679c76..1b84543cf3 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -265,6 +265,7 @@ private:
     httpd_file_t     *m_httpd_file;
     std::string       m_art_http_ip;
     char             *m_art_url;
+    unsigned          m_art_idx;
 
     /* local date when playback started/resumed, used by monotone clock */
     mtime_t           m_time_playback_started;
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index e78b05f040..2fc56f52ac 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -104,7 +104,9 @@ intf_sys_t::intf_sys_t(vlc_object_t * const p_this, int port, std::string device
  , m_meta( NULL )
  , m_ctl_thread_interrupt(p_interrupt)
  , m_httpd_host(httpd_host)
+ , m_httpd_file(NULL)
  , m_art_url(NULL)
+ , m_art_idx(0)
  , m_time_playback_started( VLC_TS_INVALID )
  , m_ts_local_start( VLC_TS_INVALID )
  , m_ts_seek( VLC_TS_INVALID )
@@ -115,10 +117,6 @@ intf_sys_t::intf_sys_t(vlc_object_t * const p_this, int port, std::string device
     vlc_cond_init( &m_stateChangedCond );
     vlc_cond_init( &m_pace_cond );
 
-    const char *psz_artmime = "application/octet-stream";
-    m_httpd_file = httpd_FileNew( m_httpd_host, "/art", psz_artmime, NULL, NULL,
-                                  httpd_file_fill_cb, (httpd_file_sys_t *) this );
-
     std::stringstream ss;
     ss << "http://" << m_communication.getServerIp() << ":" << port;
     m_art_http_ip = ss.str();
@@ -247,19 +245,45 @@ static int httpd_file_fill_cb( httpd_file_sys_t *data, httpd_file_t *http_file,
 
 void intf_sys_t::prepareHttpArtwork()
 {
-    if( !m_httpd_file )
-        return;
-
     const char *psz_art = m_meta ? vlc_meta_Get( m_meta, vlc_meta_ArtworkURL ) : NULL;
     /* Abort if there is no art or if the art is already served */
     if( !psz_art || strncmp( psz_art, "http", 4) == 0 )
         return;
 
-    free( m_art_url );
-    m_art_url = strdup( psz_art );
+    std::stringstream ss_art_idx;
+
+    if( m_art_url && strcmp( m_art_url, psz_art ) == 0 )
+    {
+        /* Same art: use the previous cached artwork url */
+        assert( m_art_idx != 0 );
+        ss_art_idx << "/art" << (m_art_idx - 1);
+    }
+    else
+    {
+        /* New art: create a new httpd file instance with a new url. The
+         * artwork has to be different since the CC will cache the content. */
+
+        ss_art_idx << "/art" << m_art_idx;
+        m_art_idx++;
+
+        vlc_mutex_unlock( &m_lock );
+
+        if( m_httpd_file )
+            httpd_FileDelete( m_httpd_file );
+        m_httpd_file = httpd_FileNew( m_httpd_host, ss_art_idx.str().c_str(),
+                                      "application/octet-stream", NULL, NULL,
+                                      httpd_file_fill_cb, (httpd_file_sys_t *) this );
+
+        vlc_mutex_lock( &m_lock );
+        if( !m_httpd_file )
+            return;
+
+        free( m_art_url );
+        m_art_url = strdup( psz_art );
+    }
 
     std::stringstream ss;
-    ss << m_art_http_ip << "/art";
+    ss << m_art_http_ip << ss_art_idx.str();
     vlc_meta_Set( m_meta, vlc_meta_ArtworkURL, ss.str().c_str() );
 }