Merge remote-tracking branch '2.3' into main

CHANGELOG.md

@@ -644,12 +644,12 @@
   [#4542](https://github.com/mixxxdj/mixxx/pull/4542)
   [#4559](https://github.com/mixxxdj/mixxx/pull/4559)
 
-## [2.3.3](https://launchpad.net/mixxx/+milestone/2.3.3) (unreleased)
+## [2.3.3](https://launchpad.net/mixxx/+milestone/2.3.3) (2022-06-21)
 
-* Pioneer-DDJ-SB3: Fix controller breaking when releasing the shift button [#4659](https://github.com/mixxxdj/mixxx/pull/4659)
+* Pioneer DDJ-SB3: Fix controller breaking when releasing the shift button [#4659](https://github.com/mixxxdj/mixxx/pull/4659)
 * Traktor S3: Push two deck switches to explicitly clone decks [#4665](https://github.com/mixxxdj/mixxx/pull/4665) [#4671](https://github.com/mixxxdj/mixxx/pull/4671) [lp:1960680](https://bugs.launchpad.net/mixxx/+bug/1960680)
-* Behringer DDM4000: Improve stability and add soft-takeover for encoder knobs [#4318](https://github.com/mixxxdj/mixxx/pull/4318)
-* MC7000: Fix 'inverted shift' bug in the controller mapping [#4755](https://github.com/mixxxdj/mixxx/pull/4755)
+* Behringer DDM4000: Improve stability and add soft-takeover for encoder knobs [#4318](https://github.com/mixxxdj/mixxx/pull/4318) [#4799](https://github.com/mixxxdj/mixxx/pull/4799)
+* Denon MC7000: Fix 'inverted shift' bug in the controller mapping [#4755](https://github.com/mixxxdj/mixxx/pull/4755)
 * Fix spinback and break effect in the controller engine [#4708](https://github.com/mixxxdj/mixxx/pull/4708)
 * Fix scratch on first wheel touch [#4761](https://github.com/mixxxdj/mixxx/pull/4761) [lp:1800343](https://bugs.launchpad.net/mixxx/+bug/1800343)
 * Preferences: Prevent controller settings being treated as changed even though they were not [#4721](https://github.com/mixxxdj/mixxx/pull/4721) [lp:1920844](https://bugs.launchpad.net/mixxx/+bug/1920844)
@@ -666,6 +666,7 @@
 * Restore keylock from configuration and fix pitch ratio rounding issue [#4756](https://github.com/mixxxdj/mixxx/pull/4756) [lp:1943180](https://bugs.launchpad.net/mixxx/+bug/1943180)
 * Improve CSV export of playlists and crates and fix empty rating column [#4762](https://github.com/mixxxdj/mixxx/pull/4762)
 * Fix passthrough-related crash in waveform code [#4789](https://github.com/mixxxdj/mixxx/pull/4789) [#4791](https://github.com/mixxxdj/mixxx/pull/4791) [lp:1959489](https://bugs.launchpad.net/mixxx/+bug/1959489) [lp:1977662](https://bugs.launchpad.net/mixxx/+bug/1977662)
+* Passthrough: stop rendering waveforms and disable Cue/Play indicators [4793](https://github.com/mixxxdj/mixxx/pull/4793)
 
 ## [2.3.2](https://launchpad.net/mixxx/+milestone/2.3.2) (2022-01-31)
 

packaging/debian/changelog

@@ -1,3 +1,9 @@
+mixxx (2.3.2-1~bionic) bionic; urgency=medium
+
+  * Build of 2.3.2
+
+ -- RJ Skerry-Ryan <[email protected]>  Sun, 30 Jan 2022 20:37:54 +0000
+
 mixxx (2.3.1-1~bionic) bionic; urgency=medium
 
   * Build of 2.3.1

res/linux/org.mixxx.Mixxx.metainfo.xml

@@ -1106,11 +1106,11 @@
  </ul>
 </description>
     </release>
-    <release version="2.3.3" type="development">
+    <release version="2.3.3" type="stable" date="2022-06-21" timestamp="1655769600">
       <description>
  <ul>
   <li>
-   Pioneer-DDJ-SB3: Fix controller breaking when releasing the shift button
+   Pioneer DDJ-SB3: Fix controller breaking when releasing the shift button
    #4659
   </li>
   <li>
@@ -1122,9 +1122,10 @@
   <li>
    Behringer DDM4000: Improve stability and add soft-takeover for encoder knobs
    #4318
+   #4799
   </li>
   <li>
-   MC7000: Fix 'inverted shift' bug in the controller mapping
+   Denon MC7000: Fix 'inverted shift' bug in the controller mapping
    #4755
   </li>
   <li>
@@ -1207,6 +1208,10 @@
    lp:1959489
    lp:1977662
   </li>
+  <li>
+   Passthrough: stop rendering waveforms and disable Cue/Play indicators
+   4793
+  </li>
  </ul>
 </description>
     </release>

res/skins/LateNight/samplers/sampler_mini.xml

@@ -30,14 +30,6 @@
               <ConfigKey><Variable name="Group"/>,play</ConfigKey>
             </Connection>
           </PushButton>
-          <PushButton>
-            <ObjectName>PlayIndicator</ObjectName>
-            <Size>34f,34f</Size>
-            <NumberStates>2</NumberStates>
-            <Connection>
-              <ConfigKey><Variable name="Group"/>,play_indicator</ConfigKey>
-            </Connection>
-          </PushButton>
         </Children>
       </WidgetGroup>
 

src/waveform/renderers/waveformrendermarkrange.cpp

@@ -64,6 +64,10 @@ void WaveformRenderMarkRange::draw(QPainter *painter, QPaintEvent * /*event*/) {
 
         double startPosition = m_waveformRenderer->transformSamplePositionInRendererWorld(startSample);
         double endPosition = m_waveformRenderer->transformSamplePositionInRendererWorld(endSample);
+        // The painter would extend the rectangle to the entire width while
+        // span is < 1 AND span != 0.25 * [1;3], i.e. works with span = [.25; 0.75] px
+        // TODO(xxx) Figure what's wrong with QPainter / the renderer
+        const double span = std::max(endPosition - startPosition, 1.0);
 
         //range not in the current display
         if (startPosition > m_waveformRenderer->getLength() || endPosition < 0) {
@@ -78,9 +82,9 @@ void WaveformRenderMarkRange::draw(QPainter *painter, QPaintEvent * /*event*/) {
         // this shouldn't involve *any* scaling it should be fast even in software mode
         QRectF rect;
         if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
-            rect.setRect(startPosition, 0, endPosition - startPosition, m_waveformRenderer->getHeight());
+            rect.setRect(startPosition, 0, span, m_waveformRenderer->getHeight());
         } else {
-            rect.setRect(0, startPosition, m_waveformRenderer->getWidth(), endPosition - startPosition);
+            rect.setRect(0, startPosition, m_waveformRenderer->getWidth(), span);
         }
         painter->drawImage(rect, *selectedImage, rect);
     }