feat: add UI control for stem

mixxxdj · Jul 30, 2024 · 67b2d61 · 67b2d61
1 parent 9b31059
commit 67b2d61
Show file tree

Hide file tree

Showing 26 changed files with 716 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3457,6 +3457,7 @@ if (STEM)
     src/sources/soundsourcestem.cpp
     src/track/steminfoimporter.cpp
     src/track/steminfo.cpp
+    src/widget/wstemcontrol.cpp
   )
   if(QOPENGL)
     target_sources(mixxx-lib PRIVATE

diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml
@@ -38,7 +38,7 @@
                     <Children>
                       <Template src="skins:Deere/deck_spinny.xml">
                         <SetVariable name="cover">true</SetVariable>
-                        <SetVariable name="Size">55f,55f</SetVariable>
+                        <SetVariable name="Size">68f,68f</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
@@ -51,7 +51,7 @@
                     <Children>
                       <Template src="skins:Deere/deck_spinny.xml">
                         <SetVariable name="cover">false</SetVariable>
-                        <SetVariable name="Size">55f,55f</SetVariable>
+                        <SetVariable name="Size">68f,68f</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>

diff --git a/res/skins/Deere/deck_waveform.xml b/res/skins/Deere/deck_waveform.xml
@@ -128,6 +128,41 @@
         - if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
         - if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
         -->
+        <StemControl alignment="left">
+          <MinimumSize>138,68</MinimumSize>
+          <MaximumSize>158,1920</MaximumSize>
+          <SizePolicy>me,me</SizePolicy>
+          <Stem>
+            <MinimumSize>130,17</MinimumSize>
+            <MaximumSize>150,1920</MaximumSize>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Label>
+                <ObjectName>stem_label</ObjectName>
+                <SizePolicy>e,max</SizePolicy>
+              </Label>
+              <KnobComposed>
+                <Pos>0,0</Pos>
+                <MinimumSize>20,17</MinimumSize>
+                <MaximumSize>40,34</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Knob>knob.svg</Knob>
+                <BackPath>knob_bg_blue.svg</BackPath>
+                <MinAngle>-135</MinAngle>
+                <MaxAngle>135</MaxAngle>
+                <KnobCenterYOffset>1.602</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="StemGroup"/>,volume</ConfigKey>
+                </Connection>
+              </KnobComposed>
+            </Children>
+          </Stem>
+          <Connection>
+            <ConfigKey persist="true">[Skin],show_stem_controls</ConfigKey>
+            <BindProperty>displayed</BindProperty>
+          </Connection>
+        </StemControl>
       </Visual>
 
       <WidgetGroup>

diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
@@ -61,6 +61,11 @@
             <SetVariable name="skinsetting">[Skin],show_4decks</SetVariable>
           </Template>
 
+          <Template src="skins:Deere/skinsettings_button.xml">
+            <SetVariable name="TooltipId">show_stem_controls</SetVariable>
+            <SetVariable name="text">Show stem controls</SetVariable>
+            <SetVariable name="skinsetting">[Skin],show_stem_controls</SetVariable>
+          </Template>
         </Children>
       </WidgetGroup>
 

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -1432,11 +1432,6 @@ WWidget, WLabel {
   font-size: 12px;
 }
 
-/* Track text, etc. should be in the deck color. */
-#Deck1 WLabel, #Deck2 WLabel, #Deck3 WLabel, #Deck4 WLabel {
-  color: #D2D2D2;
-}
-
 WNumberRate {
   font-size: 13px;
 }
@@ -2456,3 +2451,17 @@ WRateRange {
 #RateDisplayBottomRate {
     qproperty-alignment: 'AlignRight | AlignBottom';
 }
+
+/** Stem control **/
+WStemControlBox {
+  background-color: transparent;
+}
+WStemControl WLabel {
+  color: #222222;
+  padding-left: 5px;
+  font-weight: 500;
+  font-size: 14px;
+}
+WStemControl {
+  margin: 10px 15px 10px 15px;
+}
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
@@ -41,6 +41,7 @@
       <attribute config_key="[App],num_samplers">16</attribute>
       <attribute persist="true" config_key="[Skin],show_waveforms">1</attribute>
       <attribute persist="true" config_key="[Skin],timing_shift_buttons">0</attribute>
