From fc423191a4119cdc4b781d78c0286d82cf19ae2c Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Sat, 20 Apr 2024 21:17:12 +0100
Subject: [PATCH] feat: add quick FX for stem

This allows the effect manager to apply quick effect on each stem.
Effects are applied post stem fader, but pre deck fader
---
 res/skins/LateNight/waveform.xml              |  61 ++++++++++++--
 res/skins/Shade/btn/btn_stem_minus.png        | Bin 0 -> 8035 bytes
 res/skins/Shade/btn/btn_stem_plus.png         | Bin 0 -> 6899 bytes
 res/skins/Shade/deck.xml                      |  14 ++--
 res/skins/Shade/deck_transport.xml            |  65 ++++++++++-----
 res/skins/Shade/waveform.xml                  |  24 +++++-
 res/skins/Tango/waveform.xml                  |  54 +++++++++++--
 src/effects/effectsmanager.cpp                |  60 +++++++++++++-
 src/effects/effectsmanager.h                  |   3 +
 .../presets/effectchainpresetmanager.cpp      |  75 +++++++++++++++++-
 .../presets/effectchainpresetmanager.h        |   3 +
 src/effects/presets/effectxmlelements.h       |   1 +
 src/engine/channels/enginedeck.cpp            |  60 +++++++++++---
 src/engine/channels/enginedeck.h              |   4 +
 src/mixer/playermanager.cpp                   |   8 ++
 src/mixer/playermanager.h                     |   7 ++
 src/skin/legacy/legacyskinparser.cpp          |   3 +
 src/util/sample.cpp                           |  16 ++++
 src/util/sample.h                             |  11 +++
 19 files changed, 411 insertions(+), 58 deletions(-)
 create mode 100644 res/skins/Shade/btn/btn_stem_minus.png
 create mode 100644 res/skins/Shade/btn/btn_stem_plus.png

diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index f57c3f81c3da..dd260e34bf26 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -133,12 +133,10 @@
               <TextColor>#FFFFFF</TextColor>
             </Mark>
             <StemControl alignment="left">
-              <MinimumSize>138,68</MinimumSize>
-              <MaximumSize>158,1920</MaximumSize>
-              <SizePolicy>me,me</SizePolicy>
+              <MinimumSize>248me,68m</MinimumSize>
               <Stem>
-                <MinimumSize>130,17</MinimumSize>
-                <MaximumSize>150,34</MaximumSize>
+                <MinimumSize>240,17</MinimumSize>
+                <MaximumSize>240,34</MaximumSize>
                 <SizePolicy>me,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
@@ -151,7 +149,7 @@
                     <MinimumSize>20,17</MinimumSize>
                     <MaximumSize>40,34</MaximumSize>
                     <SizePolicy>me,me</SizePolicy>
-                    <Knob>skins:LateNight/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_<Variable name="KnobColorEq"/>.svg</Knob>
+                    <Knob>skins:LateNight/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_grey.svg</Knob>
                     <BackPath>skins:LateNight/<Variable name="KnobScheme"/>/knobs/knob_bg_regular.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
@@ -164,6 +162,57 @@
                       <ConfigKey><Variable name="StemGroup"/>,stem_<Variable name="StemIdx"/>_volume</ConfigKey>
                     </Connection>
                   </KnobComposed>
+                  <EffectChainPresetSelector>
+                    <ObjectName>QuickEffectSelectorLeft</ObjectName>
+                    <MinimumSize>40,17</MinimumSize>
+                    <MaximumSize>70,28</MaximumSize>
+                    <SizePolicy>me,e</SizePolicy>
+                    <EffectUnitGroup>[QuickEffectRack1_<Variable name="StemFxGroup"/>]</EffectUnitGroup>
+                  </EffectChainPresetSelector>
+                  <WidgetGroup>
+                    <Size>14f,9f</Size>
+                    <Children>
+                      <PushButton>
+                        <TooltipId>QuickEffectRack_enabled</TooltipId>
+                        <ObjectName>QuickEffectDot</ObjectName>
+                        <Pos>4,0</Pos>
+                        <Size>9f,9f</Size>
+                        <NumberStates>2</NumberStates>
+                        <RightClickIsPushButton>false</RightClickIsPushButton>
+                        <State>
+                          <Number>0</Number>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[QuickEffectRack1_<Variable name="StemFxGroup"/>],enabled</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </Children>
+                  </WidgetGroup>
+                  <KnobComposed>
+                    <TooltipId>QuickEffectRack_super1</TooltipId>
+                    <Pos>0,0</Pos>
+                    <MinimumSize>20,17</MinimumSize>
+                    <MaximumSize>40,34</MaximumSize>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Knob>skins:LateNight/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_green.svg</Knob>
+                    <BackPath>skins:LateNight/<Variable name="KnobScheme"/>/knobs/knob_bg_regular.svg</BackPath>
+                    <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                    <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                    <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                    <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+                    <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+                    <ArcColor><Variable name="ArcColorFx12Quick"/></ArcColor>
+                    <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                    <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                    <KnobCenterYOffset>1.998</KnobCenterYOffset>
+                    <Connection>
+                      <ConfigKey>[QuickEffectRack1_<Variable name="StemFxGroup"/>],super1</ConfigKey>
+                    </Connection>
+                  </KnobComposed>
                 </Children>
               </Stem>
               <Connection>
