Merge a0896f9 into 1520ab8

CHANGELOG.md

@@ -1,14 +1,17 @@
+* [v3.10.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.10.0):
+  * Small fix in SDH vs Forced flags checking.
+
 * [v3.9.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.9.0):
-  * Improve SDH and forced preferences handling.
+  * Improve SDH and Forced preferences handling.
 
 * [v3.8.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.8.0):
   * Switch to new OpenSubtitles API.
     Note: username and password are now mandatory for using OpenSubtitles.
   * Fixes for Brazilian Portuguese language codes handling.
 
 * [v3.7.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.7.0):
-  * New option to auto select and enable embedded subtitles (was previously always enabled)
-  * New option to prefer forced subtitles on auto selection (was previously always enabled)
+  * New option to auto-select and enable embedded subtitles (was previously always enabled)
+  * New option to prefer Forced subtitles on auto selection (was previously always enabled)
   * New option to prefer SDH subtitles on auto selection
 
 * [v3.6.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-3.6.0):

a4kSubtitles/service.py

@@ -34,7 +34,7 @@ def update_sub_stream():
 
                 player_props = core.kodi.get_kodi_player_subtitles()
                 prefer_sdh = core.kodi.get_bool_setting('general', 'prefer_sdh')
-                prefer_forced = core.kodi.get_bool_setting('general', 'prefer_forced')
+                prefer_forced = not prefer_sdh and core.kodi.get_bool_setting('general', 'prefer_forced')
 
                 preferredlang_code = core.utils.get_lang_id(preferredlang, core.kodi.xbmc.ISO_639_2)
                 sub_langs = [core.utils.get_lang_id(s, core.kodi.xbmc.ISO_639_2) for s in core.kodi.xbmc.Player().getAvailableSubtitleStreams()]

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="3.9.0"
+       version="3.10.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -27,17 +27,20 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed
             <screenshot>screenshot-03.png</screenshot>
         </assets>
         <news>
+[v3.10.0]:
+  * Small fix in SDH vs Forced flags checking.
+
 [v3.9.0]:
-  * Improve SDH and forced preferences handling.
+  * Improve SDH and Forced preferences handling.
 
 [v3.8.0]:
   * Switch to new OpenSubtitles API.
     Note: username and password are now mandatory for using OpenSubtitles.
   * Fixes for Brazilian Portuguese language codes handling.
 
 [v3.7.0]:
-  * New option to auto select and enable embedded subtitles (was previously always enabled)
-  * New option to prefer forced subtitles on auto selection (was previously always enabled)
+  * New option to auto-select and enable embedded subtitles (was previously always enabled)
+  * New option to prefer Forced subtitles on auto selection (was previously always enabled)
   * New option to prefer SDH subtitles on auto selection
 
 [v3.6.0]:

packages/addons.xml

@@ -4,7 +4,7 @@
 <addons>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="3.9.0"
+       version="3.10.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -30,17 +30,20 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed
             <screenshot>screenshot-03.png</screenshot>
         </assets>
         <news>
+[v3.10.0]:
+  * Small fix in SDH vs Forced flags checking.
+
 [v3.9.0]:
-  * Improve SDH and forced preferences handling.
+  * Improve SDH and Forced preferences handling.
 
 [v3.8.0]:
   * Switch to new OpenSubtitles API.
     Note: username and password are now mandatory for using OpenSubtitles.
   * Fixes for Brazilian Portuguese language codes handling.
 
 [v3.7.0]:
-  * New option to auto select and enable embedded subtitles (was previously always enabled)
-  * New option to prefer forced subtitles on auto selection (was previously always enabled)
+  * New option to auto-select and enable embedded subtitles (was previously always enabled)
+  * New option to prefer Forced subtitles on auto selection (was previously always enabled)
   * New option to prefer SDH subtitles on auto selection
 
 [v3.6.0]:

packages/addons.xml.crc

@@ -1 +1 @@
-6582014433a07252903058d4001b3c47fc848b8b
+ca69f2639d18af6217c1ba22a035da181608040c