From c9b8080252c3861ff2eded566d67d1e016f9f794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sun, 26 Dec 2021 09:28:42 +0100
Subject: [PATCH] upnp: inherit SAT>IP options
This correctly deploys custom values set through mobile apps
---
modules/services_discovery/upnp.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 8b5c508d0a68..24cfb03b2bff 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1,7 +1,7 @@
/*****************************************************************************
* upnp.cpp : UPnP discovery module (libupnp)
*****************************************************************************
- * Copyright (C) 2004-2018 VLC authors and VideoLAN
+ * Copyright (C) 2004-2021 VLC authors and VideoLAN
*
* Authors: Rémi Denis-Courmont (original plugin)
* Christian Henz <henz # c-lab.de>
@@ -9,6 +9,9 @@
* Hugo Beauzée-Luyssen <hugo@beauzee.fr>
* Shaleen Jain <shaleen@jain.sh>
* William Ung <william1.ung@epitech.eu>
+ * Felix Paul Kühne <fkuehne # videolan.org>
+ * Bastien Penavayre <swac31@gmail.com>
+ * Andreas Krug <akrug@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
@@ -642,7 +645,7 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
{
SD::MediaServerDesc* p_server = NULL;
- char *psz_satip_channellist = config_GetPsz("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;
@@ -663,7 +666,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( "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 );
--
GitLab