[vlc-commits] sout: chromecast: use stream info helpers in intf_sys_t

2018-07-24 Thread Filip Roséen
vlc/vlc-3.0 | branch: master | Filip Roséen  | Mon Jul 23 
19:56:59 2018 +0200| [0e6019f22a1fd6863d24fe9cbb1851860df5273b] | committer: 
Jean-Baptiste Kempf

sout: chromecast: use stream info helpers in intf_sys_t

These changes includes usage of the relevant stream info helpers.

It also adds an additional slash to the art URI, so that items can be
accessed through "/chromecast/unique/unique/art/$ID", where $ID
denotes the art-id as used in the implementation, instead of
"[...]/art$ID". This is not a change in behavior as the URIs passed to
the device is per session, and the device is given notice of the URI
by us, it does not probe it implicitly.

Signed-off-by: Thomas Guillem 
(cherry picked from commit d0ed421fb2f6760147dc29a814b661aadcc3dc2c)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 9e1ac6b368..94f5b988fa 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -310,14 +310,14 @@ void intf_sys_t::prepareHttpArtwork()
 {
 /* Same art: use the previous cached artwork url */
 assert( m_art_idx != 0 );
-ss_art_idx << "/art" << (m_art_idx - 1);
+ss_art_idx << getHttpArtRoot() << "/" << (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;
+ss_art_idx << getHttpArtRoot() << "/" << m_art_idx;
 m_art_idx++;
 
 vlc_mutex_unlock( _lock );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] sout: chromecast: use stream info helpers in intf_sys_t

2018-07-24 Thread Filip Roséen
vlc | branch: master | Filip Roséen  | Mon Jul 23 19:56:59 2018 
+0200| [d0ed421fb2f6760147dc29a814b661aadcc3dc2c] | committer: Jean-Baptiste 
Kempf

sout: chromecast: use stream info helpers in intf_sys_t

These changes includes usage of the relevant stream info helpers.

It also adds an additional slash to the art URI, so that items can be
accessed through "/chromecast/unique/unique/art/$ID", where $ID
denotes the art-id as used in the implementation, instead of
"[...]/art$ID". This is not a change in behavior as the URIs passed to
the device is per session, and the device is given notice of the URI
by us, it does not probe it implicitly.

Signed-off-by: Thomas Guillem 

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

 modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 2b0a0c2c34..739cfb0d59 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -310,14 +310,14 @@ void intf_sys_t::prepareHttpArtwork()
 {
 /* Same art: use the previous cached artwork url */
 assert( m_art_idx != 0 );
-ss_art_idx << "/art" << (m_art_idx - 1);
+ss_art_idx << getHttpArtRoot() << "/" << (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;
+ss_art_idx << getHttpArtRoot() << "/" << m_art_idx;
 m_art_idx++;
 
 vlc_mutex_unlock( _lock );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] sout: chromecast: use stream info helpers in intf_sys_t

2018-07-24 Thread Filip Roséen
vlc | branch: master | Filip Roséen  | Mon Jul 23 19:56:59 2018 
+0200| [23bc6c8813e3416ef2bcce32eab7fd94cc8a7d86] | committer: Thomas Guillem

sout: chromecast: use stream info helpers in intf_sys_t

These changes includes usage of the relevant stream info helpers.

--

It also adds an additional slash to the art URI, so that items can be
accessed through "/chromecast/unique/unique/art/$ID", where $ID
denotes the art-id as used in the implementation, instead of
"[...]/art$ID". This is not a change in behavior as the URIs passed to
the device is per session, and the device is given notice of the URI
by us, it does not probe it implicitly.

Signed-off-by: Thomas Guillem 

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

 modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 2b0a0c2c34..739cfb0d59 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -310,14 +310,14 @@ void intf_sys_t::prepareHttpArtwork()
 {
 /* Same art: use the previous cached artwork url */
 assert( m_art_idx != 0 );
-ss_art_idx << "/art" << (m_art_idx - 1);
+ss_art_idx << getHttpArtRoot() << "/" << (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;
+ss_art_idx << getHttpArtRoot() << "/" << m_art_idx;
 m_art_idx++;
 
 vlc_mutex_unlock( _lock );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits