[vlc-commits] [Git][videolan/vlc][3.0.x] upnp: inherit SAT>IP options

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC


Commits:
307931a3 by Felix Paul Kühne at 2022-01-04T08:10:14+00:00
upnp: inherit SAT>IP options

This correctly deploys custom values set through mobile apps

(cherry picked from commit c9b8080252c3861ff2eded566d67d1e016f9f794)

- - - - -


1 changed file:

- modules/services_discovery/upnp.cpp


Changes:

=====================================
modules/services_discovery/upnp.cpp
=====================================
@@ -1,13 +1,17 @@
 /*****************************************************************************
  * upnp.cpp :  UPnP discovery module (libupnp)
  *****************************************************************************
- * Copyright (C) 2004-2016 VLC authors and VideoLAN
- * $Id$
+ * Copyright (C) 2004-2021 VLC authors and VideoLAN
  *
  * Authors: Rémi Denis-Courmont (original plugin)
  *          Christian Henz <henz # c-lab.de>
  *          Mirsal Ennaime <mirsal dot ennaime at gmail dot com>
  *          Hugo Beauzée-Luyssen <hugo at beauzee.fr>
+ *          Shaleen Jain <shaleen at jain.sh>
+ *          William Ung <william1.ung at epitech.eu>
+ *          Felix Paul Kühne <fkuehne # videolan.org>
+ *          Bastien Penavayre <swac31 at gmail.com>
+ *          Andreas Krug <akrug at arcor.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -587,7 +591,7 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
 {
     SD::MediaServerDesc* p_server = NULL;
 
-    char *psz_satip_channellist = config_GetPsz(m_sd, "satip-channelist");
+    char *psz_satip_channellist = var_InheritString( m_sd, "satip-channelist");
 
     /* In Auto mode, default to MasterList list from satip.info */
     bool automode = false;
@@ -608,7 +612,7 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
 
     /* Part 1: a user may have provided a custom playlist url */
     if (strcmp(psz_satip_channellist, "CustomList") == 0) {
-        char *psz_satip_playlist_url = config_GetPsz(m_sd, "satip-channellist-url" );
+        char *psz_satip_playlist_url = var_InheritString( m_sd, "satip-channellist-url" );
         if ( psz_satip_playlist_url ) {
             p_server = new(std::nothrow) SD::MediaServerDesc( psz_udn, psz_friendly_name, psz_satip_playlist_url, iconUrl );
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/307931a3d3282bb88bb7be5d7c7520de00a7a21f

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/307931a3d3282bb88bb7be5d7c7520de00a7a21f
You're receiving this email because of your account on code.videolan.org.