From bfe7c990be02dd3ff38b068efcc9cb47ff48e907 Mon Sep 17 00:00:00 2001
From: Sebastian S <su4lfred@gmail.com>
Date: Sat, 13 Jul 2019 07:57:06 +0200
Subject: [PATCH] added option to hide the OSD during volume change for better
 subtitle compatiblity

---
 language/resource.language.en_gb/strings.po | 5 +++++
 xml/DialogVolumeBar.xml                     | 2 +-
 xml/Embuary_SkinSettings.xml                | 6 ++++++
 xml/MusicVisualisation.xml                  | 2 +-
 xml/VideoFullScreen.xml                     | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index df8ab477..c0d01377 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -1862,3 +1862,8 @@ msgstr ""
 msgctxt "#31368"
 msgid "Blurring strength"
 msgstr ""
+
+#: /xml/Embuary_SkinSettings.xml
+msgctxt "#31369"
+msgid "Hide player OSD during volume change"
+msgstr ""
diff --git a/xml/DialogVolumeBar.xml b/xml/DialogVolumeBar.xml
index c5bf1de8..50eb1a68 100644
--- a/xml/DialogVolumeBar.xml
+++ b/xml/DialogVolumeBar.xml
@@ -10,7 +10,7 @@
 		</control>
 		<!-- Dialog -->
 		<control type="group">
-			<visible>!VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)</visible>
+			<visible>[!VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] | Skin.HasSetting(DefaultVolume)</visible>
 			<animation type="WindowOpen" reversible="false">
 				<effect type="slide" start="0,-200" end="0,0" delay="100" tween="circle" easin="out" time="400" />
 				<effect type="fade" delay="160" end="100" time="400" />
diff --git a/xml/Embuary_SkinSettings.xml b/xml/Embuary_SkinSettings.xml
index c7af60d8..8fd770fc 100644
--- a/xml/Embuary_SkinSettings.xml
+++ b/xml/Embuary_SkinSettings.xml
@@ -660,6 +660,12 @@
 			<onclick>Skin.ToggleSetting(FancyLyrics)</onclick>
 			<enable>System.HasAddon(script.cu.lrclyrics)</enable>
 		</control>
+		<control type="radiobutton" id="$PARAM[id]14">
+			<include>SettingsButton</include>
+			<label>$LOCALIZE[31369]</label>
+			<selected>Skin.HasSetting(DefaultVolume)</selected>
+			<onclick>Skin.ToggleSetting(DefaultVolume)</onclick>
+		</control>
 		<!-- library and media -->
 		<include content="SkinSettingsHeadlineLabel">
 			<param name="id" value="$PARAM[id]20"/>
diff --git a/xml/MusicVisualisation.xml b/xml/MusicVisualisation.xml
index 79d87520..5cbb2119 100644
--- a/xml/MusicVisualisation.xml
+++ b/xml/MusicVisualisation.xml
@@ -19,7 +19,7 @@
 		</control>
 		<!-- OSD -->
 		<control type="group" id="99">
-			<visible>Window.IsVisible(musicosd) | Window.IsVisible(seekbar) | Player.Paused | [Window.IsVisible(volumebar) + !Player.Muted] | !String.IsEmpty(Window(home).Property(showvisinfo))</visible>
+			<visible>Window.IsVisible(musicosd) | Window.IsVisible(seekbar) | Player.Paused | [Window.IsVisible(volumebar) + !Player.Muted + !Skin.HasSetting(DefaultVolume)] | !String.IsEmpty(Window(home).Property(showvisinfo))</visible>
 			<animation effect="fade" start="0" end="100" time="0">Visible</animation>
 			<animation effect="fade" start="100" end="0" time="400" delay="2000">Hidden</animation>
 			<!--Top-->
diff --git a/xml/VideoFullScreen.xml b/xml/VideoFullScreen.xml
index 3860e138..9b832952 100644
--- a/xml/VideoFullScreen.xml
+++ b/xml/VideoFullScreen.xml
@@ -33,7 +33,7 @@
 		<!-- OSD -->
 		<control type="group" id="99">
 			<visible>!Player.HasGame</visible>
-			<visible>[Window.IsVisible(videoosd) | Window.IsVisible(seekbar) | Player.Paused | Player.ShowTime | [Window.IsVisible(volumebar) + !Player.Muted] | !String.IsEmpty(Window(home).Property(showvideoinfo))] + !Window.IsVisible(sliderdialog)</visible>
+			<visible>[Window.IsVisible(videoosd) | Window.IsVisible(seekbar) | Player.Paused | Player.ShowTime | [Window.IsVisible(volumebar) + !Player.Muted + !Skin.HasSetting(DefaultVolume)] | !String.IsEmpty(Window(home).Property(showvideoinfo))] + !Window.IsVisible(sliderdialog)</visible>
 			<animation effect="fade" start="0" end="100" time="0">Visible</animation>
 			<animation effect="fade" start="100" end="0" time="400" delay="2000">Hidden</animation>
 			<animation effect="fade" start="100" end="0" time="0" condition="Window.IsVisible(playerprocessinfo) | Window.IsVisible(pvrosdchannels) | Window.IsVisible(Teletext) | Window.IsVisible(sliderdialog) | Window.IsVisible(shutdownmenu) | Window.IsVisible(videobookmarks) | !String.IsEmpty(Window(home).Property(service.upnext.dialog)) | [$EXP[HideVideoOSD] + !$EXP[PlayerSeek] + !Window.IsVisible(videoosd)]">Conditional</animation>