diff --git a/res/skins/Shade/btn/btn_stem_minus.png b/res/skins/Shade/btn/btn_stem_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae616e19e8d5f6abab4c476fcdb2c314656a250a
GIT binary patch
literal 8035
zcmeHrc{r49*gmrFyX<4gK4ykt7$#*Odt^;AD`OeUj3vcO)`Sohl|5@@DPmGWmX|0y
zm5?Q6Z9yr%q2BHIegC}2@%#RJXO5Y9p6foZ^SZ9{zMlJ-`@U#vZOX+i#!g2^$AvO8
zvZMWiX&-J@X4?1TF=Kr?Iv#5HNoR^3IusBP<WC^_;sKPi0eApDj7XrP3!ALU_6d=o
za>eeEg<KfkT%PA;JZl}2Hotg?dgNstiC-aoIr{~LN8E_sAx^4sZ)5B2Zl?`*57o`}
zZjs}FjnvtWo=dBFd1s|#2DUbKJ3dKqJbtwHJ(9<0%3QB>alrk}C;cg&JPtjZD^ByJ
zao@suy6>`>M2@YU5e^4usup&0M2Lv387LiPX`{BDZ<zn^Ze<bFO^w<5WFyw>my&Rl
zq}nh}UhaL<l#T?sDLj23P(Ba64UfX@)mvN<$u^xz9C*3eym5WVR8DS=su!`#2}B5c
z?`{^KvHg1f3scp@qqaL298=enmMk(pEPiTSquM?)oiEv4RN2~c`2Hor%7$KN@5s*P
zp2W)HYWC?qH&k#0{7dcAoup5(7UQ?6viIJL?{Qe%+tJ-#Ir*hfa2O2!UJWr|tQH7*
z4ryoGIeNE-7236ed25`kQnEv^0i`}@RXgmhlpt_Q3}w&K8;l-MitOZH#V4Fub+01h
zxo(Oby2Nz!W7p$V8~uRP8OaOt{O{Uh{FATxwn65W(}#}9-GrCV%WuEk`fzzB=U9#N
z)hc7=i&>s*N;511#T=B`j<!!jF$GIhI{LsR1BgsCU0K{o1FlC;#|;4Kl2P&nL&r`W
z17z}N0kGEP7pyLa5RVSFAvLddzf9ed(MVG)A4E&W%6rVamE~R4)r46nH)YycsI(-j
z`&2Ytb@iz<Nvgkn^|VS=!)Um;-{vqG+_E`(PC6o0o4?q_MAGjwwDYDLx$fiK&=rA&
zOhr_kpn^jVMO0m6zW$?fWp%?hF(2>Y;`IbazscZtuh919x@&bGNYu63#e!k$Acef3
z_r%h?zy$?w@SVp$cImxmj6v?j%N?5+#nu`&YmFcXrFhXO<7<Z!;W1GcQscANWEQ=;
zMG28c&4mD|g2MzcPAG4mZbwiXONiRhM6sYf0aEq+nSe`sprHQz9mBcEt`*(kVVu|L
zj$E~S#ovs!0?%)W?!anyRwjOoMC(WFj&a=5u@jwi9esN_)rB(fVz9g_!D`65yt3g4
zy+Ex19;WrmF~xXxR%1nCXfSA5C&TgF6x7^u$Ih;lu~SCrMwe)4?rNBY<41P4+kFkN
z(cpO1GaScSS*$!A(>0Q67^E#c6I^X<LcdC_&A*}(VyNNy&br9l-k<BCn#mN$(-R@B
zRPJ=^hykQ@M6ZkV+S5~dnn%fEh|_%fB+|GvQ!*n9zy0u3pWt2zD?@gM-hIAVbE5}i
z6PX<A@HBtV*p{clUos}y;kgo|YT^6c1yiMJTy~kDJH9u3QkKEW@sB8qsME@5xr(mR
zRQ|781y2RCK5W*v-J3T#_HevJqD7|%f4|OJS{_p**XVO?vd#K@z||?jq*%*)ms11%
zejP)l>lIQ}p#?uY#G0@2{Vo^hMtlHZf%TI|7F{*7lJ4J>m3<k-+#WOJ?d_Jwp=!Gm
zK{%z-vvHq0n9?s3FH83(X}<1-2lfX09jlYrm5dbzE`;JVKY^ngnq}5xRvp3gtlf`a
z+G}>GJ0L;r`DX>hh{4mSo-08H4?Oymg*#EE3%<BM&ID1=^YOSUVpLLDhT#S6=4qiq
zPth9pbgn@Ky-Wag%qqRr5TP^*J@5MZ3&TX_brm(nQo0uVVdoT?jWn)kqvl*y$UEiZ
zM+$~EIqGY_wrnUU#FbZ<9F>>IX3l<6j^mzVKT>!8jaa7ONa*5t{^gdvX7c9B@^)84
zN@(QdgNT}eBgb;fNf4sSliRAlW2Tkix|uKZrcU4lb>;#9jX6{OlS?*Ri>u5_Y7D3v
zKiqHk=G%gl9`Xz#t{k4v*uJ$Z2KP;wA@rpQ<>v^I>f6#~XGoVrWMrRzn*Oewf4sd;
zWm_SM|LDUR9%XfyJm;KaB>b5_b4)|&qi-*_j`+&TYOS8@buSq-m4Cy+7US!f`?AW`
zLLUvNmgg3XU*aW+%NsOWqvA19W)`Xj)z)RgY#u-A*tRnF>UkQz^52|U2XW3Qo!%3V
ztv)_qrnwmk%(%lK?YCX?T)(uxy~lIec=Yy2&a~dQ^mRvrV2irZm_wM-F)=^nN?vJO
zOg@u5kWAba6sV{L2PD;sw3katHAbuUeiM!iIYluoGNzAi=>|H=hIX{%!rByGqm@SN
zXKw5H6skSG^F9}^)EYY|0fLqFvA4`Bn!!(ZKX&lB19GZJ<|EzBdX6_g=LH5GPcXf;
zI;3UR<CS?WU*>{mzMc8+8BOO^Z1eMXOCnR6pCs6#PS`NH<4AUZV8oL?<DxxDs_(}P
z50)MaK2>jk`2DV$kfQ>n(Wzd(y2^erQz==>YS>ZeYZdFt3n@H3Wi9T(hy~{m$?KAg
zK!<_^;6*N<d)0@tZrv3orkjYlofISYRtqsp-CN-Pkye!g6!b1*x#!u(2&xz7=6UV1
zsC=t<xuIe<^5NO;=YiUtUsg`!I)!#GIY<pPR_c8RDNHkTJ%NSz(Vwu-8pLuFbu~wN
zv$QK58+c7F5kqp^aYbwM<+)Tjv)-buLAbrp7q1o{VsRZBl*H66+}w7UnN4LgxkUZ0
zOX8Iu{g>lLQv%zN2JM;kzX!AN@ifg>7(pYOoK6K}PBmnSDkx^0y+g{6y_~TH1D&5`
z;Q;%%4$tPWDvB99#Bw}l5b&K7hBf7f<dh`i#^rpPo9-;-Xr7M9skX1=&1=t_&V+Z^
zPe5<Qd{F#a=VaJl3#~M;t&)Z%rod3etaJ)mf`g~GV-ZLJxf2i)v`Q*K8p1u#g>UUY
znc?R=V5sSVkgjmKc0xS()iZWgPSI0EqO;HJysjl}-v5Lfx%nl_yW(wa<SDP?uxlkZ
z*xr^Uf0yiX5Ghie;BXg6FFfPjX!wBpIybTJT*9Ow7r&I$dl)%MHuh9R;Y&O5u)y<5
z7h}F}2y$5GZBxE$F@xoV%ca^o<4_>U+UWA*vG)xGEZ3!&voe^#+L)NF>pM0vRJP|e
zfC){FxAiIZT9%@aoIY!wJ=<4v)h~-%quKGr$p!ShPc;w(ac>`>ZD%&+ZVPBzD5;6#
zblMUE(7gac&YIl|w-i2S-usF%BvGz8j$d((<BG;9T+*5FMxr6LJ1QnI2)daM$y#`#
zF$1%f5EM@G7h=kO&c;2m-sh=|Y+K(Jc;hU}&>4X2lnF07#@hB!Nj{TjL1^Q_xjxl#
zgWK&4gv?@Wq55qu6vS6aR`{8jn>)tvu%=B|_-OLi<F|b*2BWyD1@8Ab)n89FglB!i
z26#v?-uk^E#APRDtju|6Zwlk`ghcI#?R0=`;aRWcJi7G*%AY^ND<>-s$_3VH;TqyS
zg!#T!XU+&JCvaY=y`*q&xh7ovV{w<Ita*XuWb*iOhqHMtlnrw``y*p}u1%!dmEC+x
zP3Y!(_rZJD<tK%!r^2Y%%o%=4(=BOreA6zfB&oxAcEX5Hr1xDnn^yP?7vgD@Sz2MN
zFYvMWiP_Sm0ZCJDp=dHjFRB5Z(Gfeso}D1GLB}~BlgTSP%qPxgbrav-&Z=P^Z6O*s
zp(NoImlG!aQu<=$M4vg|X9D3fj#7Y{lF#5OWhp#n!^L5!`HZl$H0<h}Oo?J<YIRuW
z6xD9`7+mO3j+Zi66}^!fIESC<No(Dfgffmi%*8V_@Di+|M16vvgr?X(EF-wQb8Y`9
zm5G1hwCuMk8X|5qcc@-D=OzfpddDMR$+Bw51UmV$gf%?9^6or)A5!;LqD<?G2*Z}w
ze1o_vVboW3+lDiK=RM@Pw{r9#CMUiyMWa)3dF&%o?lF&{dvn6sI{6S~PV(AuE_owy
zs@*3}$H)$sC71BK<J)rAF_q{D&X$CN;xCP>>_y%MJl4FXEhC<SCW+c?%ZaxNRNPz)
zm%Bf?UE2%<KACD2LVj{34ZW<iG}=wQ!DA=CLn*iz8Q%2_U1X}WjcTYZyg%<HWH)Ag
zR^F~=##>(%*k9!vF*plbhQ8HY&l!7FmyVhrdi|ATRd!rk&oE(KM>Z@@M-(p1!F2z)
zmLca*;#Iz&=_G=Y0Q<m&k?GU07<T%AUdYWm0!tn^ZHE=dsIC#aVA)!yL|-|o@$+{|
z67;V;7>$4AA$`J_LxHalAK@>W72HlrIjU++7@i#He(GyDkI_#q!>F^a@9czU96hw~
zWHm)^l~Kps`Lbv6CHRb%+jEF~U2s88E4<HDB8N*!YDfa+=x&>_BH~cHY$AB`v^hkF
zI{V5xJ6U6U9C5g8iOreYUHpNQ#PMvC`<c?k%8BW}E%Rkix$fKNPHdcamc{JBnK=r>
z`>veNQP`?K$6vwJ!t@6C_0>!I24b_og0~kZ&sEJj(?+HzJVR>J?vo*yx2S0m!+3=_
zSnag;l~B*~cLimwzo(|kJ`}nb$U_L5ejJEis+d7E43MWZlJBqS+}udsE7LFcRb=SA
z#CJ8Y#|`2ld@9W%S`6tmt_P3kQz><MR?1;;&nLSx`C>@9?BqI~NMeNaU{!UEVUjqS
zLcX$r)L^-OI+{)GwNtstnYk8qz+G<Tgo(CC(DGdNR_4#TC&svmtJ(mL_?#2ST);B|
zi8baS=#^IsGh3^WkWZ4!ORWU11-;6wu&W*PE3sLDX~P-4`P%t(cYeFCYphLLh;Tkk
zjM}c>*toC@{gjFI@Fl2j+=y%B8t<I$;-x?|JNe%$KIkGfh6&v{rsbk(s=U28`u#&c
zWjOWBVpAZq&<xkQapEYU4r!Ufdx$MYFEEv9V(+2P#Q0&l^O;<emlJKZ6LFHsb}zi<
zJWAoVhki(0m+{?gO<8tfFA+?C(V;h#O+K9RQOaj}+|s=qNWBHnYTNpdbnam&z+PqG
zM`q%c)AW?=ftB8z;TMN)`p7Mo4WF}UhZ9(F8O+$hk{JWY3M-SyRr2Qcv?F$7<hp~X
z6Ex<zpR^@Yh>UoVL`abQ_heBpy0CDn^7S)MOVd+*#rXJYrk3X$T6MOIz)(_tBtT?)
zfK*DItw#$EyXtNC<kvpzE5K!DA4z(ByXIVDa;bzX^O>tT84<O;ivA=KnJ#H)X)4oK
z+XCCt5|;RyHg{LZ;RzFdy`;g*a&|<HUHF44aevYWeZ5=aS}<s^(kgpps!5)l2?#4p
z_-r)Jcdfs#Bj&YeJIn97%_!?HXGdBrY#I}^*Hnuf=OzMbQ{BE4p!=Bm$NDxJbbW?J
z`ezwGbb5)pqa?E8Hx%@TIwqVKKICi)wJuiV`Ajxq)+#o?Y>>sjx#Yayt|v6r>LL#Z
zGmFG8{kAc)Sij`{GJ+}-*7R70Jf|^z>;`LI!d6yKFC(bL<4i^IOaNRk;hB-kkV3@X
z<HvE^E2l0V`aDJbje+q_duWHQaT*;ReJs(?&=zHA_{TP$wt2r9k&ZNLKPK_?%#gXU
zGB;P@Y+3=rg;ywWSXr>ZpiIa$7$W`Sf;<;0=~B_OYrs0T_WktioywR>0BdBFwyw5P
zv)RQx3w97jPkXhCdhRkcly0m{F-J&@1@>BNs3$h<Srz+?Q*5hjQY5E&629*uhW*jo
z4^s3EQ%_y4?ltL~-py$g1ORvkl;ep4{=7E+lgw`;Fz!ky<qe&U>nIVqNL=&shWOjU
zUWwkhXO`i)*A;}5BvnIe?9?@9m1eJ3EM*Shk&dGN&{1X0+rc)QZD#IgTnLC~Xt~<N
zBZ<6#qIh-X8op8og{KBNn*v97WyZi67V=J_>^j1>am+nmVtzbXBUQD{#a<Ic(VYgT
zeu6T@hDH-!2R^ziS$dX%F)v!BW#z6`RJP6F2R~2<<7dA^B4d75Q-{<-qoNfI)sHx_
z56-bOP5(%Kq{L$6ADydtw{i5SwR99`a8@%tH+S?4ApY*oLn^ht@wb6{-*)I7kU=+i
zHMJkmj$6ctv||-#D@z2{-%kyV^T*)T!u$eg$1Zeqdir4jXsi#O0>I!si6kU&jrte}
zAmWffCrvAeRe&Mhi)a=egtrg3K8X$Y!Rp|E`bXLI!Vok9KRg8u2=ntLkr81?-~lg!
zcD-)~0|5sRiVqU#Y-I~D^bf)VU}`Wm2*@~$7@`h5$_~&A!VwU5Mkc=~Xm?1U7ljgl
z0E0tAL)Ahx)ck`y!B8C?9WX>4tga5CAwcA_BnmnVL?X-XQ~cyG!jrK<!~hD>p9I+F
zL}UDeDM%oYHV*hBKfeGgt3T;U<X<Y#^Z<vU1He!<2-wdL{C5vB#W;jU@++bL)q{MJ
zb~**N!;}4kgRpqx5Il(@`*#W)_D}zS;2__Fa&TBM-WTsjgOX`cq5lYJin6l((_>!(
zPoiJIffr5ee;_GD!e3(jBe(sLgL3|!2+jRZ-hZI~sQmy;Ls?lNjQp{|`{|*Kkih-;
z2%JBbh(jD)LbV~98fcs*2!qCIfM5hH?Fs{dg0!JJTIvL}20;gp{~HyGM5drgSo}T}
zja-dL<3ZyII4Bg00ig+KO%MzNQwQllG|(V4R0pG>g~Q@C(3rnb*aQ)2U5WPndsh2Y
zI2siMuceNK;k7|9ZHzhy22s}rVQ}hjT3%?31_XoA#=@}&R5&cc#6QRnO`A@lAKDWS
z4j_3R4D1VzIBttV0@c+Ze_3pO(G&vB0SUAul7hqj8aPSx!`oBP`)WerPz~Bjt*)i1
z4TEcIYWxLq#0QaSow&~lg{W!#<lUbZ1g#jFu;~3hr4bx>&}u;#2I0{Z|Dcop{=P`y
zeoBCS&x7^`=>41&Ga{LWIJ@8Rzk1#tANcd`=Of@tJQxB14%!xh#{LXKMu*^W2Z3mQ
zKZmehXp$$M_I&?ps6Xt)|7Egt;1Er1O&lDgj)l_{*3p51bYNICNJC3Q69dQKa1gZ4
zKiSFt1WG762!Gs@Rw=C-S_2(a15iAWQt6-QP%r$xP7rk%2m%ACLr$tg5bAIQOj88{
zML-}x@UMcw`%m>B73+cjA5HWQ0DoHsXnsF!wB?1iT7myuu6}8@FXR8=>(^ZTA4Z^2
z{}<$6>HD8t|H<{Q6!=%*|GMixx&D;`{|fwHcm02pi~X++51vH(7Zgg{&Tw}2KBaAi
zm@yWnMs$1o@BEh1D>MsRfSC)Kj*f$W|3g3cI`TWs$U;F`8MC}&6ci8#t=7JYrkThn
zqvI#dy09LHnTn!tt%pC$&g;t<f6!ilaGQ?_1nEI@#T8o(D(RfNpb6>Df#<!6QXh+R
zqOFjYoVVna=XyTsNU`t@a@gCTA~6LfB}QWwD4AnPy3StNONNh2*Q*w8e!7?@Rd<Ng
jeN8K7BD%-}!axTLbBKH79R8ISo(^SfZB%XGap8Xe65vLu

literal 0
HcmV?d00001

diff --git a/res/skins/Shade/btn/btn_stem_plus.png b/res/skins/Shade/btn/btn_stem_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a453ab67130e67eadce3f6b667fd09b55054d880
GIT binary patch
literal 6899
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

literal 0
HcmV?d00001

diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index c592d7ec6c98..0d2d21cf3367 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -16,7 +16,7 @@
         <Children>
           <WidgetGroup><!-- Cover/Artist/title/time / waveform/spinny / overview/controls -->
             <ObjectName>DeckLeft</ObjectName>
-            <Size>0e,165f</Size>
+            <Size>0e,175f</Size>
             <Layout>horizontal</Layout>
             <Children>
               <WidgetGroup><!-- Cover/Artist/title/time / waveform/spinny / overview/controls -->
@@ -148,19 +148,19 @@
                   </WidgetGroup><!-- Cover art / Artist/title / Playposition -->
                   <WidgetGroup><!-- Scrolling waveform / Spinny / Vinyl controls -->
                     <ObjectName>DeckUpperLeftMidPart</ObjectName>
-                    <Size>0e,91f</Size>
+                    <Size>0e,81f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
                       <WidgetGroup>
                         <ObjectName>DeckUpperMidPart</ObjectName>
-                        <Size>0e,91f</Size>
+                        <Size>0e,81f</Size>
                         <BackPath>style/style_bg_deck_pane.png</BackPath>
                         <Layout>horizontal</Layout>
                         <Children>
                           <!-- Collapsing Waveform, VinylControl & spinning Vinyl widget-->
                           <WidgetGroup>
                             <ObjectName>DeckWaveformVinylControlSpinny</ObjectName>
-                            <Size>0e,91f</Size>
+                            <Size>0e,81f</Size>
                             <Layout>horizontal</Layout>
                             <Children>
                               <!--If you want the waveforms center to adjust when resizing in a collapsing widget
@@ -179,7 +179,7 @@
                               -->
                               <WidgetGroup>
                                 <Layout>horizontal</Layout>
-                                <Size>0e,91f</Size>
+                                <Size>0e,81f</Size>
                                 <Children>
                                   <Template src="skin:waveform.xml"/>
                                 </Children>
@@ -191,7 +191,7 @@
                                 <Children>
                                   <!-- Spinning Vinyl sub-widget -->
                                   <WidgetGroup>
-                                    <Size>91f,91f</Size>
+                                    <Size>81f,81f</Size>
                                     <Layout>horizontal</Layout>
                                     <Children>
                                       <!--
@@ -201,7 +201,7 @@
                                       -->
                                       <Spinny>
                                         <TooltipId>spinny</TooltipId>
-                                        <Size>91f,91f</Size>
+                                        <Size>81f,81f</Size>
                                         <Channel><Variable name="channum"/></Channel>
                                         <PathBackground scalemode="STRETCH_ASPECT">vinyl_spinny_background.png</PathBackground>
                                         <PathForeground scalemode="STRETCH_ASPECT">vinyl_spinny_foreground.png</PathForeground>
diff --git a/res/skins/Shade/deck_transport.xml b/res/skins/Shade/deck_transport.xml
index 9b663588561a..24cfc11a5f88 100644
--- a/res/skins/Shade/deck_transport.xml
+++ b/res/skins/Shade/deck_transport.xml
@@ -1,9 +1,32 @@
 <Template>
   <WidgetGroup>
-    <Size>243f,59f</Size>
+    <Size>290f,59f</Size>
     <Children>
         <!--
       **********************************************
+      Button- Stem
+      **********************************************
+      -->
+      <PushButton>
+        <TooltipId></TooltipId>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Pressed>skin:/btn/btn_stem_plus.png</Pressed>
+          <Unpressed>skin:/btn/btn_stem_plus.png</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed>skin:/btn/btn_stem_minus.png</Pressed>
+          <Unpressed>skin:/btn/btn_stem_minus.png</Unpressed>
+        </State>
+        <Pos>5,0</Pos>
+        <Connection>
+          <ConfigKey>[Skin],show_stem_controls</ConfigKey>
+        </Connection>
+      </PushButton>
+        <!--
+      **********************************************
       Button- Src
       **********************************************
       -->
@@ -20,7 +43,7 @@
           <Pressed>skin:/btn/btn_src_minus.png</Pressed>
           <Unpressed>skin:/btn/btn_src_minus.png</Unpressed>
         </State>
-        <Pos>5,0</Pos>
+        <Pos>52,0</Pos>
         <Connection>
           <ConfigKey>[Skin],show_microphones</ConfigKey>
         </Connection>
@@ -39,7 +62,7 @@
           <Pressed>skin:/btn/btn_microphone_talkover_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_microphone_talkover_over.png</Unpressed>
         </State>
-        <Pos>5,14</Pos>
+        <Pos>52,14</Pos>
         <Connection>
           <ConfigKey>[Microphone<Variable name="micnum"/>],talkover</ConfigKey>
           <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -60,7 +83,7 @@
           <Pressed>skin:/btn/btn_aux_mute_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_aux_mute_over.png</Unpressed>
         </State>
-        <Pos>5,35</Pos>
+        <Pos>52,35</Pos>
         <Connection>
           <ConfigKey>[Auxiliary<Variable name="auxnum"/>],main_mix</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -85,7 +108,7 @@
           <Pressed>skin:/btn/btn_sampler_minus.png</Pressed>
           <Unpressed>skin:/btn/btn_sampler_minus.png</Unpressed>
         </State>
-        <Pos>53,0</Pos>
+        <Pos>100,0</Pos>
         <Connection>
           <ConfigKey>[Skin],show_samplers</ConfigKey>
         </Connection>
@@ -104,7 +127,7 @@
           <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
-        <Pos>53,14</Pos>
+        <Pos>100,14</Pos>
         <Connection>
           <ConfigKey>[Sampler<Variable name="samplernum1"/>],cue_gotoandplay</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -131,7 +154,7 @@
           <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
-        <Pos>74,14</Pos>
+        <Pos>121,14</Pos>
         <Connection>
           <ConfigKey>[Sampler<Variable name="samplernum2"/>],cue_gotoandplay</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -158,7 +181,7 @@
           <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
-        <Pos>53,35</Pos>
+        <Pos>100,35</Pos>
         <Connection>
           <ConfigKey>[Sampler<Variable name="samplernum3"/>],cue_gotoandplay</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -185,7 +208,7 @@
           <Pressed>skin:/btn/btn_pause_sampler_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_pause_sampler_over.png</Unpressed>
         </State>
-        <Pos>74,35</Pos>
+        <Pos>121,35</Pos>
         <Connection>
           <ConfigKey>[Sampler<Variable name="samplernum4"/>],cue_gotoandplay</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -206,7 +229,7 @@
       -->
       <PushButton>
         <Size>54f,14f</Size>
-        <Pos>101,0</Pos>
+        <Pos>148,0</Pos>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -231,7 +254,7 @@
           <Pressed>skin:/btn/btn_beatjump_forward_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_beatjump_forward.png</Unpressed>
         </State>
-        <Pos>122,14</Pos>
+        <Pos>169,14</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],beatjump_forward</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -249,7 +272,7 @@
           <Pressed>skin:/btn/btn_beatjump_backward_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_beatjump_backward.png</Unpressed>
         </State>
-        <Pos>101,14</Pos>
+        <Pos>148,14</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],beatjump_backward</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
@@ -279,7 +302,7 @@
           <Pressed>skin:/btn/btn_reverse_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_reverse_over.png</Unpressed>
         </State>
-        <Pos>101,35</Pos>
+        <Pos>148,35</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],reverse</ConfigKey>
           <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -310,7 +333,7 @@
           <Pressed>skin:/btn/btn_loop_minus.png</Pressed>
           <Unpressed>skin:/btn/btn_loop_minus.png</Unpressed>
         </State>
-        <Pos>149,0</Pos>
+        <Pos>196,0</Pos>
         <Connection>
           <ConfigKey>[Skin],show_loop_beatjump_controls</ConfigKey>
         </Connection>
@@ -336,7 +359,7 @@
           <Pressed>skin:/btn/btn_beatloop_4_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_beatloop_4_over.png</Unpressed>
         </State>
-        <Pos>149,14</Pos>
+        <Pos>196,14</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],beatloop_4_toggle</ConfigKey>
           <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -358,7 +381,7 @@
       </PushButton>
       <PushButton>
         <TooltipId>reloop_toggle</TooltipId>
-        <Pos>170,14</Pos>
+        <Pos>217,14</Pos>
         <NumberStates>2</NumberStates>
         <LeftClickIsPushButton>true</LeftClickIsPushButton>
         <State>
@@ -393,7 +416,7 @@
           <Pressed>skin:/btn/btn_beatloop_halve_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_beatloop_halve.png</Unpressed>
         </State>
-        <Pos>149,35</Pos>
+        <Pos>196,35</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],loop_halve</ConfigKey>
           <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -408,7 +431,7 @@
           <Pressed>skin:/btn/btn_beatloop_double_overdown.png</Pressed>
           <Unpressed>skin:/btn/btn_beatloop_double.png</Unpressed>
         </State>
-        <Pos>170,35</Pos>
+        <Pos>217,35</Pos>
         <Connection>
           <ConfigKey>[Channel<Variable name="channum"/>],loop_double</ConfigKey>
           <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -436,13 +459,13 @@
           <Pressed>skin:/btn/btn_intro_cues.png</Pressed>
           <Unpressed>skin:/btn/btn_intro_cues.png</Unpressed>
         </State>
-        <Pos>196,0</Pos>
+        <Pos>245,0</Pos>
         <Connection>
           <ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
         </Connection>
       </PushButton>
       <WidgetGroup><!-- Hotcues 1-4 -->
-        <Pos>197,14</Pos>
+        <Pos>244,14</Pos>
         <Size>43f,43f</Size>
         <Children>
           <Template src="skin:hotcue_button.xml">
@@ -469,7 +492,7 @@
         </Connection>
       </WidgetGroup>
       <WidgetGroup><!-- Special Cues -->
-        <Pos>197,14</Pos>
+        <Pos>244,14</Pos>
         <Size>43f,43f</Size>
         <Children>
           <PushButton>
diff --git a/res/skins/Shade/waveform.xml b/res/skins/Shade/waveform.xml
index a7a9ad2dd4c0..9dc2e7a4b264 100644
--- a/res/skins/Shade/waveform.xml
+++ b/res/skins/Shade/waveform.xml
@@ -108,12 +108,12 @@
     - if you change from a skin which supports more hotcues
       than buttons are in the current skin (and has them activated)
     -->
-    <StemControl alignment="right">
-      <MinimumSize>138,68</MinimumSize>
-      <MaximumSize>158,1920</MaximumSize>
+    <StemControl alignment="left">
+      <MinimumSize>168,58</MinimumSize>
+      <MaximumSize>168,1920</MaximumSize>
       <SizePolicy>me,me</SizePolicy>
       <Stem>
-        <MinimumSize>130,17</MinimumSize>
+        <MinimumSize>130,14</MinimumSize>
         <MaximumSize>150,1920</MaximumSize>
         <SizePolicy>me,min</SizePolicy>
         <Layout>horizontal</Layout>
@@ -131,6 +131,22 @@
               <ConfigKey><Variable name="StemGroup"/>,stem_<Variable name="StemIdx"/>_volume</ConfigKey>
             </Connection>
           </Knob>
+          <EffectChainPresetSelector>
+            <ObjectName>QuickEffectSelectorLeft</ObjectName>
+            <MinimumSize>20,14</MinimumSize>
+            <MaximumSize>20,28</MaximumSize>
+            <SizePolicy>me,e</SizePolicy>
+            <EffectUnitGroup>[QuickEffectRack1_<Variable name="StemFxGroup"/>]</EffectUnitGroup>
+          </EffectChainPresetSelector>
+          <Knob>
+            <TooltipId>QuickEffectRack_super1</TooltipId>
+            <NumberStates>64</NumberStates>
+            <Path>knobs_no_center/knob_rotary_s%1.png</Path>
+            <Pos>151,15</Pos>
+            <Connection>
+              <ConfigKey>[QuickEffectRack1_<Variable name="StemFxGroup"/>],super1</ConfigKey>
+            </Connection>
+          </Knob>
         </Children>
       </Stem>
       <Connection>
diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index b79582fed7f1..58c6f97635c2 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -119,12 +119,10 @@ Variables:
           (and has them activated)
         -->
         <StemControl alignment="left">
-          <MinimumSize>138,68</MinimumSize>
-          <MaximumSize>158,1920</MaximumSize>
-          <SizePolicy>me,me</SizePolicy>
+          <MinimumSize>248me,68m</MinimumSize>
           <Stem>
-            <MinimumSize>130,17</MinimumSize>
-            <MaximumSize>150,34</MaximumSize>
+            <MinimumSize>240,17</MinimumSize>
+            <MaximumSize>240,34</MaximumSize>
             <SizePolicy>me,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
@@ -146,6 +144,52 @@ Variables:
                   <ConfigKey><Variable name="StemGroup"/>,stem_<Variable name="StemIdx"/>_volume</ConfigKey>
                 </Connection>
               </KnobComposed>
+              <EffectChainPresetSelector>
+                <ObjectName>QuickEffectSelectorLeft</ObjectName>
+                <MinimumSize>40,17</MinimumSize>
+                <MaximumSize>70,28</MaximumSize>
+                <SizePolicy>me,e</SizePolicy>
+                <EffectUnitGroup>[QuickEffectRack1_<Variable name="StemFxGroup"/>]</EffectUnitGroup>
+              </EffectChainPresetSelector>
+              <WidgetGroup>
+                <Size>21f,18f</Size>
+                <Children>
+                  <PushButton>
+                    <ObjectName>QuickFXButton</ObjectName>
+                    <Size>18f,18f</Size>
+                    <Pos>3,0</Pos>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed scalemode="STRETCH">buttons/btn_.svg</Pressed>
+                      <Unpressed scalemode="STRETCH">buttons/btn_.svg</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed scalemode="STRETCH">buttons/btn_.svg</Pressed>
+                      <Unpressed scalemode="STRETCH">buttons/btn_.svg</Unpressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey>[QuickEffectRack1_<Variable name="StemFxGroup"/>],enabled</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+              <KnobComposed>
+                <TooltipId>QuickEffectRack_super1</TooltipId>
+                <Pos>0,0</Pos>
+                <MinimumSize>20,17</MinimumSize>
+                <MaximumSize>40,34</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Knob>skins:Tango/knobs_sliders/knob_blue.svg</Knob>
+                <BackPath>skins:Tango/knobs_sliders/knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <Connection>
+                  <ConfigKey>[QuickEffectRack1_<Variable name="StemFxGroup"/>],super1</ConfigKey>
+                </Connection>
+              </KnobComposed>
             </Children>
           </Stem>
           <Connection>
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index 69c420f49262..ad98ec1dfec9 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -60,6 +60,7 @@ EffectsManager::~EffectsManager() {
     // ~LV2GroupState calls lilv_instance_free, which will segfault if called
     // after ~LV2Backend calls lilv_world_free.
     m_equalizerEffectChains.clear();
+    m_quickStemEffectChains.clear();
     m_quickEffectChains.clear();
     m_standardEffectChains.clear();
     m_outputEffectChain.clear();
@@ -146,6 +147,24 @@ void EffectsManager::addDeck(const ChannelHandleAndGroup& deckHandleGroup) {
     }
 }
 
+void EffectsManager::addStem(const ChannelHandleAndGroup& stemHandleGroup) {
+    VERIFY_OR_DEBUG_ASSERT(!m_quickStemEffectChains.contains(
+            QuickEffectChain::formatEffectChainGroup(stemHandleGroup.name()))) {
+        return;
+    }
+    auto pChainSlot = QuickEffectChainPointer(
+            new QuickEffectChain(stemHandleGroup, this, m_pMessenger));
+    m_quickStemEffectChains.insert(stemHandleGroup.name(), pChainSlot);
+    m_effectChainSlotsByGroup.insert(pChainSlot->group(), pChainSlot);
+
+    // If a stem is added after setup() was run we need to read effects.xml
+    // again to initialize its QuickEffect chain, either with defaults or the
+    // previous state.
+    if (m_initializedFromEffectsXml) {
+        readEffectsXmlSingleDeckStem(stemHandleGroup.m_name);
+    }
+}
+
 void EffectsManager::addEqualizerEffectChain(const ChannelHandleAndGroup& deckHandleGroup) {
     VERIFY_OR_DEBUG_ASSERT(!m_equalizerEffectChains.contains(
             EqualizerEffectChain::formatEffectChainGroup(deckHandleGroup.name()))) {
@@ -243,6 +262,15 @@ void EffectsManager::readEffectsXml() {
         }
     }
 
+    QHashIterator<QString, EffectChainPresetPointer> qseDataIt(data.quickStemEffectChainPresets);
+    while (qseDataIt.hasNext()) {
+        qseDataIt.next();
+        auto pChainSlot = m_quickStemEffectChains.value(qseDataIt.key());
+        if (pChainSlot) {
+            pChainSlot->loadChainPreset(qseDataIt.value());
+        }
+    }
+
     m_pVisibleEffectsList->readEffectsXml(doc, m_pBackendManager);
 }
 
@@ -276,6 +304,25 @@ void EffectsManager::readEffectsXmlSingleDeck(const QString& deckGroup) {
     }
 }
 
+void EffectsManager::readEffectsXmlSingleDeckStem(const QString& deckStemGroup) {
+    QDir settingsPath(m_pConfig->getSettingsPath());
+    QFile file(settingsPath.absoluteFilePath(kEffectsXmlFile));
+    QDomDocument doc;
+
+    if (file.open(QIODevice::ReadOnly)) {
+        doc.setContent(&file);
+    }
+    file.close();
+
+    EffectChainPresetPointer pPreset =
+            m_pChainPresetManager->readEffectsXmlSingleDeckStem(doc, deckStemGroup);
+
+    auto pQuickEffectChainSlot = m_quickStemEffectChains.value(deckStemGroup);
+    if (pQuickEffectChainSlot) {
+        pQuickEffectChainSlot->loadChainPreset(pPreset);
+    }
+}
+
 void EffectsManager::saveEffectsXml() {
     QDomDocument doc(EffectXml::kRoot);
     doc.setContent(EffectXml::kFileHeader);
@@ -307,8 +354,18 @@ void EffectsManager::saveEffectsXml() {
         quickEffectChainPresets.insert(qeIt.key(), pPreset);
     }
 
+    QHash<QString, EffectChainPresetPointer> quickStemEffectChainPresets;
+    quickStemEffectChainPresets.reserve(m_quickStemEffectChains.size());
+    QHashIterator<QString, QuickEffectChainPointer> sqeIt(m_quickStemEffectChains);
+    while (sqeIt.hasNext()) {
+        sqeIt.next();
+        auto* pQuickEffectChain = sqeIt.value().data();
+        auto pPreset = EffectChainPresetPointer::create(pQuickEffectChain);
+        quickStemEffectChainPresets.insert(sqeIt.key(), pPreset);
+    }
+
     QList<EffectChainPresetPointer> standardEffectChainPresets;
-    standardEffectChainPresets.reserve(m_quickEffectChains.size());
+    standardEffectChainPresets.reserve(m_standardEffectChains.size());
     for (const auto& pChainSlot : std::as_const(m_standardEffectChains)) {
         auto* pChain = pChainSlot.data();
         auto pPreset = EffectChainPresetPointer::create(pChain);
@@ -326,6 +383,7 @@ void EffectsManager::saveEffectsXml() {
             EffectsXmlData{
                     eqEffectManifests,
                     quickEffectChainPresets,
+                    quickStemEffectChainPresets,
                     standardEffectChainPresets,
                     outputChainPreset});
     m_pVisibleEffectsList->saveEffectsXml(&doc);
diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h
index f2b579e486a4..29a7960eaa1a 100644
--- a/src/effects/effectsmanager.h
+++ b/src/effects/effectsmanager.h
@@ -27,6 +27,7 @@ class EffectsManager {
 
     void setup();
     void addDeck(const ChannelHandleAndGroup& deckHandleGroup);
+    void addStem(const ChannelHandleAndGroup& stemHandleGroup);
 
     void loadDefaultEqsAndQuickEffects();
 
@@ -88,6 +89,7 @@ class EffectsManager {
 
     void readEffectsXml();
     void readEffectsXmlSingleDeck(const QString& deckGroup);
+    void readEffectsXmlSingleDeckStem(const QString& deckStemGroup);
     void saveEffectsXml();
 
     QSet<ChannelHandleAndGroup> m_registeredInputChannels;
@@ -100,6 +102,7 @@ class EffectsManager {
     // These two store <deck group, effect chain pointer>
     QHash<QString, EqualizerEffectChainPointer> m_equalizerEffectChains;
     QHash<QString, QuickEffectChainPointer> m_quickEffectChains;
+    QHash<QString, QuickEffectChainPointer> m_quickStemEffectChains;
 
     EffectsBackendManagerPointer m_pBackendManager;
     std::shared_ptr<ChannelHandleFactory> m_pChannelHandleFactory;
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index 43d7407756b4..59d0f92fe676 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -680,7 +680,7 @@ bool EffectChainPresetManager::savePresetXml(EffectChainPresetPointer pPreset) {
 // static
 EffectChainPresetPointer EffectChainPresetManager::createEmptyNamelessChainPreset() {
     auto pPreset = EffectChainPresetPointer::create(EffectChainPreset());
-    pPreset->setName("");
+    pPreset->setName(kNoEffectString);
     return pPreset;
 }
 
@@ -708,6 +708,7 @@ EffectsXmlData EffectChainPresetManager::readEffectsXml(
 
     QList<EffectChainPresetPointer> standardEffectChainPresets;
     QHash<QString, EffectChainPresetPointer> quickEffectPresets;
+    QHash<QString, EffectChainPresetPointer> quickStemEffectPresets;
     QHash<QString, EffectManifestPointer> eqEffectManifests;
     // configure default EQs and QuickEffects per deck
     for (const auto& deckString : deckStrings) {
@@ -857,8 +858,30 @@ EffectsXmlData EffectChainPresetManager::readEffectsXml(
         }
     }
 
-    return EffectsXmlData{
-            eqEffectManifests, quickEffectPresets, standardEffectChainPresets, mainEqPreset};
+    // Read names of presets that were loaded into stem QuickEffects on last shutdown
+    QDomElement quickStemEffectPresetsElement =
+            XmlParse::selectElement(root, EffectXml::kQuickStemEffectList);
+    const QDomNodeList quickStemEffectNodeList =
+            quickStemEffectPresetsElement.elementsByTagName(
+                    EffectXml::kChainPresetName);
+    for (int i = 0; i < quickStemEffectNodeList.count(); ++i) {
+        QDomElement presetNameElement = quickStemEffectNodeList.at(i).toElement();
+        if (!presetNameElement.isNull()) {
+            QString deckStemGroup = presetNameElement.attribute(QStringLiteral("group"));
+            auto pPreset = m_effectChainPresets.value(presetNameElement.text());
+            if (pPreset != nullptr) {
+                // Replace defaultQuickEffectChainPreset with pPreset
+                // for this deck group
+                quickStemEffectPresets.insert(deckStemGroup, pPreset);
+            }
+        }
+    }
+
+    return EffectsXmlData{eqEffectManifests,
+            quickEffectPresets,
+            quickStemEffectPresets,
+            standardEffectChainPresets,
+            mainEqPreset};
 }
 
 EffectXmlDataSingleDeck EffectChainPresetManager::readEffectsXmlSingleDeck(
@@ -917,6 +940,37 @@ EffectXmlDataSingleDeck EffectChainPresetManager::readEffectsXmlSingleDeck(
     return EffectXmlDataSingleDeck{pEqEffect, pQuickEffectChainPreset};
 }
 
+EffectChainPresetPointer EffectChainPresetManager::readEffectsXmlSingleDeckStem(
+        const QDomDocument& doc, const QString& deckStemString) {
+    QDomElement root = doc.documentElement();
+
+    // Quick Effect
+    auto pQuickEffectChainPreset = getDefaultQuickEffectPreset();
+
+    // Read name of last loaded QuickEffect preset
+    QDomElement quickEffectPresetsElement =
+            XmlParse::selectElement(root, EffectXml::kQuickStemEffectList);
+    const QDomNodeList quickEffectNodeList =
+            quickEffectPresetsElement.elementsByTagName(
+                    EffectXml::kChainPresetName);
+    for (int i = 0; i < quickEffectNodeList.count(); ++i) {
+        QDomElement presetNameElement = quickEffectNodeList.at(i).toElement();
+        if (presetNameElement.isNull()) {
+            continue;
+        }
+        if (presetNameElement.attribute(QStringLiteral("group")) == deckStemString) {
+            auto pPreset = m_effectChainPresets.value(presetNameElement.text());
+            if (pPreset != nullptr || presetNameElement.text() == kNoEffectString) {
+                // Replace the default preset.
+                // Load empty preset if the chain was cleared explicitly ('---' preset)
+                pQuickEffectChainPreset = pPreset;
+            }
+        }
+    }
+
+    return pQuickEffectChainPreset;
+}
+
 void EffectChainPresetManager::saveEffectsXml(QDomDocument* pDoc, const EffectsXmlData& data) {
     // Save presets for current state of standard chains
     QDomElement rootElement = pDoc->documentElement();
@@ -1007,4 +1061,19 @@ void EffectChainPresetManager::saveEffectsXml(QDomDocument* pDoc, const EffectsX
         quickEffectElement.setAttribute(QStringLiteral("group"), qeIt.key());
     }
     rootElement.appendChild(quickEffectPresetsElement);
+
+    // Save which presets are loaded to stem QuickEffects
+    QDomElement quickStemEffectPresetsElement =
+            pDoc->createElement(EffectXml::kQuickStemEffectList);
+    QHashIterator<QString, EffectChainPresetPointer> qseIt(data.quickStemEffectChainPresets);
+    while (qseIt.hasNext()) {
+        qseIt.next();
+        QDomElement quickEffectElement = XmlParse::addElement(
+                *pDoc,
+                quickStemEffectPresetsElement,
+                EffectXml::kChainPresetName,
+                qseIt.value()->name());
+        quickEffectElement.setAttribute(QStringLiteral("group"), qseIt.key());
+    }
+    rootElement.appendChild(quickStemEffectPresetsElement);
 }
diff --git a/src/effects/presets/effectchainpresetmanager.h b/src/effects/presets/effectchainpresetmanager.h
index 71d8fc48885e..a2cc6f6f82b2 100644
--- a/src/effects/presets/effectchainpresetmanager.h
+++ b/src/effects/presets/effectchainpresetmanager.h
@@ -9,6 +9,7 @@
 struct EffectsXmlData {
     QHash<QString, EffectManifestPointer> eqEffectManifests;
     QHash<QString, EffectChainPresetPointer> quickEffectChainPresets;
+    QHash<QString, EffectChainPresetPointer> quickStemEffectChainPresets;
     QList<EffectChainPresetPointer> standardEffectChainPresets;
     EffectChainPresetPointer outputChainPreset;
 };
@@ -81,6 +82,8 @@ class EffectChainPresetManager : public QObject {
     EffectsXmlData readEffectsXml(const QDomDocument& doc, const QStringList& deckStrings);
     EffectXmlDataSingleDeck readEffectsXmlSingleDeck(
             const QDomDocument& doc, const QString& deckString);
+    EffectChainPresetPointer readEffectsXmlSingleDeckStem(
+            const QDomDocument& doc, const QString& deckStemString);
     void saveEffectsXml(QDomDocument* pDoc, const EffectsXmlData& data);
 
   signals:
diff --git a/src/effects/presets/effectxmlelements.h b/src/effects/presets/effectxmlelements.h
index 63f5607d1286..7e91e386172e 100644
--- a/src/effects/presets/effectxmlelements.h
+++ b/src/effects/presets/effectxmlelements.h
@@ -15,6 +15,7 @@ const QString kRackGroup(QStringLiteral("Group"));
 
 const QString kChainPresetList(QStringLiteral("ChainPresetList"));
 const QString kQuickEffectList(QStringLiteral("QuickEffectPresetList"));
+const QString kQuickStemEffectList(QStringLiteral("QuickStemEffectPresetList"));
 const QString kQuickEffectChainPresets(QStringLiteral("QuickEffectChains"));
 const QString kEqualizerEffects(QStringLiteral("EqualizerEffects"));
 const QString kChainPresetName(QStringLiteral("ChainPresetName"));
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index ceba48d455c6..48b55f221b07 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -2,7 +2,9 @@
 
 #include "control/controlpushbutton.h"
 #include "effects/effectsmanager.h"
+#include "engine/controls/bpmcontrol.h"
 #include "engine/effects/engineeffectsmanager.h"
+#include "engine/effects/groupfeaturestate.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginepregain.h"
 #include "engine/enginevumeter.h"
@@ -103,27 +105,63 @@ EngineDeck::~EngineDeck() {
 }
 
 #ifdef __STEM__
+void EngineDeck::addStemHandle(const ChannelHandleAndGroup& stemHandleGroup) {
+    m_stems.emplace_back(ChannelHandleAndGroup(stemHandleGroup.handle(), stemHandleGroup.name()));
+    m_stemsGainCache.push_back(CSAMPLE_GAIN_ONE);
+    if (m_pEffectsManager != nullptr) {
+        m_pEffectsManager->registerInputChannel(stemHandleGroup);
+    }
+}
+
 void EngineDeck::processStem(CSAMPLE* pOut, const int iBufferSize) {
-    int stemCount = m_pBuffer->getChannelCount() / mixxx::kEngineChannelOutputCount;
+    mixxx::audio::ChannelCount chCount = m_pBuffer->getChannelCount();
+    VERIFY_OR_DEBUG_ASSERT(m_stems.size() <= chCount &&
+            m_stemMute.size() <= chCount && m_stemGain.size() <= chCount) {
+        return;
+    };
+    mixxx::audio::SampleRate sampleRate = mixxx::audio::SampleRate::fromDouble(m_sampleRate.get());
+    int stemCount = chCount / mixxx::kEngineChannelOutputCount;
+    int numFrames = iBufferSize / mixxx::kEngineChannelOutputCount;
     auto allChannelBufferSize = iBufferSize * stemCount;
     if (m_stemBuffer.size() < allChannelBufferSize) {
         m_stemBuffer = mixxx::SampleBuffer(allChannelBufferSize);
     }
     m_pBuffer->process(m_stemBuffer.data(), allChannelBufferSize);
 
-    // TODO(XXX): process effects per stems
-    SampleUtil::clear(pOut, iBufferSize);
-    const CSAMPLE* pIn = m_stemBuffer.data();
-    for (int i = 0; i < iBufferSize; i += mixxx::kEngineChannelOutputCount) {
+    CSAMPLE* pIn = m_stemBuffer.data();
+    EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
+    if (pEngineEffectsManager != nullptr) {
+        GroupFeatureState featureState;
+        collectFeatures(&featureState);
         for (int c = 0; c < stemCount; c++) {
-            if (m_stemMute[c]->toBool()) {
-                continue;
-            }
-            float gain = static_cast<float>(m_stemGain[c]->get());
-            pOut[i] += pIn[stemCount * i + 2 * c] * gain;
-            pOut[i + 1] += pIn[stemCount * i + 2 * c + 1] * gain;
+            int chOffset = c * mixxx::audio::ChannelCount::stereo();
+            float gain = m_stemMute[c]->toBool() ? 0 : m_stemGain[c]->get();
+            SampleUtil::copyMultiToStereo(
+                    pOut,
+                    pIn,
+                    numFrames,
+                    chCount,
+                    chOffset);
+            pEngineEffectsManager->processPostFaderInPlace(m_stems[c].handle(),
+                    m_pEffectsManager->getMainHandle(),
+                    pOut,
+                    iBufferSize,
+                    sampleRate,
+                    featureState,
+                    m_stemsGainCache[c],
+                    gain,
+                    false);
+            m_stemsGainCache[c] = gain;
+            SampleUtil::copyStereoToMulti(
+                    pIn,
+                    pOut,
+                    numFrames,
+                    chCount,
+                    chOffset);
         }
     }
+
+    SampleUtil::mixMultichannelToStereo(pOut, pIn, numFrames, chCount);
     // TODO(XXX): process stem DSP
 }
 
diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h
index 607c853e95b8..d99624984a42 100644
--- a/src/engine/channels/enginedeck.h
+++ b/src/engine/channels/enginedeck.h
@@ -70,6 +70,7 @@ class EngineDeck : public EngineChannel, public AudioDestination {
     // check if the loaded track is a stem so this should only be used in case
     // of stem track
     void cloneStemState(const EngineDeck* deckToClone);
+    void addStemHandle(const ChannelHandleAndGroup& stemHandleGroup);
 #endif
 
   signals:
@@ -88,6 +89,9 @@ class EngineDeck : public EngineChannel, public AudioDestination {
     void processStem(CSAMPLE* pOutput, const int iBufferSize);
 #endif
 
+    std::vector<ChannelHandleAndGroup> m_stems;
+    std::vector<CSAMPLE_GAIN> m_stemsGainCache;
+
     UserSettingsPointer m_pConfig;
     EngineBuffer* m_pBuffer;
     EnginePregain* m_pPregain;
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index a4f0f1ea15e5..981813327baf 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -453,6 +453,14 @@ void PlayerManager::addDeckInner() {
     // Setup equalizer and QuickEffect chain for this deck.
     m_pEffectsManager->addDeck(handleGroup);
 
+    // Setup stem QuickEffect chain for this deck
+    for (int i = 0; i < 4; i++) {
+        ChannelHandleAndGroup stemHandleGroup =
+                m_pEngine->registerChannelGroup(groupForDeckStem(deckIndex, i));
+        pDeck->getEngineDeck()->addStemHandle(stemHandleGroup);
+        m_pEffectsManager->addStem(stemHandleGroup);
+    }
+
     // Setup EQ ControlProxies used for resetting EQs on track load
     pDeck->setupEqControls();
 }
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index cbd74d317870..eec1fc15d6bb 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -154,6 +154,13 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
         return QStringLiteral("[Channel") + QString::number(i + 1) + ']';
     }
 
+    // Returns the group for the ith deck and jth stem where i and j is zero indexed
+    static QString groupForDeckStem(int i, int j) {
+        DEBUG_ASSERT(i >= 0);
+        return QStringLiteral("[Channel") + QString::number(i + 1) +
+                QStringLiteral("Stem") + QString::number(j + 1) + ']';
+    }
+
     // Returns the group for the ith PreviewDeck where i is zero indexed
     static QString groupForPreviewDeck(int i) {
         DEBUG_ASSERT(i >= 0);
diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
index d3c122f82578..2fa4f6e92b5b 100644
--- a/src/skin/legacy/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -1049,8 +1049,11 @@ QWidget* LegacySkinParser::parseVisual(const QDomElement& node) {
         setupConnections(child, viewer->stemControlWidget());
         QDomElement stem = child.firstChildElement("Stem");
         for (int i = 0; i < kMaxSupportedStem; i++) {
+            QString fxGroup = group.chopped(1) + QStringLiteral("Stem") +
+                    QString::number(i + 1) + ']';
             m_pContext->setVariable("StemGroup", group);
             m_pContext->setVariable("StemIdx", QString::number(i + 1));
+            m_pContext->setVariable("StemFxGroup", fxGroup);
             auto widget = parseWidgetGroup(stem);
             setupSize(stem, widget);
             viewer->stemControlWidget()->addControl(widget);
diff --git a/src/util/sample.cpp b/src/util/sample.cpp
index 9f540058b3f4..14d13be32fc8 100644
--- a/src/util/sample.cpp
+++ b/src/util/sample.cpp
@@ -872,6 +872,22 @@ void SampleUtil::copyMultiToStereo(
     }
 }
 
+// static
+void SampleUtil::copyStereoToMulti(
+        CSAMPLE* M_RESTRICT pDest,
+        const CSAMPLE* M_RESTRICT pSrc,
+        SINT numFrames,
+        mixxx::audio::ChannelCount numChannels,
+        int channelOffset) {
+    DEBUG_ASSERT(numChannels > mixxx::audio::ChannelCount::stereo() &&
+            channelOffset - 1 < numFrames);
+    // forward loop
+    for (SINT i = 0; i < numFrames; ++i) {
+        pDest[i * numChannels + channelOffset] = pSrc[i * 2];
+        pDest[i * numChannels + channelOffset + 1] = pSrc[i * 2 + 1];
+    }
+}
+
 // static
 void SampleUtil::reverse(CSAMPLE* pBuffer, SINT numSamples) {
     for (SINT j = 0; j < numSamples / 4; ++j) {
diff --git a/src/util/sample.h b/src/util/sample.h
index 648c2177972f..05b685774ad6 100644
--- a/src/util/sample.h
+++ b/src/util/sample.h
@@ -364,6 +364,17 @@ class SampleUtil {
             mixxx::audio::ChannelCount numChannels,
             int channelOffset = 0);
 
+    // Copies and strips interleaved stereo sample data in pSrc with
+    // down to multi-channel samples into pDest. Samples will be written at the
+    // channel pointed by channelOffset. Samples from all other channels will be
+    // ignored. pDst must contain (numFrames * numChannels) samples (numFrames *
+    // 2) samples will be written into pDest
+    static void copyStereoToMulti(CSAMPLE* pDest,
+            const CSAMPLE* pSrc,
+            SINT numFrames,
+            mixxx::audio::ChannelCount numChannels,
+            int channelOffset);
+
     // reverses stereo sample in place
     static void reverse(CSAMPLE* pBuffer, SINT numSamples);