fix intro/outro marker and zoom reset

mixxxdj · Nov 9, 2024 · 3d9deed · 3d9deed
1 parent 8d650e9
commit 3d9deed
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 9 deletions.
diff --git a/res/qml/Deck.qml b/res/qml/Deck.qml
@@ -326,6 +326,54 @@ Item {
             activeColor: Theme.deckActiveColor
         }
 
+        Row {
+            anchors.left: playButton.right
+            anchors.leftMargin: 10
+            anchors.bottom: playButton.bottom
+            anchors.topMargin: 5
+            spacing: -1
+
+            Skin.IntroOutroButton {
+                keyPrefix: "intro_start"
+                group: root.group
+
+                text: "Intro\nStart"
+
+                width: playButton.height * 2 - 1
+                height: playButton.height
+            }
+
+            Skin.IntroOutroButton {
+                keyPrefix: "intro_end"
+                group: root.group
+
+                text: "Intro\nEnd"
+
+                width: playButton.height * 2 - 1
+                height: playButton.height
+            }
+
+            Skin.IntroOutroButton {
+                keyPrefix: "outro_start"
+                group: root.group
+
+                text: "Outro\nStart"
+
+                width: playButton.height * 2 - 1
+                height: playButton.height
+            }
+
+            Skin.IntroOutroButton {
+                keyPrefix: "outro_end"
+                group: root.group
+
+                text: "Outro\nEnd"
+
+                width: playButton.height * 2 - 1
+                height: playButton.height
+            }
+        }
+
         Row {
             anchors.left: cueButton.right
             anchors.top: parent.top

diff --git a/res/qml/IntroOutroButton.qml b/res/qml/IntroOutroButton.qml
@@ -0,0 +1,45 @@
+import "." as Skin
+import Mixxx 1.0 as Mixxx
+import QtQuick 2.12
+
+import "Theme"
+
+Skin.Button {
+    id: root
+
+    required property string keyPrefix
+    required property string group
+
+    activeColor: Theme.deckActiveColor
+    highlight: enabledControl.value
+
+    Mixxx.ControlProxy {
+        id: control
+
+        group: root.group
+        key: `${root.keyPrefix}_activate`
+        value: root.down
+    }
+
+    Mixxx.ControlProxy {
+        id: enabledControl
+
+        group: root.group
+        key: `${root.keyPrefix}_enabled`
+    }
+
+    Mixxx.ControlProxy {
+        id: cleanControl
+
+        group: root.group
+        key: `${root.keyPrefix}_clear`
+        value: mousearea.pressed && enabledControl.value
+    }
+
+    MouseArea {
+        id: mousearea
+
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+    }
+}
diff --git a/res/qml/WaveformDisplay.qml b/res/qml/WaveformDisplay.qml
@@ -110,6 +110,7 @@ Item {
             }
             Mixxx.WaveformMark {
                 control: "intro_start_position"
+                text: '◢'
                 align: 'top|right'
                 color: 'blue'
                 textColor: '#FFFFFF'
@@ -130,6 +131,7 @@ Item {
             }
             Mixxx.WaveformMark {
                 control: "outro_end_position"
+                text: '◣'
                 align: 'top|left'
                 color: 'blue'
                 textColor: '#FFFFFF'
@@ -171,7 +173,6 @@ Item {
         group: root.group
         key: "waveform_zoom"
     }
-    readonly property real effectiveZoomFactor: (1 / rateRatioControl.value) * (100 / zoomControl.value)
 
     MouseArea {
         property int mouseStatus: WaveformDisplay.MouseStatus.Normal

diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -86,14 +86,6 @@ WaveformWidgetRenderer::~WaveformWidgetRenderer() {
 }
 
 bool WaveformWidgetRenderer::init() {
-    m_trackPixelCount = 0.0;
-    m_zoomFactor = 1.0;
-    m_visualSamplePerPixel = 1.0;
-    m_audioSamplePerPixel = 1.0;
-    m_totalVSamples = 0;
-    m_gain = 1.0;
-    m_trackSamples = 0.0;
-
     for (int type = ::WaveformRendererAbstract::Play;
             type <= ::WaveformRendererAbstract::Slip;
             type++) {