From c48a1f2bcc1d7c79c9d47b1c29d0cb9e5fa15313 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 4 Apr 2018 12:42:02 +0300
Subject: [PATCH] cleanup after adsp removal

---
 720p/DialogAddonSettings.xml   |   3 +-
 720p/DialogAudioDSPManager.xml | 559 ---------------------------------
 720p/DialogSettings.xml        |   3 +-
 720p/MusicOSD.xml              |  17 +-
 720p/MusicVisualisation.xml    |  64 +---
 720p/VideoFullScreen.xml       |  20 +-
 720p/VideoOSD.xml              |  11 +-
 7 files changed, 12 insertions(+), 665 deletions(-)
 delete mode 100644 720p/DialogAudioDSPManager.xml

diff --git a/720p/DialogAddonSettings.xml b/720p/DialogAddonSettings.xml
index cbc0aa0..609457a 100644
--- a/720p/DialogAddonSettings.xml
+++ b/720p/DialogAddonSettings.xml
@@ -9,8 +9,7 @@
 	<controls>
 		<control type="group">
 			<animation effect="fade" start="100" end="0" time="150" condition="Window.Is(contentsettings) + Window.IsActive(AddonSettings)">Conditional</animation>
-			<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(OSDAudioDSPSettings) |  Window.IsVisible(FileBrowser)]">Conditional</animation>
-			<animation effect="fade" start="100" end="0" time="400" condition="Window.Is(osdaudiodspsettings) + Window.IsVisible(SliderDialog)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) |  Window.IsVisible(FileBrowser)]">Conditional</animation>
 			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="850" />
 				<param name="DialogBackgroundHeight" value="600" />
