feat(dolbySound): enable/disable dolby sound in addon settings

diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 4921e3ce9b2e21296ea82611b9f036bdff9b1b42..c2f7040f0cd458024cafbc0c49f9fa95e80e4d49 100644 (file)
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -148,3 +148,8 @@ msgstr ""
 msgctxt "#30032"
 msgid "Tracking"
 msgstr ""
 msgctxt "#30032"
 msgid "Tracking"
 msgstr ""

+
+msgctxt "#30033"
+msgid "Use Dolby Sound"
+msgstr ""
+

diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index 53dceb46bad73d2bc26af9e7deef62cec8ce3d02..7b46a33a9787451ab171ac97a5dda10fa530a8c2 100644 (file)
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -148,3 +148,7 @@ msgstr "Export titel ändern"
 msgctxt "#30032"
 msgid "Tracking"
 msgstr "Tracking"
 msgctxt "#30032"
 msgid "Tracking"
 msgstr "Tracking"

+
+msgctxt "#30033"
+msgid "Use Dolby Sound"
+msgstr "Benutze Dolby Ton"

diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 9fdb8bff9584a28e238807365c5e8c31465dbe4c..43b5187e04cd07f835f62d22b5991f4ee2ef80dc 100644 (file)
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -186,6 +186,13 @@ class KodiHelper:
             'password': self.addon.getSetting('password')
         }
 
             'password': self.addon.getSetting('password')
         }
 

+    def get_dolby_setting(self):
+        """
+        Returns if the dolby sound is enabled
+        :return: True|False
+        """
+        return self.addon.getSetting('enable_dolby_sound') == 'true'
+

     def get_custom_library_settings (self):
         """Returns the settings in regards to the custom library folder(s)
 
     def get_custom_library_settings (self):
         """Returns the settings in regards to the custom library folder(s)
 


@@ -908,7 +915,7 @@ class KodiHelper:
         :return: None
         """
         # Check if tracking is enabled
         :return: None
         """
         # Check if tracking is enabled

-        enable_tracking = (self.addon.getSetting('enable_logging') == 'true')
+        enable_tracking = (self.addon.getSetting('enable_tracking') == 'true')

         if enable_tracking:
             #Get or Create Tracking id
             tracking_id = self.addon.getSetting('tracking_id')
         if enable_tracking:
             #Get or Create Tracking id
             tracking_id = self.addon.getSetting('tracking_id')

diff --git a/resources/lib/MSL.py b/resources/lib/MSL.py
index e2e7248f2da085dece0ff614d79f4358515f70c9..db9d68b4b94d5dfab0ab35a446f10303d07a04ce 100644 (file)
--- a/resources/lib/MSL.py
+++ b/resources/lib/MSL.py
@@ -147,8 +147,6 @@ class MSL:
 
                 # Audio
                 'heaac-2-dash',
 
                 # Audio
                 'heaac-2-dash',

-                'ddplus-2.0-dash',
-                'ddplus-5.1-dash',

                 'dfxp-ls-sdh',
                 'simplesdh',
                 'nflx-cmisc',
                 'dfxp-ls-sdh',
                 'simplesdh',
                 'nflx-cmisc',


@@ -171,6 +169,12 @@ class MSL:
             'clientVersion': '4.0004.899.011',
             'uiVersion': 'akira'
         }
             'clientVersion': '4.0004.899.011',
             'uiVersion': 'akira'
         }

+
+        # Check if dolby sound is enabled and add to profles
+        if self.kodi_helper.get_dolby_setting():
+            manifest_request_data['profiles'].append('ddplus-2.0-dash')
+            manifest_request_data['profiles'].append('ddplus-5.1-dash')
+

         request_data = self.__generate_msl_request_data(manifest_request_data)
         resp = self.session.post(self.endpoints['manifest'], request_data)
 
         request_data = self.__generate_msl_request_data(manifest_request_data)
         resp = self.session.post(self.endpoints['manifest'], request_data)
 

diff --git a/resources/settings.xml b/resources/settings.xml
index 8fdc9b450d1ccc506f4899467a5b00501226d093..5cb1f23972926511192eebd7631051a8d06e9c67 100644 (file)
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -10,8 +10,9 @@
     <setting id="customlibraryfolder" type="folder" label="30027" enable="eq(-1,true)" default="special://profile/addon_data/plugin.video.netflix" source="auto" option="writeable" subsetting="true" />
   </category>
   <category label="30023">
     <setting id="customlibraryfolder" type="folder" label="30027" enable="eq(-1,true)" default="special://profile/addon_data/plugin.video.netflix" source="auto" option="writeable" subsetting="true" />
   </category>
   <category label="30023">

+    <setting id="enable_dolby_sound" type="bool" label="30033" default="true"/>

     <setting id="ssl_verification" type="bool" label="30024" default="true"/>
     <setting id="ssl_verification" type="bool" label="30024" default="true"/>

