aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalP <crystalp@kodi.tv>2024-10-12 13:28:38 -0400
committerCrystalP <crystalp@kodi.tv>2024-10-12 14:22:07 -0400
commit48cf6651503676da464c388bfb6b253b8e76eea0 (patch)
tree09330530812e5d8601163f65d4fe57de01787d72
parentb4e65aaef8ce82de38caaa3185fa4dad16bc93c2 (diff)
[UPnP] no external subs scan for url pushed to renderer
-rw-r--r--xbmc/cores/VideoPlayer/VideoPlayer.cpp3
-rw-r--r--xbmc/network/upnp/UPnPRenderer.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
index 1deb7d2ba7..b182b6ec20 100644
--- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp
+++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -795,7 +795,8 @@ bool CVideoPlayer::OpenInputStream()
// find any available external subtitles
std::vector<std::string> filenames;
- if (!URIUtils::IsUPnP(m_item.GetPath()))
+ if (!URIUtils::IsUPnP(m_item.GetPath()) &&
+ !m_item.GetProperty("no-ext-subs-scan").asBoolean(false))
CUtil::ScanForExternalSubtitles(m_item.GetDynPath(), filenames);
// load any subtitles from file item
diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp
index acf6296d3b..196824fbee 100644
--- a/xbmc/network/upnp/UPnPRenderer.cpp
+++ b/xbmc/network/upnp/UPnPRenderer.cpp
@@ -686,6 +686,7 @@ NPT_Result CUPnPRenderer::PlayMedia(const NPT_String& uri,
}
else
{
+ item->SetProperty("no-ext-subs-scan", true);
CFileItemList* l = new CFileItemList; //don't delete,
l->Add(std::make_shared<CFileItem>(*item));
CServiceBroker::GetAppMessenger()->PostMsg(TMSG_MEDIA_PLAY, -1, -1, static_cast<void*>(l));