diff --git a/720p/DialogAudioDSPManager.xml b/720p/DialogAudioDSPManager.xml
deleted file mode 100644
index e772cba..0000000
--- a/720p/DialogAudioDSPManager.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog">
-	<zorder>1</zorder>
-	<defaultcontrol>9000</defaultcontrol>
-	<include>dialogeffect</include>
-	<coordinates>
-		<left>40</left>
-		<top>40</top>
-	</coordinates>
-	<controls>
-		<include>BehindDialogFadeOut</include>
-		<control type="image">
-			<left>0</left>
-			<top>0</top>
-			<width>1200</width>
-			<height>640</height>
-			<texture border="40">$VAR[SelectBack]</texture>
-		</control>
-		<control type="group">
-			<left>0</left>
-			<top>0</top>
-			<width>1200</width>
-			<height>40</height>
-			<control type="button">
-				<description>dialog close button</description>
-				<left>1120</left>
-				<top>15</top>
-				<width>64</width>
-				<height>32</height>
-				<label></label>
-				<font></font>
-				<onclick>PreviousMenu</onclick>
-				<texturefocus>DialogCloseButton-focus.png</texturefocus>
-				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<visible>system.getbool(input.enablemouse)</visible>
-				<include>VisibleFadeEffect</include>
-			</control>
-			<control type="image">
-				<description>dialog header image</description>
-				<centerleft>600</centerleft>
-				<top>16</top>
-				<width>1140</width>
-				<height>40</height>
-				<texture>dialogheader.png</texture>
-			</control>
-			<control type="label">
-				<description>window header label</description>
-				<left>0</left>
-				<top>20</top>
-				<width>1200</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>$LOCALIZE[15020]</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-		</control>
-		<control type="list" id="9000">
-			<description>processing mode selection list</description>
-			<left>30</left>
-			<top>70</top>
-			<width>1140</width>
-			<height>40</height>
-			<onup>9001</onup>
-			<ondown>200</ondown>
-			<onleft>9000</onleft>
-			<onright>9000</onright>
-			<orientation>horizontal</orientation>
-			<scrolltime tween="sine" easing="out">200</scrolltime>
-			<itemlayout width="228" height="40">
-				<control type="image">
-					<left>0</left>
-					<top>0</top>
-					<width>228</width>
-					<height>40</height>
-					<texture border="5">button-nofocus.png</texture>
-				</control>
-				<control type="label">
-					<posx>5</posx>
-					<posy>0</posy>
-					<width>218</width>
-					<height>40</height>
-					<textcolor>grey3</textcolor>
-					<font>font13_title</font>
-					<aligny>center</aligny>
-					<align>center</align>
-					<label>$INFO[ListItem.Label]</label>
-					<scroll>false</scroll>
-					<scrollspeed>0</scrollspeed>
-				</control>
-			</itemlayout>
-			<focusedlayout width="228" height="40">
-				<control type="image">
-					<left>0</left>
-					<top>0</top>
-					<width>228</width>
-					<height>40</height>
-					<texture border="5">button-focus2.png</texture>
-					<animation effect="fade" start="100" end="50" time="0" condition="!Control.HasFocus(9000)">conditional</animation>
-				</control>
-				<control type="label">
-					<posx>5</posx>
-					<posy>0</posy>
-					<width>218</width>
-					<height>40</height>
-					<textcolor>white</textcolor>
-					<font>font13_title</font>
-					<aligny>center</aligny>
-					<align>center</align>
-					<label>$INFO[ListItem.Label]</label>
-					<scroll>false</scroll>
-					<scrollspeed>0</scrollspeed>
-				</control>
-			</focusedlayout>
-		</control>
-		<control type="group">
-			<description>white borders and mode description</description>
-			<left>30</left>
-			<top>109</top>
-			<width>1140</width>
-			<height>500</height>
-			<control type="image">
-				<description>blue border</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>1140</width>
-				<height>500</height>
-				<texture border="5">button-focus3.png</texture>
-				<colordiffuse>80FFFFFF</colordiffuse>
-			</control>
-			<control type="label">
-				<description>current mode description label</description>
-				<left>10</left>
-				<top>0</top>
-				<width>1120</width>
-				<height>30</height>
-				<font>font12</font>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<selectedcolor>selected</selectedcolor>
-				<label>$INFO[Container(9000).ListItem.Label2]</label>
-			</control>
-		</control>
-		<control type="group" id="200">
-			<description>available- and active mode lists</description>
-			<left>30</left>
-			<top>150</top>
-			<width>1140</width>
-			<height>500</height>
-			<ondown>9001</ondown>
-			<onup>9000</onup>
-			<control type="group">
-				<description>available modes group</description>
-				<left>0</left>
-				<top>0</top>
-				<width>570</width>
-				<height>360</height>
-				<control type="label">
-					<description>blue available modes</description>
-					<left>25</left>
-					<top>2</top>
-					<width>550</width>
-					<height>30</height>
-					<font>font12_title</font>
-					<label>$LOCALIZE[15050] ($INFO[Container(20).NumItems])</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<textcolor>blue</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="image">
-					<description>available modes list border</description>
-					<left>25</left>
-					<top>30</top>
-					<width>538</width>
-					<height>350</height>
-					<texture border="5">button-nofocus.png</texture>
-				</control>
-				<control type="scrollbar" id="60">
-					<description>scrollbar for available modes list</description>
-					<left>5</left>
-					<top>30</top>
-					<width>25</width>
-					<height>350</height>
-					<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-					<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-					<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-					<textureslidernib>ScrollBarNib.png</textureslidernib>
-					<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-					<onleft>61</onleft>
-					<onright>20</onright>
-					<showonepage>false</showonepage>
-					<orientation>vertical</orientation>
-				</control>
-				<control type="list" id="20">
-					<description>available modes list</description>
-					<left>30</left>
-					<top>35</top>
-					<width>528</width>
-					<height>345</height>
-					<onup>9000</onup>
-					<ondown>9001</ondown>
-					<onleft>60</onleft>
-					<onright>21</onright>
-					<pagecontrol>60</pagecontrol>
-					<scrolltime>200</scrolltime>
-					<itemlayout height="46" width="528">
-						<control type="image">
-							<left>0</left>
-							<top>3</top>
-							<width>528</width>
-							<height>40</height>
-							<texture border="5">button-nofocus.png</texture>
-						</control>
-						<control type="image">
-							<left>15</left>
-							<top>8</top>
-							<width>30</width>
-							<height>30</height>
-							<texture>$INFO[ListItem.Property(Icon)]</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>!String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="image">
-							<left>15</left>
-							<top>8</top>
-							<width>30</width>
-							<height>30</height>
-							<texture>DefaultAudioDSP.png</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="label">
-							<description>active addon name and mode name</description>
-							<left>80</left>
-							<top>3</top>
-							<width>435</width>
-							<height>40</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>white</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
-						</control>
-					</itemlayout>
-					<focusedlayout height="66" width="528">
-						<control type="image">
-							<left>0</left>
-							<top>3</top>
-							<width>528</width>
-							<height>60</height>
-							<texture border="5">button-focus2.png</texture>
-							<animation effect="fade" start="100" end="30" time="0" condition="!Control.HasFocus(20)">conditional</animation>
-						</control>
-						<control type="image">
-							<left>5</left>
-							<top>8</top>
-							<width>50</width>
-							<height>50</height>
-							<texture>$INFO[ListItem.Property(Icon)]</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>!String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="image">
-							<left>5</left>
-							<top>8</top>
-							<height>50</height>
-							<width>50</width>
-							<texture>DefaultAudioDSP.png</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="label">
-							<description>addon name and mode name on focus</description>
-							<left>80</left>
-							<top>3</top>
-							<width>435</width>
-							<height>40</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>white</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
-						</control>
-						<control type="label">
-							<description>ADSP-Mode description on focus</description>
-							<left>80</left>
-							<top>33</top>
-							<width>435</width>
-							<height>30</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>grey2</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Description)]</label>
-							<visible>!Control.HasFocus(20)</visible>
-						</control>
-						<control type="label">
-							<description>ADSP-Mode description on focus</description>
-							<left>80</left>
-							<top>33</top>
-							<width>435</width>
-							<height>30</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>grey2</textcolor>
-							<scroll>true</scroll>
-							<scrollsuffix>&gt;   &lt;</scrollsuffix>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Description)]</label>
-							<visible>Control.HasFocus(20)</visible>
-						</control>
-					</focusedlayout>
-				</control>
-			</control>
-			<control type="group">
-				<left>568</left>
-				<top>0</top>
-				<width>570</width>
-				<height>360</height>
-				<control type="label">
-					<description>blue active modes</description>
-					<left>10</left>
-					<top>2</top>
-					<width>550</width>
-					<height>30</height>
-					<font>font12_title</font>
-					<label>$LOCALIZE[15051] ($INFO[Container(21).NumItems])</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<textcolor>blue</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="image">
-					<description>active modes list border</description>
-					<left>10</left>
-					<top>30</top>
-					<width>538</width>
-					<height>350</height>
-					<texture border="5">button-nofocus.png</texture>
-				</control>
-				<control type="scrollbar" id="61">
-					<description>scrollbar for active modes list</description>
-					<left>542</left>
-					<top>30</top>
-					<width>25</width>
-					<height>350</height>
-					<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-					<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-					<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-					<textureslidernib>ScrollBarNib.png</textureslidernib>
-					<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-					<onleft>21</onleft>
-					<onright>60</onright>
-					<showonepage>false</showonepage>
-					<orientation>vertical</orientation>
-				</control>
-				<control type="list" id="21">
-					<description>active modes list</description>
-					<left>15</left>
-					<top>35</top>
-					<width>538</width>
-					<height>345</height>
-					<onup>9000</onup>
-					<ondown>9001</ondown>
-					<onleft>20</onleft>
-					<onright>61</onright>
-					<pagecontrol>61</pagecontrol>
-					<scrolltime>200</scrolltime>
-					<itemlayout height="46" width="528">
-						<control type="image">
-							<left>0</left>
-							<top>3</top>
-							<width>528</width>
-							<height>40</height>
-							<texture border="5">button-nofocus.png</texture>
-						</control>
-						<control type="image">
-							<left>15</left>
-							<top>8</top>
-							<width>30</width>
-							<height>30</height>
-							<texture>$INFO[ListItem.Property(Icon)]</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>!String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="image">
-							<left>15</left>
-							<top>8</top>
-							<width>30</width>
-							<height>30</height>
-							<texture>DefaultAudioDSP.png</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="label">
-							<description>active addon name and mode name</description>
-							<left>80</left>
-							<top>3</top>
-							<width>435</width>
-							<height>40</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>white</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
-						</control>
-					</itemlayout>
-					<focusedlayout height="66" width="528">
-						<control type="image">
-							<left>0</left>
-							<top>3</top>
-							<width>528</width>
-							<height>60</height>
-							<texture border="5">button-focus2.png</texture>
-							<animation effect="fade" start="100" end="30" time="0" condition="!Control.HasFocus(21)">conditional</animation>
-						</control>
-						<control type="image">
-							<left>5</left>
-							<top>8</top>
-							<width>50</width>
-							<height>50</height>
-							<texture>$INFO[ListItem.Property(Icon)]</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>!String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="image">
-							<left>5</left>
-							<top>8</top>
-							<height>50</height>
-							<width>50</width>
-							<texture>DefaultAudioDSP.png</texture>
-							<aspectratio aligny="center" align="left">keep</aspectratio>
-							<visible>String.IsEqual(ListItem.Property(Icon),"")</visible>
-						</control>
-						<control type="label">
-							<description>addon name and mode name on focus</description>
-							<left>80</left>
-							<top>3</top>
-							<width>435</width>
-							<height>40</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>white</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
-							<visible>true</visible>
-						</control>
-						<control type="label">
-							<description>ADSP-Mode description on focus</description>
-							<left>80</left>
-							<top>33</top>
-							<width>435</width>
-							<height>30</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>grey2</textcolor>
-							<scroll>false</scroll>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Description)]</label>
-							<visible>!Control.HasFocus(21)</visible>
-						</control>
-						<control type="label">
-							<description>ADSP-Mode description on focus</description>
-							<left>80</left>
-							<top>33</top>
-							<width>435</width>
-							<height>30</height>
-							<font>font12</font>
-							<align>left</align>
-							<aligny>center</aligny>
-							<textcolor>grey2</textcolor>
-							<scroll>true</scroll>
-							<scrollsuffix>&gt;   &lt;</scrollsuffix>
-							<selectedcolor>selected</selectedcolor>
-							<label>$INFO[ListItem.Property(Description)]</label>
-							<visible>Control.HasFocus(21)</visible>
-						</control>
-					</focusedlayout>
-				</control>
-			</control>
-		</control>
-		<control type="group" id="9001">
-			<left>55</left>
-			<top>528</top>
-			<width>1090</width>
-			<control type="radiobutton" id="22">
-				<description>Default RadioButton</description>
-				<left>0</left>
-				<top>15</top>
-				<height>40</height>
-				<width>280</width>
-				<onup>200</onup>
-				<ondown>9000</ondown>
-				<onleft>24</onleft>
-				<onright>23</onright>
-				<textwidth>252</textwidth>
-				<font>font13</font>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus2.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<label>15064</label>
-				<include>ButtonCommonValues</include>
-			</control>
-			<control type="button" id="23">
-				<description>Apply changes button</description>
-				<left>288</left>
-				<top>15</top>
-				<height>40</height>
-				<width>250</width>
-				<onup>200</onup>
-				<ondown>9000</ondown>
-				<onleft>22</onleft>
-				<onright>24</onright>
-				<font>font13</font>
-				<disabledcolor>15FFFFFF</disabledcolor>
-				<textcolor>grey3</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus2.png</texturefocus>
-				<label>14070</label>
-				<align>center</align>
-			</control>
-			<control type="button" id="24">
-				<description>Clear active modes button</description>
-				<left>841</left>
-				<top>15</top>
-				<height>40</height>
-				<width>250</width>
-				<onup>200</onup>
-				<ondown>9000</ondown>
-				<onleft>23</onleft>
-				<onright>22</onright>
-				<font>font13</font>
-				<disabledcolor>30FFFFFF</disabledcolor>
-				<textcolor>grey3</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus2.png</texturefocus>
-				<label>15066</label>
-				<align>center</align>
-			</control>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml
index 36d6f0e..8509feb 100644
--- a/720p/DialogSettings.xml
+++ b/720p/DialogSettings.xml
@@ -9,8 +9,7 @@
 	<controls>
 		<control type="group">
 			<animation effect="fade" start="100" end="0" time="150" condition="Window.Is(contentsettings) + Window.IsActive(AddonSettings)">Conditional</animation>