-    <setting id="enable_logging" type="bool" label="30032" default="true"/>
+    <setting id="enable_tracking" type="bool" label="30032" default="true"/>

     <setting id="" value="tracking_id" visible="false"/>
     <setting id="msl_service_port" value="8000" visible="false"/>
     <setting id="msl_service_certificate" visible="false" value="Cr0CCAMSEOVEukALwQ8307Y2+LVP+0MYh/HPkwUijgIwggEKAoIBAQDm875btoWUbGqQD8eAGuBlGY+Pxo8YF1LQR+Ex0pDONMet8EHslcZRBKNQ/09RZFTP0vrYimyYiBmk9GG+S0wB3CRITgweNE15cD33MQYyS3zpBd4z+sCJam2+jj1ZA4uijE2dxGC+gRBRnw9WoPyw7D8RuhGSJ95OEtzg3Ho+mEsxuE5xg9LM4+Zuro/9msz2bFgJUjQUVHo5j+k4qLWu4ObugFmc9DLIAohL58UR5k0XnvizulOHbMMxdzna9lwTw/4SALadEV/CZXBmswUtBgATDKNqjXwokohncpdsWSauH6vfS6FXwizQoZJ9TdjSGC60rUB2t+aYDm74cIuxAgMBAAE6EHRlc3QubmV0ZmxpeC5jb20SgAOE0y8yWw2Win6M2/bw7+aqVuQPwzS/YG5ySYvwCGQd0Dltr3hpik98WijUODUr6PxMn1ZYXOLo3eED6xYGM7Riza8XskRdCfF8xjj7L7/THPbixyn4mULsttSmWFhexzXnSeKqQHuoKmerqu0nu39iW3pcxDV/K7E6aaSr5ID0SCi7KRcL9BCUCz1g9c43sNj46BhMCWJSm0mx1XFDcoKZWhpj5FAgU4Q4e6f+S8eX39nf6D6SJRb4ap7Znzn7preIvmS93xWjm75I6UBVQGo6pn4qWNCgLYlGGCQCUm5tg566j+/g5jvYZkTJvbiZFwtjMW5njbSRwB3W4CrKoyxw4qsJNSaZRTKAvSjTKdqVDXV/U5HK7SaBA6iJ981/aforXbd2vZlRXO/2S+Maa2mHULzsD+S5l4/YGpSt7PnkCe25F+nAovtl/ogZgjMeEdFyd/9YMYjOS4krYmwp3yJ7m9ZzYCQ6I8RQN4x/yLlHG5RH/+WNLNUs6JAZ0fFdCmw="/>
     <setting id="" value="tracking_id" visible="false"/>
     <setting id="msl_service_port" value="8000" visible="false"/>
     <setting id="msl_service_certificate" visible="false" value="Cr0CCAMSEOVEukALwQ8307Y2+LVP+0MYh/HPkwUijgIwggEKAoIBAQDm875btoWUbGqQD8eAGuBlGY+Pxo8YF1LQR+Ex0pDONMet8EHslcZRBKNQ/09RZFTP0vrYimyYiBmk9GG+S0wB3CRITgweNE15cD33MQYyS3zpBd4z+sCJam2+jj1ZA4uijE2dxGC+gRBRnw9WoPyw7D8RuhGSJ95OEtzg3Ho+mEsxuE5xg9LM4+Zuro/9msz2bFgJUjQUVHo5j+k4qLWu4ObugFmc9DLIAohL58UR5k0XnvizulOHbMMxdzna9lwTw/4SALadEV/CZXBmswUtBgATDKNqjXwokohncpdsWSauH6vfS6FXwizQoZJ9TdjSGC60rUB2t+aYDm74cIuxAgMBAAE6EHRlc3QubmV0ZmxpeC5jb20SgAOE0y8yWw2Win6M2/bw7+aqVuQPwzS/YG5ySYvwCGQd0Dltr3hpik98WijUODUr6PxMn1ZYXOLo3eED6xYGM7Riza8XskRdCfF8xjj7L7/THPbixyn4mULsttSmWFhexzXnSeKqQHuoKmerqu0nu39iW3pcxDV/K7E6aaSr5ID0SCi7KRcL9BCUCz1g9c43sNj46BhMCWJSm0mx1XFDcoKZWhpj5FAgU4Q4e6f+S8eX39nf6D6SJRb4ap7Znzn7preIvmS93xWjm75I6UBVQGo6pn4qWNCgLYlGGCQCUm5tg566j+/g5jvYZkTJvbiZFwtjMW5njbSRwB3W4CrKoyxw4qsJNSaZRTKAvSjTKdqVDXV/U5HK7SaBA6iJ981/aforXbd2vZlRXO/2S+Maa2mHULzsD+S5l4/YGpSt7PnkCe25F+nAovtl/ogZgjMeEdFyd/9YMYjOS4krYmwp3yJ7m9ZzYCQ6I8RQN4x/yLlHG5RH/+WNLNUs6JAZ0fFdCmw="/>