+      <attribute persist="true" config_key="[Skin],show_stem_controls">0</attribute>
 
     <!-- Decks -->
       <!-- general -->
@@ -63,6 +64,7 @@
       <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
       <attribute persist="true" config_key="[Skin],show_rate_control_buttons">1</attribute>
       <attribute persist="true" config_key="[Skin],show_beatgrid_controls">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_stem_controls">1</attribute>
       <!-- Compact deck -->
       <attribute persist="true" config_key="[Skin],show_rate_controls_compact">1</attribute>
       <attribute persist="true" config_key="[Skin],show_loop_controls_compact">1</attribute>

diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
@@ -266,6 +266,26 @@ Description:
 
                     </Children>
                   </WidgetGroup>
+
+                  <!-- Stem control over the waveform -->
+                  <WidgetGroup>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,f</SizePolicy>
+                    <Layout>stacked</Layout>
+                    <Children>
+                      <!-- translucent cover when waveforms are hidden -->
+                      <Template src="skins:LateNight/helpers/skin_settings_cover_inverted.xml">
+                        <SetVariable name="Setting">[Skin],show_waveforms</SetVariable>
+                      </Template>
+
+                      <Template src="skins:LateNight/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_stem_controls</SetVariable>
+                        <SetVariable name="Text">Stem control</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_stem_controls</SetVariable>
+                      </Template>
+
+                    </Children>
+                  </WidgetGroup>
                 </Children>
               </WidgetGroup>
             </Children>

diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
@@ -3208,3 +3208,18 @@ WSearchLineEdit::indicator:unchecked:selected {
 }
 /************** common styles for WEffectSelector ******************************
 *************** QSpinBox, QMenu, QToolTip *************************************/
+
+/** Stem control **/
+WStemControlBox {
+  padding-left: 8px;
+  background-color: transparent;
+}
+WStemControl WLabel {
+  padding-left: 5px;
+  font-weight: 500;
+  font-size: 14px;
+}
+WStemControl {
+  border-radius: 7px;
+  opacity: 0.2;
+}
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
@@ -137,6 +137,45 @@
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
             </Mark>
+            <StemControl alignment="left">
+              <MinimumSize>138,68</MinimumSize>
+              <MaximumSize>158,1920</MaximumSize>
+              <SizePolicy>me,me</SizePolicy>
+              <Stem>
+                <MinimumSize>130,17</MinimumSize>
+                <MaximumSize>150,34</MaximumSize>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Label>
+                    <ObjectName>stem_label</ObjectName>
+                    <SizePolicy>e,max</SizePolicy>
+                  </Label>
+                  <KnobComposed>
+                    <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_<Variable name="KnobColorEq"/>.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>
+                    <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                    <ArcColor><Variable name="ArcColorEq"/></ArcColor>
+                    <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                    <KnobCenterYOffset>1.998</KnobCenterYOffset>
+                    <Connection>
+                      <ConfigKey><Variable name="StemGroup"/>,volume</ConfigKey>
+                    </Connection>
+                  </KnobComposed>
+                </Children>
+              </Stem>
+              <Connection>
+                <ConfigKey persist="true">[Skin],show_stem_controls</ConfigKey>
+                <BindProperty>displayed</BindProperty>
+              </Connection>
+            </StemControl>
           </Visual>
         </Children>
         <Connection>

diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
@@ -148,19 +148,19 @@
                   </WidgetGroup><!-- Cover art / Artist/title / Playposition -->
                   <WidgetGroup><!-- Scrolling waveform / Spinny / Vinyl controls -->
                     <ObjectName>DeckUpperLeftMidPart</ObjectName>
-                    <Size>0e,81f</Size>
+                    <Size>0e,91f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
                       <WidgetGroup>
                         <ObjectName>DeckUpperMidPart</ObjectName>