-			<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(OSDAudioDSPSettings) |  Window.IsVisible(FileBrowser)]">Conditional</animation>
-			<animation effect="fade" start="100" end="0" time="400" condition="Window.Is(osdaudiodspsettings) + Window.IsVisible(SliderDialog)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)]">Conditional</animation>
 			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="800" />
 				<param name="DialogBackgroundHeight" value="458" />
diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml
index 8a39836..c35b89c 100644
--- a/720p/MusicOSD.xml
+++ b/720p/MusicOSD.xml
@@ -23,7 +23,7 @@
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
 			<animation effect="fade" time="150">VisibleChange</animation>
 			<animation effect="slide" start="0,0" end="-30,0" time="0" condition="Player.Muted">conditional</animation>
-			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)]</visible>
 		</control>
 		<control type="slider" id="87">
 			<depth>DepthOSD+</depth>
@@ -39,7 +39,7 @@
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)]</visible>
 		</control>
 		<control type="grouplist" id="100">
 			<left>325</left>
@@ -47,7 +47,7 @@
 			<orientation>horizontal</orientation>
 			<itemgap>0</itemgap>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)]</visible>
 			<control type="button" id="300">
 				<width>55</width>
 				<height>55</height>
@@ -257,7 +257,6 @@
 			<control type="image" id="2400">
 				<width>55</width>
 				<texture></texture>
