diff options
| -rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 13 | ||||
| -rw-r--r-- | system/settings/settings.xml | 8 | ||||
| -rw-r--r-- | xbmc/network/upnp/UPnPInternal.cpp | 8 |
3 files changed, 24 insertions, 5 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index e7244d13bf..bd6f4967fd 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -10287,7 +10287,12 @@ msgctxt "#20221" msgid "With this enabled, any information that is downloaded for albums and artists will override anything you have set in your song tags, such as genres, year, song artists etc. Useful if you have MusicBrainz identifiers in your song tags." msgstr "" -#empty strings from id 20222 to 20239 +#: system/settings/settings.xml +msgctxt "#20222" +msgid "Look for external subtitles" +msgstr "" + +#empty strings from id 20223 to 20239 #: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20240" @@ -15845,7 +15850,11 @@ msgctxt "#36419" msgid "Define locations used for retrieving weather information." msgstr "" -#empty string with id 36420 +#. Description of setting "Services -> UPnP -> Look for external subtitles" with label #20222 +#: system/settings/settings.xml +msgctxt "#36420" +msgid "Look for external subtitles for videos provided by the UPnP server. This can cause extensive CPU, filesystem and network load." +msgstr "" #. Description of setting "Videos -> Playback -> Prefer VDPAU Video Mixer" with label #13437 #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 323a2f14ac..5911ebc953 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2168,6 +2168,14 @@ </dependencies> <control type="toggle" /> </setting> + <setting id="services.upnplookforexternalsubtitles" type="boolean" parent="services.upnpserver" label="20222" help="36420"> + <level>2</level> + <default>false</default> + <dependencies> + <dependency type="enable" setting="services.upnpserver">true</dependency> + </dependencies> + <control type="toggle" /> + </setting> <setting id="services.upnpcontroller" type="boolean" parent="services.upnpserver" label="21361" help="36326"> <level>1</level> <default>false</default> diff --git a/xbmc/network/upnp/UPnPInternal.cpp b/xbmc/network/upnp/UPnPInternal.cpp index d14b891783..db2f740907 100644 --- a/xbmc/network/upnp/UPnPInternal.cpp +++ b/xbmc/network/upnp/UPnPInternal.cpp @@ -615,10 +615,12 @@ BuildObject(CFileItem& item, } } - // look for and add external subtitle if we are being called by a UPnP - // player or renderer and we are processing a video file + // look for and add external subtitle if we are processing a video file and + // we are being called by a UPnP player or renderer or the user has chosen + // to look for external subtitles if (upnp_server != NULL && item.IsVideo() && - (upnp_service == UPnPPlayer || upnp_service == UPnPRenderer)) + (upnp_service == UPnPPlayer || upnp_service == UPnPRenderer || + CSettings::Get().GetBool("services.upnplookforexternalsubtitles"))) { // find any available external subtitles std::vector<std::string> filenames; |