-                        <Size>0e,81f</Size>
+                        <Size>0e,91f</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,81f</Size>
+                            <Size>0e,91f</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,81f</Size>
+                                <Size>0e,91f</Size>
                                 <Children>
                                   <Template src="skin:waveform.xml"/>
                                 </Children>
@@ -191,7 +191,7 @@
                                 <Children>
                                   <!-- Spinning Vinyl sub-widget -->
                                   <WidgetGroup>
-                                    <Size>81f,81f</Size>
+                                    <Size>91f,91f</Size>
                                     <Layout>horizontal</Layout>
                                     <Children>
                                       <!--
@@ -201,7 +201,7 @@
                                       -->
                                       <Spinny>
                                         <TooltipId>spinny</TooltipId>
-                                        <Size>81f,81f</Size>
+                                        <Size>91f,91f</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/style.qss b/res/skins/Shade/style.qss
@@ -1047,3 +1047,19 @@ WRateRange {
   font-size: 10px;
   qproperty-alignment: 'AlignCenter';
 }
+
+/** Stem control **/
+WStemControlBox {
+  background-color: transparent;
+}
+WStemControl WLabel {
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+WStemControl WKnob {
+  background-color: #717171;
+}
+WStemControl {
+  margin: 10px 15px 10px 15px;
+}
diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss
@@ -288,3 +288,19 @@ WTrackTableViewHeader::down-arrow {
 WRateRange {
   color: #181319;
 }
+
+/** Stem control **/
+WStemControlBox {
+  background-color: transparent;
+}
+WStemControl WLabel {
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+WStemControl WKnob {
+  background-color: #aab2b7;
+}
+WStemControl {
+  margin: 10px 15px 10px 15px;
+}
diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss
@@ -198,3 +198,19 @@ QPushButton#pushButtonAnalyze:hover {
 WRateRange {
   color: #4B515F;
 }
+
+/** Stem control **/
+WStemControlBox {
+  background-color: transparent;
+}
+WStemControl WLabel {
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+WStemControl WKnob {
+  background-color: #d9c663;
+}
+WStemControl {
+  margin: 10px 15px 10px 15px;
+}
diff --git a/res/skins/Shade/waveform.xml b/res/skins/Shade/waveform.xml
@@ -108,5 +108,35 @@
     - 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>
+      <SizePolicy>me,me</SizePolicy>
+      <Stem>
+        <MinimumSize>130,17</MinimumSize>
+        <MaximumSize>150,1920</MaximumSize>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Label>
+            <ObjectName>stem_label</ObjectName>
+            <SizePolicy>e,max</SizePolicy>
+          </Label>
+          <Knob>
+            <TooltipId>main_gain</TooltipId>
+            <NumberStates>64</NumberStates>
+            <Path>knobs_no_center/knob_rotary_s%1.png</Path>
+            <Pos>151,15</Pos>
+            <Connection>
+              <ConfigKey><Variable name="StemGroup"/>,volume</ConfigKey>
+            </Connection>
+          </Knob>
+        </Children>
+      </Stem>
+      <Connection>
+        <ConfigKey persist="true">[Skin],show_stem_controls</ConfigKey>
+        <BindProperty>displayed</BindProperty>
+      </Connection>
+    </StemControl>
   </Visual>
 </Template>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
@@ -63,6 +63,11 @@ Description:
             <SetVariable name="Setting">[Tango],symmetric_overviews</SetVariable>
           </Template>
 
+          <Template src="skins:Tango/controls/skin_settings_button_2state.xml">
+            <SetVariable name="text">Show stem control</SetVariable>
+            <SetVariable name="Setting">[Skin],show_stem_controls</SetVariable>
+          </Template>
+
           <Template src="skins:Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Symmetric Time/Duration</SetVariable>
             <SetVariable name="Setting">[Tango],symmetric_time</SetVariable>

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -3223,3 +3223,17 @@ WRateRange {
 #RateDisplayBottomRate {
     qproperty-alignment: 'AlignHCenter';
 }
+
+/** Stem control **/
+WStemControlBox {
+  padding-left: 8px;
+  background-color: transparent;
+}
+WStemControl WLabel {
+  padding-left: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+WStemControl {
+  margin: 10px 15px 10px 15px;
+}