-				<visible>!system.getbool(audiooutput.dspaddonsenabled)</visible>
 			</control>
 			<control type="image" id="2500">
 				<width>55</width>
@@ -278,16 +277,6 @@
 				<texturenofocus>OSDRateNF.png</texturenofocus>
 				<onclick>setrating</onclick>
 			</control>
-			<control type="button" id="700">
-				<width>55</width>
-				<height>55</height>
-				<label>15047</label>
-				<font></font>
-				<texturefocus>OSDDSPAudioFO.png</texturefocus>
-				<texturenofocus>OSDDSPAudioNF.png</texturenofocus>
-				<onclick>ActivateWindow(OSDAudioDSPSettings)</onclick>
-				<visible>system.getbool(audiooutput.dspaddonsenabled)</visible>
-			</control>
 			<control type="togglebutton" id="701">
 				<width>55</width>
 				<height>55</height>
diff --git a/720p/MusicVisualisation.xml b/720p/MusicVisualisation.xml
index d1da7b8..01c9c56 100644
--- a/720p/MusicVisualisation.xml
+++ b/720p/MusicVisualisation.xml
@@ -26,7 +26,7 @@
 		<control type="group">
 			<depth>DepthOSD</depth>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(Addon)]</visible>
+			<visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(PVRRadioRDSInfo) | Window.IsVisible(Addon)]</visible>
 			<control type="image">
 				<left>-20</left>
 				<top>-150</top>
