diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/aux_unit.xml
index f79c780127b0..fada7cda535f 100644
--- a/res/skins/Tango/aux_unit.xml
+++ b/res/skins/Tango/aux_unit.xml
@@ -10,6 +10,7 @@ Variables:
auxiliary
[Auxiliary]
+ 1
AlignCenter
horizontal
@@ -128,12 +129,12 @@ Variables:
26f,16f
- 1
+ 1
1min,1f
26f,16f
- 3
+ 3
@@ -146,12 +147,12 @@ Variables:
26f,16f
- 2
+ 2
1min,1f
26f,16f
- 4
+ 4
diff --git a/res/skins/Tango/buttons/btn_master_head_mixer.svg b/res/skins/Tango/buttons/btn_master_head_mixer.svg
new file mode 100644
index 000000000000..2f5c4e8c41dc
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_master_head_mixer.svg
@@ -0,0 +1,786 @@
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_mixer_off.svg b/res/skins/Tango/buttons/btn_mixer_off.svg
index 6d8360be6006..2c412dc47c80 100644
--- a/res/skins/Tango/buttons/btn_mixer_off.svg
+++ b/res/skins/Tango/buttons/btn_mixer_off.svg
@@ -1 +1,780 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/buttons/btn_mixer_on.svg b/res/skins/Tango/buttons/btn_mixer_on.svg
index 26d83320f5b5..f0acca99c46c 100644
--- a/res/skins/Tango/buttons/btn_mixer_on.svg
+++ b/res/skins/Tango/buttons/btn_mixer_on.svg
@@ -1 +1,780 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/res/skins/Tango/deck_artist_title_right.xml b/res/skins/Tango/deck_artist_title_right.xml
index 0ae5a8621e28..ed2dc0cddf68 100644
--- a/res/skins/Tango/deck_artist_title_right.xml
+++ b/res/skins/Tango/deck_artist_title_right.xml
@@ -45,7 +45,7 @@ Variables:
PlayPosition
track_time
90min,22f
- right
+ left
@@ -64,7 +64,7 @@ Variables:
PlayPosition
track_time
175min,22f
- right
+ left
,playposition
diff --git a/res/skins/Tango/deck_comment_left.xml b/res/skins/Tango/deck_comment_left.xml
index f3889f63c06b..5179a4c010b8 100644
--- a/res/skins/Tango/deck_comment_left.xml
+++ b/res/skins/Tango/deck_comment_left.xml
@@ -7,6 +7,8 @@ Variables:
-->
deck
+ 1
+
TrackCommentContainer
vertical
@@ -42,24 +44,25 @@ Variables:
1f,1min
+
32f,16f
- 1
+ 1
1f,1min
32f,16f
- 2
+ 2
1f,1min
32f,16f
- 3
+ 3
1f,1min
32f,16f
- 4
+ 4
diff --git a/res/skins/Tango/deck_comment_right.xml b/res/skins/Tango/deck_comment_right.xml
index 03793ff02df3..0a4f48f437cd 100644
--- a/res/skins/Tango/deck_comment_right.xml
+++ b/res/skins/Tango/deck_comment_right.xml
@@ -7,6 +7,8 @@ Variables:
-->
deck
+ 1
+
TrackCommentContainer
vertical
@@ -28,22 +30,22 @@ Variables:
32f,16f
- 1
+ 1
1f,1min
32f,16f
- 2
+ 2
1f,1min
32f,16f
- 3
+ 3
1f,1min
32f,16f
- 4
+ 4
1f,1min
diff --git a/res/skins/Tango/deck_left.xml b/res/skins/Tango/deck_left.xml
index 02e1f7edcded..afd4c7b49338 100644
--- a/res/skins/Tango/deck_left.xml
+++ b/res/skins/Tango/deck_left.xml
@@ -102,15 +102,11 @@ Variables:
vertical
- 1me,25min
+ me,i
Spacer1e1me,3f
RoundFiller251me,22me
-
- [Tango],loop_beatjump_controls
- visible
-
diff --git a/res/skins/Tango/deck_overview_left.xml b/res/skins/Tango/deck_overview_left.xml
index 9228cf31dcc4..6f0db5bb3adf 100644
--- a/res/skins/Tango/deck_overview_left.xml
+++ b/res/skins/Tango/deck_overview_left.xml
@@ -54,7 +54,7 @@ Variables:
cue_point
- C
+ Q
top|right
#FF0080
#FFFFFF
diff --git a/res/skins/Tango/deck_overview_right.xml b/res/skins/Tango/deck_overview_right.xml
index a48c3b5b63ab..d03ff3cd0793 100644
--- a/res/skins/Tango/deck_overview_right.xml
+++ b/res/skins/Tango/deck_overview_right.xml
@@ -147,7 +147,7 @@ Variables:
cue_point
- C
+ Q
top|right
#FF0080
#FFFFFF
@@ -160,25 +160,6 @@ Variables:
-
diff --git a/res/skins/Tango/deck_right.xml b/res/skins/Tango/deck_right.xml
index 2ffa13c35b90..a1c58e4e436b 100644
--- a/res/skins/Tango/deck_right.xml
+++ b/res/skins/Tango/deck_right.xml
@@ -88,14 +88,11 @@ Variables:
vertical
+ me,i
Spacer1e1me,3f
RoundFiller251me,22me
-
- [Tango],loop_beatjump_controls
- visible
-
diff --git a/res/skins/Tango/decks_12.xml b/res/skins/Tango/decks_12.xml
index 6a1388b72fb8..3e54f1bb44a4 100644
--- a/res/skins/Tango/decks_12.xml
+++ b/res/skins/Tango/decks_12.xml
@@ -18,7 +18,7 @@ Variables:
-
+
2
diff --git a/res/skins/Tango/eq_knob_button_left.xml b/res/skins/Tango/eq_knob_left.xml
similarity index 79%
rename from res/skins/Tango/eq_knob_button_left.xml
rename to res/skins/Tango/eq_knob_left.xml
index a5497e7c38e3..886912eb8c98 100644
--- a/res/skins/Tango/eq_knob_button_left.xml
+++ b/res/skins/Tango/eq_knob_left.xml
@@ -9,9 +9,9 @@ Variables:
parameter : 1, 2, 3 (low, mid, high)
-->
- EqualizerRack1
1
- [EqualizerRack1__Effect1]
+ [EqualizerRack1__Effect1]
+
EQKnobContainerLeft
min,min
@@ -33,14 +33,14 @@ Variables:
- ,parameter
+ ,parameter
EQKillUnderlayLeft
30f,30f
- button_parameter
+ button_parameter
@@ -49,18 +49,18 @@ Variables:
EQKillButton
12f,30f
- button_parameter
+ button_parameter
- ,loaded
+ ,loaded
visible
42me,30f
- ,loaded
+ ,loaded
visible
diff --git a/res/skins/Tango/eq_knob_button_right.xml b/res/skins/Tango/eq_knob_right.xml
similarity index 79%
rename from res/skins/Tango/eq_knob_button_right.xml
rename to res/skins/Tango/eq_knob_right.xml
index 01ef8b1fadf1..517a98eed834 100644
--- a/res/skins/Tango/eq_knob_button_right.xml
+++ b/res/skins/Tango/eq_knob_right.xml
@@ -11,7 +11,8 @@ Variables:
EqualizerRack1
1
- [EqualizerRack1__Effect1]
+ [EqualizerRack1__Effect1]
+
EQKnobContainerRight
min,min
@@ -25,7 +26,7 @@ Variables:
EQKillButton
12f,30f
- button_parameter
+ button_parameter
@@ -40,27 +41,27 @@ Variables:
- ,parameter
+ ,parameter
EQKillUnderlayRight
30f,30f
- button_parameter
+ button_parameter
- ,loaded
+ ,loaded
visible
42me,30f
- ,loaded
+ ,loaded
visible
diff --git a/res/skins/Tango/fx_assign_button.xml b/res/skins/Tango/fx_assign_button.xml
index ebf69b8f2424..0451f3abc7b0 100644
--- a/res/skins/Tango/fx_assign_button.xml
+++ b/res/skins/Tango/fx_assign_button.xml
@@ -3,7 +3,7 @@ Description:
A button to assign an effect unit to parent deck,
used in decks' artist/duration row.
Variables:
- FxUnitNum: [EffectRack1_EffectUnitN]
+ FxUnit_FxNum: [EffectRack1_EffectUnitN]
group: [ChannelN]
-->
@@ -15,16 +15,16 @@ Variables:
false
0
- FX
+ FX
center
1
- FX
+ FX
center
- [EffectRack1_EffectUnit],group__enable
+ [EffectRack_EffectUnit],group__enable
LeftButton
diff --git a/res/skins/Tango/fx_button.xml b/res/skins/Tango/fx_button.xml
index c31610cad721..75bfeb7a1e37 100644
--- a/res/skins/Tango/fx_button.xml
+++ b/res/skins/Tango/fx_button.xml
@@ -1,19 +1,19 @@
- _
@@ -30,7 +30,7 @@ Variables:
skin:/buttons/btn_.svg
- [_Effect],
+ ,
LeftButton
diff --git a/res/skins/Tango/fx_focus_button.xml b/res/skins/Tango/fx_focus_button.xml
index a310fe5a16f8..f50d6414dc4c 100644
--- a/res/skins/Tango/fx_focus_button.xml
+++ b/res/skins/Tango/fx_focus_button.xml
@@ -21,19 +21,19 @@ Variables:
2
true
- [],focused_effect
+ [],focused_effect
LeftButton
true
- [],focused_effect
+ [],focused_effect
RightButton
true
- [],focused_effect
+ [],focused_effect
visible
@@ -47,24 +47,24 @@ Variables:
2
true
- [],focused_effect
+ [],focused_effect
LeftButton
true
- [],focused_effect
+ [],focused_effect
RightButton
true
- [],focused_effect
+ [],focused_effect
false
- [],focused_effect
+ [],focused_effect
visible
diff --git a/res/skins/Tango/fx_master_button.xml b/res/skins/Tango/fx_master_button.xml
index 6be79458390c..6fcdbbc2a27e 100644
--- a/res/skins/Tango/fx_master_button.xml
+++ b/res/skins/Tango/fx_master_button.xml
@@ -14,16 +14,16 @@ Variables:
false
0
- FX
+ FX
center
1
- FX
+ FX
center
- [EffectRack1_EffectUnit],group_[Master]_enable
+ [EffectRack1_EffectUnit],group_[Master]_enable
LeftButton
diff --git a/res/skins/Tango/fx_metaknob.xml b/res/skins/Tango/fx_metaknob.xml
index 88c68a769ca7..08acb6a422f9 100644
--- a/res/skins/Tango/fx_metaknob.xml
+++ b/res/skins/Tango/fx_metaknob.xml
@@ -8,7 +8,7 @@ Variables:
FxNum : EffectX
-->
- [_Effect]
+ [_Effect]
EffectSlot_metaknob
FxMetaknob
@@ -18,7 +18,7 @@ Variables:
- ,meta
+ ,meta
diff --git a/res/skins/Tango/fx_parameter_button.xml b/res/skins/Tango/fx_parameter_button.xml
index e72c7447123a..4cd52cabb533 100644
--- a/res/skins/Tango/fx_parameter_button.xml
+++ b/res/skins/Tango/fx_parameter_button.xml
@@ -4,16 +4,15 @@ Description:
Stacked layout of invisible button, parameter name
and button display underneath.
Variables:
- FxRackNum : rack number
- FxUnitNum : unit number
- FxGroup_FxNum : EffectRack1_EffectUnitX_EffectY
+ FxRack : rack number
+ FxUnit : unit number
+ FxRack_FxUnit_FxNum : EffectRack1_EffectUnitX_EffectY
FxNum : effect number
parameter : the parameter
-->
- EffectUnit
- EffectRack1_EffectUnit
- [_Effect]
+ [_Effect]
+
stacked
FxParameterButton
@@ -24,7 +23,7 @@ Variables:
FxParameterButtonOverlay
51f,18f
- button_parameter
+ button_parameter
@@ -36,16 +35,16 @@ Variables:
min,me
FxParameterButtonName_inactive
-
-
+
+
-
+
center
me,min
- ,button_parameter
+ ,button_parameter
0
visible
@@ -60,16 +59,16 @@ Variables:
min,me
FxParameterButtonName_active
-
-
+
+
-
+
center
me,min
- ,button_parameter
+ ,button_parameter
1
visible
@@ -79,12 +78,12 @@ Variables:
FxParameterButtonUnderlay
51f,18f
- button_parameter
+ button_parameter
- ,button_parameter_loaded
+ ,button_parameter_loaded
visible
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx_parameter_knob.xml
index aa9a82f07a20..7b09fae4600a 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx_parameter_knob.xml
@@ -10,6 +10,8 @@ Variables:
parameter : the parameter
-->
+ [_Effect]
+
vertical
52f,45f
@@ -33,7 +35,7 @@ Variables:
- ,parameter
+ ,parameter
@@ -43,15 +45,15 @@ Variables:
51f,34f
horizontal
-
+
me,min
FxParameterKnobName
-1min,34f
-
-
+
+
-
+
left
me,min
@@ -67,7 +69,7 @@ Variables:
EffectSlot_parameter_link_type
FxSuperLinkButton
51f,5f
- ,parameter_link_type
+ ,parameter_link_type
1min,1f
@@ -77,13 +79,13 @@ Variables:
EffectSlot_parameter_inversion
FxSuperLinkInvertButton
51f,5f
- ,parameter_link_inverse
+ ,parameter_link_inverse
- ,parameter_loaded
+ ,parameter_loaded
visible
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 3269cb5643d8..fb33843eabdd 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -1,12 +1,11 @@
- [_Effect]
FxParameters
horizontal
@@ -14,59 +13,59 @@ Variables:
- 1
+ 1
- 1
+ 1
- 2
+ 2
- 2
+ 2
- 3
+ 3
- 3
+ 3
- 4
+ 4
- 4
+ 4
- 5
+ 5
- 5
+ 5
- 6
+ 6
- 6
+ 6
- 7
+ 7
- 7
+ 7
- 8
+ 8
- 8
+ 8
diff --git a/res/skins/Tango/fx_toggle_selector.xml b/res/skins/Tango/fx_toggle_selector.xml
index 26d14c2bb311..1f1f91166512 100644
--- a/res/skins/Tango/fx_toggle_selector.xml
+++ b/res/skins/Tango/fx_toggle_selector.xml
@@ -6,13 +6,14 @@ Description:
* enable feedback
* effect selector drop-down list
Variables:
- FxRack : effect rack number
- FxUnitNum : effect unit number
- FxGroup : EffectRack1_EffectUnitX
- FxNum : effect number
+ FxRack : effect rack number
+ FxUnitNum : effect unit number
+ FxRack_FxUnit : EffectRack1_EffectUnitX
+ FxNum : effect number
-->
- [_Effect]
+ [_Effect]
+
FxToggleSelector
stacked
@@ -23,7 +24,7 @@ Variables:
EffectSlot_enabled
FxToggleButton
71f,20f
- ,enabled
+ ,enabled
@@ -34,8 +35,8 @@ Variables:
0me,1min
FxName
-
-
+
+
0me,1min
@@ -46,13 +47,13 @@ Variables:
FxToggleButtonUnderlay
71f,20f
- ,enabled
+ ,enabled
82f,20f
-
-
+
+
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index a0efac754608..54ef0299821e 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -5,11 +5,11 @@ Description:
* mixer with Wet/Dry knob and Super knob (optional)
* assignment buttons for master & headphone
Variables:
- FxUnitNum: number of effect unit for FX label
+ FxUnit: number of effect unit for FX label
-->
- EffectRack1_EffectUnit
- EffectUnit
+ EffectRack_EffectUnit
+
horizontal
me,min
@@ -83,7 +83,7 @@ Variables:
FxFlowUnderlay_left_focus1
1me,53f
- [],focused_effect
+ [],focused_effect
highlight
1
@@ -93,7 +93,7 @@ Variables:
FxFlowUnderlay_left_focus2
1me,99f
- [],focused_effect
+ [],focused_effect
highlight
2
@@ -103,7 +103,7 @@ Variables:
FxFlowUnderlay_left_focus3
1me,137f
- [],focused_effect
+ [],focused_effect
highlight
3
@@ -112,7 +112,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -193,7 +193,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -208,7 +208,7 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
22min,14f
- [],show_parameters
+ [],show_parameters
@@ -233,7 +233,7 @@ Variables:
EffectUnit_mix
SuperWetDryKnob
30f,30f
- []
+ []
mix
red
@@ -248,13 +248,13 @@ Variables:
EffectUnit_super1
SuperWetDryKnob
30f,30f
- []
+ []
super1
blue
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -262,7 +262,7 @@ Variables:
min,me
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -299,7 +299,7 @@ Variables:
pfl_off.svg
pfl_on.svg
pfl_on.svg
- [EffectRack1_EffectUnit],group_[Headphone]_enable
+ [],group_[Headphone]_enable
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index cb9c327fda24..2fd2307f30a5 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -5,11 +5,11 @@ Description:
* mixer with Wet/Dry knob and Super knob (optional)
* assignment buttons for master & headphone
Variables:
- FxUnitNum: number of effect unit for FX label
+ FxUnit: number of effect unit for FX label
-->
- EffectRack1_EffectUnit
- EffectUnit
+ EffectRack_EffectUnit
+
horizontal
me,max
@@ -82,7 +82,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -140,7 +140,7 @@ Variables:
FxFlowUnderlay_mini_focus1
134f,30f
- [],focused_effect
+ [],focused_effect
1
highlight
@@ -150,7 +150,7 @@ Variables:
FxFlowUnderlay_mini_focus2
268f,30f
- [],focused_effect
+ [],focused_effect
2
highlight
@@ -160,7 +160,7 @@ Variables:
FxFlowUnderlay_mini_focus3
402f,30f
- [],focused_effect
+ [],focused_effect
3
highlight
@@ -169,7 +169,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -212,7 +212,7 @@ Variables:
pfl_off.svg
pfl_on.svg
pfl_on.svg
- [EffectRack1_EffectUnit],group_[Headphone]_enable
+ [EffectRack1_EffectUnit],group_[Headphone]_enable
@@ -227,13 +227,13 @@ Variables:
SuperWetDryKnob
EffectUnit_super1
30f,30f
- []
+ []
super1
blue
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -242,7 +242,7 @@ Variables:
SuperWetDryKnob
EffectUnit_mix
30f,30f
- []
+ []
mix
red
@@ -263,11 +263,11 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],show_focus
+ [],show_focus
visible
@@ -285,11 +285,11 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],focused_effect
+ [],focused_effect
0
visible
@@ -303,18 +303,18 @@ Variables:
FxSamplersMiniMaxi_Focus
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],focused_effect
+ [],focused_effect
0
visible
- [],show_focus
+ [],show_focus
visible
@@ -325,7 +325,7 @@ Variables:
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
index 250fbad31d08..3ba159e175c8 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx_unit_right.xml
@@ -5,11 +5,11 @@ Description:
* mixer with Wet/Dry knob and Super knob (optional)
* assignment buttons for master & headphone
Variables:
- FxUnitNum: number of effect unit for FX label
+ FxUnit: number of effect unit for FX label
-->
- EffectRack1_EffectUnit
- EffectUnit
+ EffectRack_EffectUnit
+
horizontal
me,min
@@ -24,7 +24,7 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
22me,14f
- [],show_parameters
+ [],show_parameters
@@ -49,7 +49,7 @@ Variables:
EffectUnit_mix
SuperWetDryKnob
30f,30f
- []
+ []
mix
red
@@ -64,13 +64,13 @@ Variables:
EffectUnit_super1
SuperWetDryKnob
30f,30f
- []
+ []
super1
blue
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -78,7 +78,7 @@ Variables:
min,me
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -115,7 +115,7 @@ Variables:
pfl_off.svg
pfl_on.svg
pfl_on.svg
- [EffectRack1_EffectUnit],group_[Headphone]_enable
+ [],group_[Headphone]_enable
@@ -194,7 +194,7 @@ Variables:
FxFlowUnderlay_right_focus1
1me,53f
- [],focused_effect
+ [],focused_effect
highlight
1
@@ -204,7 +204,7 @@ Variables:
FxFlowUnderlay_right_focus2
1me,99f
- [],focused_effect
+ [],focused_effect
highlight
2
@@ -214,7 +214,7 @@ Variables:
FxFlowUnderlay_right_focus3
1me,137f
- [],focused_effect
+ [],focused_effect
highlight
3
@@ -223,7 +223,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -304,7 +304,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index 6bb7cfd7d0a3..4a8f8e39a97e 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -5,11 +5,11 @@ Description:
* mixer with Wet/Dry knob and Super knob (optional)
* assignment buttons for master & headphone
Variables:
- FxUnitNum: number of effect unit for FX label
+ FxUnit: number of effect unit for FX label
-->
- EffectRack1_EffectUnit
- EffectUnit
+ EffectRack_EffectUnit
+
horizontal
me,max
@@ -27,11 +27,11 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],show_focus
+ [],show_focus
visible
@@ -49,11 +49,11 @@ Variables:
FxSamplersMiniMaxi
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],focused_effect
+ [],focused_effect
0
visible
@@ -67,18 +67,18 @@ Variables:
FxSamplersMiniMaxi_Focus
EffectUnit_show_parameters
28f,14f
- [],show_parameters
+ [],show_parameters
- [],focused_effect
+ [],focused_effect
0
visible
- [],show_focus
+ [],show_focus
visible
@@ -88,7 +88,7 @@ Variables:
@@ -106,7 +106,7 @@ Variables:
SuperWetDryKnob
EffectUnit_mix
30f,30f
- []
+ []
mix
red
@@ -119,13 +119,13 @@ Variables:
SuperWetDryKnob
EffectUnit_super1
30f,30f
- []
+ []
super1
blue
- [Tango],fx_super_knob
+ [Master],show_superknobs
visible
@@ -162,7 +162,7 @@ Variables:
pfl_off.svg
pfl_on.svg
pfl_on.svg
- [EffectRack1_EffectUnit],group_[Headphone]_enable
+ [],group_[Headphone]_enable
@@ -234,7 +234,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
@@ -292,7 +292,7 @@ Variables:
FxFlowUnderlay_mini_focus1
134f,30f
- [],focused_effect
+ [],focused_effect
1
highlight
@@ -302,7 +302,7 @@ Variables:
FxFlowUnderlay_mini_focus2
268f,30f
- [],focused_effect
+ [],focused_effect
2
highlight
@@ -312,7 +312,7 @@ Variables:
FxFlowUnderlay_mini_focus3
402f,30f
- [],focused_effect
+ [],focused_effect
3
highlight
@@ -321,7 +321,7 @@ Variables:
- [],show_focus
+ [],show_focus
visible
diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index dd8e47021810..39b6059a6211 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -4,8 +4,7 @@ Description:
Units are pushed apart by spacers, see fx_units_spacer.xml.
-->
- EffectRack1
- 1
+ 1
FxUnits12
me,max
@@ -18,37 +17,51 @@ Description:
later in xml (collapsed) to the earlier (expanded), since none of both versions
was visible at that moment and opposing EffectUnit tries to expand horizontally.
Putting both versions into a vertical layout fixes this issue.
+ UPDATE: now using WidgetStacks, it appears they are even more stable when switching
+
+ Normally the first widget in stack is shown. currentpage="[XYZ],blabla" makes the
+ WidgetStack remember which item was visible when stack was hidden or Mixxx restarted.
+ To make this persistent, I used the same CO that controls if the parameters are visible.
+ For that to work index of item in stack must match ...,show_parameters
-->
-
+
+
+
me,min
-
+
+
vertical
- min,max
+ min,me
-
- 1
+
+ 1
- 1min,5f
+ 1min,5me
-
+
+
vertical
- min,me
+ min,max
-
- 1
+
+ 1
- 1min,5me
+ 1min,5f
+
+ [EffectRack1],show
+ visible
+
- 5f,0min
+ 5f,0f
5f,0min
@@ -59,39 +72,42 @@ Description:
-
+
+
me,min
-
-
+
+
+
vertical
- min,max
+ min,me
-
- 2
+
+ 2
- 1min,5f
+ 1min,5me
-
+
+
vertical
- min,me
+ min,max
-
- 2
+
+ 2
- 1min,5me
+ 1min,5f
+
+ [EffectRack1],show
+ visible
+
-
- [EffectRack1],show
- visible
-
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index 5b3f41d4aa55..92ec6d9e01e7 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -4,8 +4,7 @@ Description:
Units are pushed apart by spacers, see fx_units_spacer.xml.
-->
- EffectRack1
- 1
+ 1
Spacer1e
me,max
@@ -18,37 +17,51 @@ Description:
later in xml (collapsed) to the earlier (expanded), since none of both versions
was visible at that moment and opposing EffectUnit tries to expand horizontally.
Putting both versions into a vertical layout fixes this issue.
+ UPDATE: now using WidgetStacks, it appears they are even more stable when switching
+
+ Normally the first widget in stack is shown. currentpage="[XYZ],blabla" makes the
+ WidgetStack remember which item was visible when stack was hidden or Mixxx restarted.
+ To make this persistent, I used the same CO that controls if the parameters are visible.
+ For that to work index of item in stack must match ...,show_parameters
-->
-
+
+
+
me,min
-
+
+
vertical
- min,max
+ min,me
-
- 3
+
+ 3
- 1min,5f
+ 1min,5me
-
+
+
vertical
- min,me
+ min,max
-
- 3
+
+ 3
- 1min,5me
+ 1min,5f
+
+ [EffectRack1],show
+ visible
+
- 5f,0min
+ 5f,0f
5f,0min
@@ -59,39 +72,42 @@ Description:
-
+
+
me,min
-
-
+
+
+
vertical
- min,max
+ min,me
-
- 4
+
+ 4
- 1min,5f
+ 1min,5me
-
+
+
vertical
- min,me
+ min,max
-
- 4
+
+ 4
- 1min,5me
+ 1min,5f
-
+
+ [EffectRack1],show
+ visible
+
+
-
- [EffectRack1],show
- visible
-
diff --git a/res/skins/Tango/mic_unit.xml b/res/skins/Tango/mic_unit.xml
index 0759bfa1cf8c..807456738176 100644
--- a/res/skins/Tango/mic_unit.xml
+++ b/res/skins/Tango/mic_unit.xml
@@ -13,6 +13,7 @@ Variables:
microphone
[Microphone]
+ 1
AlignCenter
horizontal
@@ -112,12 +113,12 @@ Variables:
26f,16f
- 1
+ 1
1min,1f
26f,16f
- 3
+ 3
@@ -130,12 +131,12 @@ Variables:
26f,16f
- 2
+ 2
1min,1f
26f,16f
- 4
+ 4
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 83a93f1d313d..262492fb47da 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -14,7 +14,7 @@ Variables:
MixerChannelLeft
horizontal
- min,min
+ -1min,136f
Spacer0f1f,1min
@@ -25,22 +25,22 @@ Variables:
min,min
1min,4f
-
- 3
+
+ 3
1min,4f
-
- 2
+
+ 2
1min,4f
-
- 1
+
+ 1
1min,4f
-
+
- [Tango],eq_knobs
+ [Master],show_eqs
visible
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index 1eeb52a9ccea..11d79b34c331 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -14,7 +14,7 @@ Variables:
MixerChannelRight
horizontal
- min,min
+ -1min,136f
@@ -97,22 +97,22 @@ Variables:
min,min
1min,4f
-
- 3
+
+ 3
1min,4f
-
- 2
+
+ 2
1min,4f
-
- 1
+
+ 1
1min,4f
-
+
- [Tango],eq_knobs
+ [Master],show_eqs
visible
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
index 7eab862d5c32..c37665784be3 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer_headphone.xml
@@ -82,5 +82,9 @@ Description:
+
+ [Tango],master_mixer
+ visible
+
diff --git a/res/skins/Tango/mixer_master_booth.xml b/res/skins/Tango/mixer_master_booth.xml
index c307da487337..52a6b105a599 100644
--- a/res/skins/Tango/mixer_master_booth.xml
+++ b/res/skins/Tango/mixer_master_booth.xml
@@ -44,6 +44,7 @@ Description:
vertical
min,min
+ 1
1min,1f
@@ -53,12 +54,12 @@ Description:
26f,13f
- 1
+ 1
1f,1min
26f,13f
- 2
+ 2
1f,1min
@@ -72,12 +73,12 @@ Description:
26f,13f
- 3
+ 3
1f,1min
26f,13f
- 4
+ 4
1f,1min
@@ -127,5 +128,9 @@ Description:
+
+ [Tango],master_mixer
+ visible
+
diff --git a/res/skins/Tango/quick_fx_knob_button_left.xml b/res/skins/Tango/quick_fx_knob_left.xml
similarity index 100%
rename from res/skins/Tango/quick_fx_knob_button_left.xml
rename to res/skins/Tango/quick_fx_knob_left.xml
diff --git a/res/skins/Tango/quick_fx_knob_button_right.xml b/res/skins/Tango/quick_fx_knob_right.xml
similarity index 100%
rename from res/skins/Tango/quick_fx_knob_button_right.xml
rename to res/skins/Tango/quick_fx_knob_right.xml
diff --git a/res/skins/Tango/sample_decks_16.xml b/res/skins/Tango/sample_decks_16.xml
new file mode 100644
index 000000000000..bde9a42bb31c
--- /dev/null
+++ b/res/skins/Tango/sample_decks_16.xml
@@ -0,0 +1,90 @@
+
+
+
+
+ SamplerRow1
+
+
+ 1
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+
+
+
+
+
+ SamplerRow2
+
+
+ 2
+ 9
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+
+
+
+
+
+ vertical
+
+ me,f
+
+
+
+ SampleDecksContainer
+ [Tango],sampler_row_next
+ [Tango],sampler_row_prev
+
+
+
+ SamplerRows
+ vertical
+ me,min
+
+
+ SamplerRow1
+
+
+
+
+
+ SamplerRows
+ vertical
+ me,min
+
+
+ SamplerRow1
+
+
+ SamplerRow2
+
+
+
+
+
+
+
+
+
+ [Samplers],show_samplers
+ visible
+
+
+
+
diff --git a/res/skins/Tango/sample_decks.xml b/res/skins/Tango/sample_decks_64.xml
similarity index 100%
rename from res/skins/Tango/sample_decks.xml
rename to res/skins/Tango/sample_decks_64.xml
diff --git a/res/skins/Tango/size_detector_stars.xml b/res/skins/Tango/size_detector_stars.xml
index b9ca68e08130..efe44444252c 100644
--- a/res/skins/Tango/size_detector_stars.xml
+++ b/res/skins/Tango/size_detector_stars.xml
@@ -63,7 +63,7 @@ Controls:
horizontal
96f,20f
- [Tango],eq_knobs
+ [Master],show_eqs
visible
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 54632dd42df2..00fb2dffd58b 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -28,6 +28,16 @@
U U P P P
U U P to mixxx devs for their work over the past years!!
+
+ Note - Number of samplers:
+ To set the number of available sample decks, three numbers need to be changed
+ * how many samplers are instantiated in the engine
+ line 61: XX
+ * how many sample decks are loaded in the skin
+ line 322:
+ * the selection button insied the skin menu (instantiated here as Singleton)
+ line 210:
@@ -35,7 +45,8 @@
Tango
ronso0
2.1.6
- A flat nightime skin. Almost all controls can be hidden with Skin Settings menu.
+ A controller-focused nightime skin. Almost all controls can be hidden with skin menu.
+ This version features 16 sample decks only, to shorten Mixxx shut down duration.
en
Creative Commons Attribution, Share-Alike 3.0 Unported
@@ -46,13 +57,15 @@
4
+
64
+
1
+ 1
0
0
1
1
- 1
0
0
0
@@ -67,22 +80,20 @@
0
0
- 0
- 0
+ 1
+ 0
0
0
0
1
- 1
1
0
1
0
0
1
- 1
- 1
+ 1
1
0
1
@@ -150,7 +161,7 @@
###############################################################
Put these variable definitions at the beginning in order to have
have all variables available for SingletonDefinitions -->
-
+
+
+ FxUnits_12_Singleton
+
+
+
+
+
+
+
+ SamplerRowsButton_Singleton
+
+
+
+
+
+
@@ -253,10 +282,12 @@
vertical
me,min
-
+
+ FxUnits_12_Singleton
+
- [Tango],2or4_FxUnits
+ [Tango],4_FxUnits
visible
@@ -270,7 +301,7 @@
- [Tango],2or4_FxUnits
+ [Tango],4_FxUnits
visible
@@ -278,16 +309,19 @@
vertical
-
+
+ FxUnits_12_Singleton
+
- [Tango],2or4_FxUnits
+ [Tango],4_FxUnits
visible
-
+
+
@@ -327,10 +361,12 @@
-
+
-
+
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 42f6c4715b32..59e586befe4e 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -365,7 +365,7 @@ Description:
me,f
!
- [Master],show_mixerr
+ [Master],show_mixer
visible
@@ -401,7 +401,7 @@ Description:
182,17
me,me
- [Master],show_mixerr
+ [Master],show_mixer
visible
@@ -410,7 +410,7 @@ Description:
EQ Knobs
✔ EQ Knobs
- [Tango],eq_knobs
+ [Master],show_eqs
@@ -432,7 +432,7 @@ Description:
182,17
me,me
- [Master],show_mixerr
+ [Master],show_mixer
visible
@@ -527,7 +527,7 @@ Description:
0me,1min
- [Master],show_mixerr
+ [Master],show_mixer
visible
@@ -700,13 +700,13 @@ Description:
[ 2 ]
26
0
- [Tango],4_fx_units
+ [Tango],4_FxUnits
[ 4 ]
26
1
- [Tango],4_fx_units
+ [Tango],4_FxUnits
0me,1min
@@ -739,7 +739,7 @@ Description:
Super Knobs
✔ Super Knobs
- [Tango],fx_super_knob
+ [Master],show_superknobs
@@ -810,13 +810,17 @@ Description:
-
+
+
+
+ SamplerRowsButton_Singleton
+
-
+
AlignLeft
horizontal
diff --git a/res/skins/Tango/skin_settings_sampler_rows_16.xml b/res/skins/Tango/skin_settings_sampler_rows_16.xml
new file mode 100644
index 000000000000..2a126e379581
--- /dev/null
+++ b/res/skins/Tango/skin_settings_sampler_rows_16.xml
@@ -0,0 +1,37 @@
+
+
+
+ 112me,13min
+ [Tango],sampler_bank_next
+ [Tango],sampler_bank_prev
+
+
+
+ AlignLeft
+ horizontal
+
+
+ 1
+ 2
+ 2
+
+
+
+
+
+ AlignLeft
+ horizontal
+
+
+ 2
+ 1
+ 1
+
+
+
+
+
+
+
diff --git a/res/skins/Tango/skin_settings_sampler_rows.xml b/res/skins/Tango/skin_settings_sampler_rows_64.xml
similarity index 93%
rename from res/skins/Tango/skin_settings_sampler_rows.xml
rename to res/skins/Tango/skin_settings_sampler_rows_64.xml
index 23eae1cbaf6a..9495f003a4c4 100644
--- a/res/skins/Tango/skin_settings_sampler_rows.xml
+++ b/res/skins/Tango/skin_settings_sampler_rows_64.xml
@@ -1,9 +1,5 @@
diff --git a/res/skins/Tango/spacer_topbar.xml b/res/skins/Tango/spacer_topbar.xml
index 7395e36a3b1e..003da1effb95 100644
--- a/res/skins/Tango/spacer_topbar.xml
+++ b/res/skins/Tango/spacer_topbar.xml
@@ -82,7 +82,7 @@ Description:
horizontal
96f,0f
- [Tango],eq_knobs
+ [Master],show_eqs
visible
diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index b29e7804709d..8a4c3fb8eb13 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -7,14 +7,14 @@ Variables:
-->
- SpinnyCover
+ SpinnyCover_Container
max,me
vertical
- SpinnyCover_Container
+ SpinnyCover
111f,111f
vertical
@@ -69,27 +69,21 @@ Variables:
- 0,0
- -1,3
- me,me
+ 0me,1f
RoundFiller25
- 0me,22f
+ 0me,24f
vertical
- 0me,25min
+ me,i
Spacer1e0me,3f
RoundFiller250me,22me
-
- [Tango],loop_beatjump_controls
- visible
-
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 02de60470c42..be5a236a82ca 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -78,8 +78,8 @@ WWidgetGroup {
#WaveformContainer3,
#WaveformContainer4 {
/* waveform play position should stay centered, so we shift the waveform
- containers right to compensate for (inactive) beatgrid button toggle */
- padding-right: 17px;
+ containers right to compensate for (inactive) beatgrid button toggle
+ padding-right: 17px; */
/* Also add respective padding at the right, so all beatgrid buttons are shown */
margin-right: -17px;
}
@@ -239,15 +239,18 @@ WWidgetGroup {
background-color: #0f0f0f;
}
-#MasterMixerLabel {
- image: url(skin:/buttons/btn_master.svg) no-repeat center center;
-}
+#MasterHeadMixerLabel {
+ image: url(skin:/buttons/btn_master_head_mixer.svg) no-repeat center center;
+ }
+ #MasterMixerLabel {
+ image: url(skin:/buttons/btn_master.svg) no-repeat center center;
+ }
+ #HeadphoneMixerLabel {
+ image: url(skin:/buttons/btn_head.svg) no-repeat center center;
+ }
#BoothMixerLabel {
image: url(skin:/buttons/btn_booth.svg) no-repeat center center;
}
-#HeadphoneMixerLabel {
- image: url(skin:/buttons/btn_head.svg) no-repeat center center;
-}
#MixerbarButton,
#MixerbarPflButton,
@@ -749,21 +752,27 @@ padding-left: 2px;
#DeckButtonExpanded:hover {
background-color: #000;
}
- #DeckControlsToggler_Left[displayValue="0"] {
+ #DeckControlsToggler_Left[displayValue="0"],
+ #MasterHeadMixerToggle[displayValue="0"] {
background: transparent url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
}
- #DeckControlsToggler_Left[displayValue="0"]:hover {
+ #DeckControlsToggler_Left[displayValue="0"]:hover,
+ #MasterHeadMixerToggle[displayValue="0"]:hover {
background: #151515 url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
}
- #DeckControlsToggler_Left[displayValue="1"] {
+ #DeckControlsToggler_Left[displayValue="1"],
+ #MasterHeadMixerToggle[displayValue="1"] {
background: transparent url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
+ }
+ #DeckControlsToggler_Left[displayValue="1"] {
border-color: #0f0f0f;
border-style: solid;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-width: 1px 0px 1px 1px;
}
- #DeckControlsToggler_Left[displayValue="1"]:hover {
+ #DeckControlsToggler_Left[displayValue="1"]:hover,
+ #MasterHeadMixerToggle[displayValue="1"]:hover {
background: #000 url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
}
@@ -1260,12 +1269,6 @@ decks, samplers, mic, aux */
padding: 0px 2px 0px 1px;
}
-#VUMeterMasterContainer {
- margin: 0px 1px 0px 1px;
- background-color: #252525;
- border-radius: 3px;
-}
-
#VUMeterMasterLabel {
image: url(skin:/buttons/btn_master_vu_label.svg) no-repeat center center;
}
@@ -1597,8 +1600,8 @@ decks, samplers, mic, aux */
#FxParameterButtonUnderlay[displayValue="1"] {
background-color: #006596;
}
- #FxParameterButtonName_0,
- #FxParameterButtonName_1 {
+ #FxParameterButtonName_inactive,
+ #FxParameterButtonName_active {
font-size: 10px/10px;
font-weight: bold;
qproperty-alignment: 'AlignLeft | AlignVCenter';
@@ -1837,9 +1840,10 @@ WTrackProperty#SamplerTitle_mini {
###### Spinnies ##############################################
##############################################################*/
-#SpinnyContainer {
+#SpinnyCover_Container {
margin: 0px;
padding: 0px;
+ background-color: #1e1e1e;
}
#SpinnyMini {
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 31643ed9de81..a86b8414bf55 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -56,6 +56,29 @@ Description:
+
+ 28f,28f
+ horizontal
+
+
+
+
+ [Tango],master_mixer
+
+ visible
+
+
+
+
+ MasterHeadMixerToggle
+
+ 15f,28f
+ [Tango],master_mixer
+
+
0min,1min
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
index bfd28dc632ce..f0dff7ce05ef 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/vumeter_master.xml
@@ -1,84 +1,142 @@
-
- VUMeterMasterContainer
- vertical
- min,max
+
+ VuMeterMaster
-
- VUMeterFloating
- horizontal
- min,max
+
+ vertical
+ min,min
-
- stacked
- 4f,-1min
+
+ VUMeterFloating
+ vertical
+ min,min
-
- master_VuMeterL
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
-
- [Master],PeakIndicatorL
-
-
-
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
- false
- 5
- 500
- 50
- 2
-
- [Master],VuMeterL
-
-
-
-
+
+ horizontal
+ min,max
+
+
+ stacked
+ 4f,-1min
+
+
+ master_VuMeterL
+ skin:/graphics/vumeter_floating_clipping_over.png
+ skin:/graphics/vumeter_floating_clipping.png
+
+ [Master],PeakIndicatorL
+
+
+
+ skin:/graphics/vumeter_floating_over.png
+ skin:/graphics/vumeter_floating.png
+ false
+ 5
+ 500
+ 50
+ 2
+
+ [Master],VuMeterL
+
+
+
+
-
- stacked
- 4f,-1min
-
-
- master_VuMeterR
- skin:/graphics/vumeter_floating_clipping_over.png
- skin:/graphics/vumeter_floating_clipping.png
-
- [Master],PeakIndicatorR
-
-
-
- skin:/graphics/vumeter_floating_over.png
- skin:/graphics/vumeter_floating.png
- false
- 5
- 500
- 50
- 2
-
- [Master],VuMeterR
-
-
+
+ stacked
+ 4f,-1min
+
+
+ master_VuMeterR
+ skin:/graphics/vumeter_floating_clipping_over.png
+ skin:/graphics/vumeter_floating_clipping.png
+
+ [Master],PeakIndicatorR
+
+
+
+ skin:/graphics/vumeter_floating_over.png
+ skin:/graphics/vumeter_floating.png
+ false
+ 5
+ 500
+ 50
+ 2
+
+ [Master],VuMeterR
+
+
+
+
+
+
+
+ 0f,4f
+
+
+ VUMeterMasterLabel
+ 16f,20f
+
+
+ 0f,1f
-
+
-
+
+
+
- 0min,2f
+
+ horizontal
+ max,min
+
+
- VUMeterMasterLabel
- 16f,20f
+ horizontal
+ min,min
+
+
+
+ min,min
+ vertical
+
+
+ VuMeterMaster
+
+
+
+ [Tango],vumeter
+ visible
+
+
+
+
+ [Master],show_mixer
+
+ visible
+
+
+
+
+
+ horizontal
+ min,min
+
+
+ VuMeterMaster
+
+
+
+ [Master],show_mixer
+ visible
+
- 0min,3f
-
+
diff --git a/res/skins/Tango/vumeter_master_container.xml b/res/skins/Tango/vumeter_master_container.xml
deleted file mode 100644
index 7aa3fbdfff8e..000000000000
--- a/res/skins/Tango/vumeter_master_container.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- horizontal
- max,min
-
-
-
-
- horizontal
- min,min
-
-
-
- min,min
- vertical
-
-
-
-
- [Tango],vumeter
- visible
-
-
-
-
- [Master],show_mixer
-
- visible
-
-
-
-
-
- horizontal
- min,min
-
-
-
-
- [Master],show_mixer
- visible
-
-
-
-
-
-
diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index fef4ac2364e9..296ab89d0114 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -39,7 +39,7 @@ Variables:
cue_point
- C
+ Q
top|right
#FF0080
#FFFFFF