diff options
| author | CrystalP <crystalp@kodi.tv> | 2024-10-13 13:23:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-13 13:23:25 -0400 |
| commit | 5e098e7ed111df083fbf26c52f6f0bd0bc4c6c7a (patch) | |
| tree | c118f1929acdaf499335b359e003db05d50a8b8e | |
| parent | 0e77a3663ed6825755e9db453f566b126f54289c (diff) | |
| parent | 48cf6651503676da464c388bfb6b253b8e76eea0 (diff) | |
Merge pull request #25827 from CrystalP/no-ext-subs-upnp-renderer
[UPnP] Do not scan for external subs for UPnP renderer
| -rw-r--r-- | xbmc/cores/VideoPlayer/VideoPlayer.cpp | 3 | ||||
| -rw-r--r-- | xbmc/network/upnp/UPnPRenderer.cpp | 1 |
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)); |