@@ -131,7 +131,6 @@
 					<height>35</height>
 					<itemgap>5</itemgap>
 					<orientation>horizontal</orientation>
-					<visible>!system.getbool(audiooutput.dspaddonsenabled)</visible>
 					<control type="label">
 						<width min="10" max="638">auto</width>
 						<height>20</height>
@@ -172,67 +171,6 @@
 					</control>
 				</control>
 
-				<control type="grouplist">
-					<left>20</left>
-					<top>60</top>
-					<width>910</width>
-					<height>35</height>
-					<itemgap>5</itemgap>
-					<orientation>horizontal</orientation>
-					<visible>system.getbool(audiooutput.dspaddonsenabled)</visible>
-					<control type="label">
-						<width min="10" max="557">auto</width>
-						<height>20</height>
-						<font>font30</font>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>$INFO[Player.Title]</label>
-						<textcolor>orange</textcolor>
-						<scroll>true</scroll>
-					</control>
-					<control type="image">
-						<description>ADSP Master Mode Image</description>
-						<width>81</width>
-						<height>29</height>
-						<visible>![String.IsEmpty(ADSP.MasterOwnIcon) | Player.ChannelPreviewActive]</visible>
-						<texture>$INFO[ADSP.MasterOwnIcon]</texture>
-					</control>
-					<control type="image">
-						<description>Audio Codec Image</description>
-						<width>81</width>
-						<height>29</height>
-						<visible>String.IsEmpty(ADSP.MasterOverrideIcon) + !Player.ChannelPreviewActive</visible>
-						<texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
-					</control>
-					<control type="image">
-						<description>ADSP Audio Codec Override Image</description>
-						<width>81</width>
-						<height>29</height>
-						<visible>![String.IsEmpty(ADSP.MasterOwnIcon) | Player.ChannelPreviewActive]</visible>
-						<texture>$INFO[ADSP.MasterOverrideIcon]</texture>
-					</control>
-					<control type="group">
-						<description>Rating</description>
-						<width>172</width>
-						<height>29</height>
-						<control type="image">
-							<description>rating back</description>
-							<left>0</left>
-							<top>0</top>
-							<width>172</width>
-							<height>29</height>
-							<texture border="5">flagging/blank.png</texture>
-						</control>
-						<control type="image">
-							<description>User Rating</description>
-							<left>2</left>
-							<top>5</top>
-							<width>168</width>
-							<height>21</height>
-							<texture fallback="ratings/0.png">$INFO[MusicPlayer.UserRating,ratings/,.png]</texture>
-						</control>
-					</control>
-				</control>
 				<control type="label">
 					<left>0</left>
 					<top>120</top>
diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index f821a4b..8314b50 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -53,7 +53,7 @@
 		<!-- media infos -->
 		<control type="group" id="1">
 			<depth>DepthOSD</depth>
-			<visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)]</visible>
+			<visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide) | Window.IsVisible(SliderDialog)]</visible>
 			<animation effect="fade" time="150">VisibleChange</animation>
 			<control type="image" id="1">
 				<left>-20</left>
@@ -266,30 +266,14 @@
 						<texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
 						<visible>!Player.ChannelPreviewActive</visible>
 					</control>
-					<control type="image" id="1">
-						<description>ADSP Master Mode Image</description>
-						<width>85</width>
-						<height>35</height>
-						<aspectratio align="right">keep</aspectratio>
-						<visible>![String.IsEmpty(ADSP.MasterOwnIcon) | Player.ChannelPreviewActive]</visible>
-						<texture>$INFO[ADSP.MasterOwnIcon]</texture>
-					</control>
 					<control type="image" id="1">
 						<description>Audio Codec Image</description>
 						<width>85</width>
 						<height>35</height>
 						<aspectratio align="center">keep</aspectratio>
-						<visible>String.IsEmpty(ADSP.MasterOverrideIcon) + !Player.ChannelPreviewActive</visible>
+						<visible>!Player.ChannelPreviewActive</visible>
 						<texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
 					</control>
-					<control type="image" id="1">
-						<description>ADSP Audio Codec Override Image</description>
-						<width>85</width>
-						<height>35</height>
-						<aspectratio align="right">keep</aspectratio>
-						<visible>![String.IsEmpty(ADSP.MasterOverrideIcon) | Player.ChannelPreviewActive]</visible>
-						<texture>$INFO[ADSP.MasterOverrideIcon]</texture>
-					</control>
 					<control type="image" id="1">
 						<description>Audio Channels Image</description>
 						<width>50</width>
diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml
index afc514f..d5630a5 100644
--- a/720p/VideoOSD.xml
+++ b/720p/VideoOSD.xml
@@ -23,7 +23,7 @@
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
 			<animation effect="slide" start="0,0" end="-30,0" time="0" condition="Player.Muted">conditional</animation>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)]</visible>
+			<visible>system.getbool(input.enablemouse) + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible>
 		</control>
 		<control type="slider" id="87">
 			<depth>DepthOSD+</depth>
@@ -39,7 +39,7 @@
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)]</visible>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | VideoPlayer.Content(LiveTV)]</visible>
 		</control>
 		<control type="grouplist" id="100">
 			<left>325</left>
@@ -47,7 +47,7 @@
 			<orientation>horizontal</orientation>
 			<itemgap>0</itemgap>
 			<animation effect="fade" time="150">VisibleChange</animation>
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)]</visible>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)]</visible>
 			<control type="button" id="300">
 				<width>55</width>
 				<height>55</height>
@@ -223,9 +223,6 @@
 				<font></font>
 				<texturefocus>OSDAudioFO.png</texturefocus>
 				<texturenofocus>OSDAudioNF.png</texturenofocus>
-				<usealttexture>system.getbool(audiooutput.dspaddonsenabled)</usealttexture>
-				<alttexturefocus>OSDDSPAudioFO.png</alttexturefocus>
-				<alttexturenofocus>OSDDSPAudioNF.png</alttexturenofocus>
 				<onclick>ActivateWindow(OSDAudioSettings)</onclick>
 			</control>
 			<control type="button" id="253">
@@ -293,7 +290,7 @@
 		</control>
 		<control type="grouplist" id="500">
 			<depth>DepthOSD+</depth>
-			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible>
+			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDSubtitleSettings) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVRChannelGuide)] + [Control.HasFocus(255) | ControlGroup(500).HasFocus | Control.HasFocus(520)]</visible>
 			<animation effect="fade" time="150">VisibleChange</animation>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="![VideoPlayer.HasMenu | VideoPlayer.Content(LiveTV)]">Conditional</animation>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>