[vlc-commits] upnp: attach slaves

Thomas Guillem git at videolan.org
Thu May 19 15:57:27 CEST 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue May  3 18:30:20 2016 +0200| [d12a46f3466d6565b83b525257e8d0edffb7871c] | committer: Thomas Guillem

upnp: attach slaves

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

 modules/services_discovery/upnp.cpp |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 2326b87..82538b1 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -876,6 +876,15 @@ bool MediaServer::addItem( IXML_Element* itemElement )
     if ( psz_albumArt != NULL )
         input_item_SetArtworkURL( p_item, psz_albumArt );
 
+    if ( psz_subtitles )
+    {
+        input_item_slave *p_slave =
+            input_item_slave_New( psz_subtitles, SLAVE_TYPE_SPU,
+                                  SLAVE_PRIORITY_MATCH_ALL );
+        if ( p_slave )
+            input_item_AddSlave( p_item, p_slave );
+    }
+
     input_item_CopyOptions( p_item, node_->p_item );
     input_item_node_AppendItem( node_, p_item );
     input_item_Release( p_item );



More information about the vlc-commits mailing list