diff options
Diffstat (limited to 'res')
42 files changed, 1008 insertions, 319 deletions
diff --git a/res/effects/chains/Echoverb HP.xml b/res/effects/chains/Echoverb HP.xml new file mode 100644 index 0000000000..7c9a8db2b1 --- /dev/null +++ b/res/effects/chains/Echoverb HP.xml @@ -0,0 +1,142 @@ +<?xml version='1.0' encoding='utf-8'?> +<EffectChain> + <Name>Echoverb HP</Name> + <MixMode>DRY+WET</MixMode> + <SuperParameterValue>0</SuperParameterValue> + <Effects> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.threebandbiquadeq</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>low</Id> + <Value>0.34375</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>mid</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>high</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killLow</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killMid</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killHigh</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.echo</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>delay_time</Id> + <Value>0.5</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>feedback_amount</Id> + <Value>0.707946</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>pingpong_amount</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>send_amount</Id> + <Value>0</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>quantize</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>triplet</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.reverb</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>decay</Id> + <Value>0.5</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>bandwidth</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>damping</Id> + <Value>0.277905</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>send_amount</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect/> + </Effects> +</EffectChain> diff --git a/res/effects/chains/Filter Echo.xml b/res/effects/chains/Filter Echo.xml new file mode 100644 index 0000000000..5dc15ccfa8 --- /dev/null +++ b/res/effects/chains/Filter Echo.xml @@ -0,0 +1,87 @@ +<?xml version='1.0' encoding='utf-8'?> +<EffectChain> + <Name>Filter Echo</Name> + <MixMode>DRY/WET</MixMode> + <SuperParameterValue>0.5</SuperParameterValue> + <Effects> + <Effect> + <MetaParameterValue>0.5</MetaParameterValue> + <Id>org.mixxx.effects.filter</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>lpf</Id> + <Value>22050</Value> + <LinkType>LINKED_LEFT</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>q</Id> + <Value>0.707107</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>hpf</Id> + <Value>13</Value> + <LinkType>LINKED_RIGHT</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0.5</MetaParameterValue> + <Id>org.mixxx.effects.echo</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>delay_time</Id> + <Value>1.0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>feedback_amount</Id> + <Value>0.707946</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>pingpong_amount</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>send_amount</Id> + <Value>0</Value> + <LinkType>LINKED_LEFT_RIGHT</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>quantize</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>triplet</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect/> + <Effect/> + </Effects> +</EffectChain> diff --git a/res/effects/chains/Mid-Side.xml b/res/effects/chains/Mid-Side.xml new file mode 100644 index 0000000000..2c7735b6fc --- /dev/null +++ b/res/effects/chains/Mid-Side.xml @@ -0,0 +1,39 @@ +<?xml version='1.0' encoding='utf-8'?> +<EffectChain> + <Name>Mid/Side</Name> + <MixMode>DRY/WET</MixMode> + <SuperParameterValue>0.5</SuperParameterValue> + <Effects> + <Effect> + <MetaParameterValue>0.5</MetaParameterValue> + <Id>org.mixxx.effects.balance</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>balance</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>midSide</Id> + <Value>0</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>bypassFreq</Id> + <Value>16</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect/> + <Effect/> + <Effect/> + </Effects> +</EffectChain> diff --git a/res/effects/chains/Side Reverb HP.xml b/res/effects/chains/Side Reverb HP.xml new file mode 100644 index 0000000000..ba39975e88 --- /dev/null +++ b/res/effects/chains/Side Reverb HP.xml @@ -0,0 +1,121 @@ +<?xml version='1.0' encoding='utf-8'?> +<EffectChain> + <Name>Side Reverb HP</Name> + <MixMode>DRY+WET</MixMode> + <SuperParameterValue>0</SuperParameterValue> + <Effects> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.threebandbiquadeq</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>low</Id> + <Value>0.28125</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>mid</Id> + <Value>0.96875</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>high</Id> + <Value>0.984375</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killLow</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killMid</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>killHigh</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.reverb</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>decay</Id> + <Value>0.690476</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>bandwidth</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>damping</Id> + <Value>0.15625</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>send_amount</Id> + <Value>0</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.balance</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>balance</Id> + <Value>-0.015625</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>midSide</Id> + <Value>0.508312</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>bypassFreq</Id> + <Value>26.0248</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect/> + </Effects> +</EffectChain> diff --git a/res/effects/chains/Smooth Growl.xml b/res/effects/chains/Smooth Growl.xml new file mode 100644 index 0000000000..6f8ef61458 --- /dev/null +++ b/res/effects/chains/Smooth Growl.xml @@ -0,0 +1,107 @@ +<?xml version='1.0' encoding='utf-8'?> +<EffectChain> + <Name>Smooth Growl</Name> + <MixMode>DRY/WET</MixMode> + <SuperParameterValue>0</SuperParameterValue> + <Effects> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.bitcrusher</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>bit_depth</Id> + <Value>16</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>1</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>downsample</Id> + <Value>1</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>1</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.moogladder4filter</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>lpf</Id> + <Value>0.5</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>1</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>resonance</Id> + <Value>1.54534</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>hpf</Id> + <Value>0.0003</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect> + <MetaParameterValue>0</MetaParameterValue> + <Id>org.mixxx.effects.echo</Id> + <BackendType>Built-In</BackendType> + <Parameters> + <Parameter> + <Id>delay_time</Id> + <Value>0.996914</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>feedback_amount</Id> + <Value>0.707946</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>pingpong_amount</Id> + <Value>0.169252</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>send_amount</Id> + <Value>0</Value> + <LinkType>LINKED</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>quantize</Id> + <Value>1</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + <Parameter> + <Id>triplet</Id> + <Value>0</Value> + <LinkType>NONE</LinkType> + <LinkInversion>0</LinkInversion> + <Hidden>0</Hidden> + </Parameter> + </Parameters> + </Effect> + <Effect/> + </Effects> +</EffectChain> diff --git a/res/qml/EffectSlot.qml b/res/qml/EffectSlot.qml index f3004d376b..da767a616b 100644 --- a/res/qml/EffectSlot.qml +++ b/res/qml/EffectSlot.qml @@ -6,7 +6,7 @@ import "Theme" Item { id: root - property Mixxx.EffectSlotProxy slot: Mixxx.EffectsManager.getEffectSlot(1, unitNumber, effectNumber) + property Mixxx.EffectSlotProxy slot: Mixxx.EffectsManager.getEffectSlot(unitNumber, effectNumber) property int unitNumber // required property int effectNumber // required property bool expanded: false @@ -111,8 +111,8 @@ Item { // TODO: Use null coalescing when we switch to Qt >= 5.15 property string label: shortName ? shortName : name property string key: controlKey - property bool isButton: controlHint > 0 && controlHint == 6 - property bool isKnob: controlHint > 0 && controlHint < 6 + property bool isKnob: type == 0 + property bool isButton: type == 1 width: 50 height: 50 diff --git a/res/skins/Deere/effect_parameter_button.xml b/res/skins/Deere/effect_parameter_button.xml index 220679253b..0a65466d64 100644 --- a/res/skins/Deere/effect_parameter_button.xml +++ b/res/skins/Deere/effect_parameter_button.xml @@ -9,6 +9,7 @@ EffectButtonParameter: the button parameter --> <Template> + <SetVariable name="EffectUnitGroup">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable> <WidgetGroup> <Layout>vertical</Layout> <ObjectName>EffectButtonParameter</ObjectName> @@ -21,6 +22,9 @@ <MaximumSize>58,15</MaximumSize> <SizePolicy>me,f</SizePolicy> <ObjectName>EffectButton</ObjectName> + <EffectUnitGroup><Variable name="EffectUnitGroup"/></EffectUnitGroup> + <Effect><Variable name="Effect"/></Effect> + <EffectButtonParameter><Variable name="EffectButtonParameter"/></EffectButtonParameter> <NumberStates>2</NumberStates> <State> <Number>0</Number> diff --git a/res/skins/Deere/effect_parameter_knob.xml b/res/skins/Deere/effect_parameter_knob.xml index 2ca30c5585..2f73f9b445 100644 --- a/res/skins/Deere/effect_parameter_knob.xml +++ b/res/skins/Deere/effect_parameter_knob.xml @@ -9,6 +9,7 @@ EffectParameter: the parameter --> <Template> + <SetVariable name="EffectUnitGroup">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable> <WidgetGroup> <Layout>vertical</Layout> <MinimumSize>34,</MinimumSize> @@ -26,6 +27,9 @@ <Knob>knob_small.svg</Knob> <MinAngle>-230</MinAngle> <MaxAngle>50</MaxAngle> + <EffectUnitGroup><Variable name="EffectUnitGroup"/></EffectUnitGroup> + <Effect><Variable name="Effect"/></Effect> + <EffectParameter><Variable name="EffectParameter"/></EffectParameter> <Connection> <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/></ConfigKey> </Connection> diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml index d0e67f0f5f..ad2df1b208 100644 --- a/res/skins/Deere/equalizer_rack_parameter_left.xml +++ b/res/skins/Deere/equalizer_rack_parameter_left.xml @@ -24,6 +24,9 @@ <Size>15f,20f</Size> <ObjectName>EQKillButton</ObjectName> <NumberStates>2</NumberStates> + <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup> + <Effect><Variable name="EffectNumber"/></Effect> + <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter> <State> <Number>0</Number> </State> @@ -63,6 +66,9 @@ <MinAngle>-135</MinAngle> <MaxAngle>135</MaxAngle> <KnobCenterYOffset>1.602</KnobCenterYOffset> + <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup> + <Effect><Variable name="EffectNumber"/></Effect> + <EffectParameter><Variable name="parameter"/></EffectParameter> <Connection> <ConfigKey><Variable name="EqualizerEffe |