unify sampler Play button in all skins, remove Cue blinking

* use Pause icon when playing
* use group,play as indicator instead of play_indicator

9 files changed, 24 insertions, 31 deletions

diff --git a/res/skins/Deere/sampler_text_row.xml b/res/skins/Deere/sampler_text_row.xml
index 0697a252a3..9d69f868c0 100644
--- a/res/skins/Deere/sampler_text_row.xml
+++ b/res/skins/Deere/sampler_text_row.xml
@@ -33,8 +33,8 @@
                 <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
                 <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
                 <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_pause_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_pause_48px.svg</SetVariable>
                 <SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
                 <SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
                 <SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 20ecb290d1..f15526fa06 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -65,7 +65,7 @@
                     <SetVariable name="btn_format">square_big</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
-                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
diff --git a/res/skins/LateNight/sampler_mini.xml b/res/skins/LateNight/sampler_mini.xml
index 675eeec5d3..31e14f3c88 100644
--- a/res/skins/LateNight/sampler_mini.xml
+++ b/res/skins/LateNight/sampler_mini.xml
@@ -20,7 +20,7 @@
             <SetVariable name="btn_format">square_big</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
             <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
-            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play</SetVariable>
           </Template>
         </Children>
       </WidgetGroup>
diff --git a/res/skins/Shade/btn/btn_pause_sampler_over.png b/res/skins/Shade/btn/btn_pause_sampler_over.png
new file mode 100644
index 0000000000..972a877a74
--- /dev/null
+++ b/res/skins/Shade/btn/btn_pause_sampler_over.png
diff --git a/res/skins/Shade/btn/btn_pause_sampler_overdown.png b/res/skins/Shade/btn/btn_pause_sampler_overdown.png
new file mode 100644
index 0000000000..055f13907c
--- /dev/null
+++ b/res/skins/Shade/btn/btn_pause_sampler_overdown.png
diff --git a/res/skins/Shade/deck_transport.xml b/res/skins/Shade/deck_transport.xml
index f3507d9774..057ddf8ee5 100644
--- a/res/skins/Shade/deck_transport.xml
+++ b/res/skins/Shade/deck_transport.xml
@@ -101,8 +101,8 @@
         </State>
         <State>
           <Number>1</Number>
-          <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-          <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+          <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+          <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
         <Pos>53,14</Pos>
         <Connection>
@@ -114,7 +114,7 @@
           <ButtonState>RightButton</ButtonState>
         </Connection>
         <Connection>
-          <ConfigKey>[Sampler<Variable name="samplernum1"/>],play_indicator</ConfigKey>
+          <ConfigKey>[Sampler<Variable name="samplernum1"/>],play</ConfigKey>
         </Connection>
       </PushButton>
 
@@ -128,8 +128,8 @@
         </State>
         <State>
           <Number>1</Number>
-          <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-          <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+          <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+          <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
         <Pos>74,14</Pos>
         <Connection>
@@ -141,7 +141,7 @@
           <ButtonState>RightButton</ButtonState>
         </Connection>
         <Connection>
-          <ConfigKey>[Sampler<Variable name="samplernum2"/>],play_indicator</ConfigKey>
+          <ConfigKey>[Sampler<Variable name="samplernum2"/>],play</ConfigKey>
         </Connection>
       </PushButton>
 
@@ -155,8 +155,8 @@
         </State>
         <State>
           <Number>1</Number>
-          <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-          <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+          <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+          <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
         <Pos>53,35</Pos>
         <Connection>
@@ -168,7 +168,7 @@
           <ButtonState>RightButton</ButtonState>
         </Connection>
         <Connection>
-          <ConfigKey>[Sampler<Variable name="samplernum3"/>],play_indicator</ConfigKey>
+          <ConfigKey>[Sampler<Variable name="samplernum3"/>],play</ConfigKey>
         </Connection>
       </PushButton>
 
@@ -182,8 +182,8 @@
         </State>
         <State>
           <Number>1</Number>
-          <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-          <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+          <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+          <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
         <Pos>74,35</Pos>
         <Connection>
@@ -195,7 +195,7 @@
           <ButtonState>RightButton</ButtonState>
         </Connection>
         <Connection>
-          <ConfigKey>[Sampler<Variable name="samplernum4"/>],play_indicator</ConfigKey>
+          <ConfigKey>[Sampler<Variable name="samplernum4"/>],play</ConfigKey>
         </Connection>
       </PushButton>
 
diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
index 47f01b04b3..32f610ef64 100644
--- a/res/skins/Shade/sampler.xml
+++ b/res/skins/Shade/sampler.xml
@@ -118,8 +118,8 @@
                     </State>
                     <State>
                       <Number>1</Number>
-                      <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-                      <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+                      <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
                     </State>
                     <Pos>3,7</Pos>
                     <Connection>
@@ -131,7 +131,7 @@
                       <ButtonState>RightButton</ButtonState>
                     </Connection>
                     <Connection>
-                      <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
+                      <ConfigKey><Variable name="group"/>,play</ConfigKey>
                     </Connection>
                   </PushButton>
                 </Children>
diff --git a/res/skins/Shade/samplersmall.xml b/res/skins/Shade/samplersmall.xml
index 448fea07fc..1ebd7b01e9 100644
--- a/res/skins/Shade/samplersmall.xml
+++ b/res/skins/Shade/samplersmall.xml
@@ -26,8 +26,8 @@
 						</State>
 						<State>
 							<Number>1</Number>
-							<Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-							<Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+							<Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
+							<Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
 						</State>
 						<Connection>
               <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
@@ -38,7 +38,7 @@
               <ButtonState>RightButton</ButtonState>
             </Connection>
             <Connection>
-              <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],play</ConfigKey>
             </Connection>
 					</PushButton>
 
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 9d63db869c..a24f7883b5 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -25,22 +25,15 @@ Variables:
             <SetVariable name="state_1_icon">pause_sampler.svg</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
             <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
-            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play</SetVariable>
           </Template>
-      <!-- Second layer is CoverArt. DefaultCover is transparent, bg-color #333 -->
+          <!-- Second layer is CoverArt. DefaultCover is transparent, bg-color #333 -->
           <CoverArt>
             <ObjectName>SamplerCover</ObjectName>
             <Size>34f,34f</Size>
             <Group><Variable name="group"/></Group>
             <DefaultCover>graphics/blank_1x1.svg</DefaultCover>
           </CoverArt>
-      <!-- Background turns Orange when playing preview from Cue/HotCue.
-          Only visible when play_indicator=0 -->
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="ObjectName">SamplerPlayCueUnderlay</SetVariable>
-            <SetVariable name="Size">34f,34f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
-          </Template>
         </Children>
       </WidgetGroup>
     </Children>