-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add scrolling waveform in QML using scenegraph
- Loading branch information
1 parent
32b7991
commit d16b1dc
Showing
35 changed files
with
1,811 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,238 @@ | ||
| import "." as Skin | ||
| import Mixxx 1.0 as Mixxx | ||
| import Mixxx.Controls 1.0 as MixxxControls | ||
| import QtQuick 2.12 | ||
| import "Theme" | ||
|
|
||
| Item { | ||
| id: root | ||
|
|
||
| required property string group | ||
|
|
||
| enum MouseStatus { | ||
| Normal, | ||
| Bending, | ||
| Scratching | ||
| } | ||
|
|
||
| MixxxControls.WaveformDisplay { | ||
| anchors.fill: parent | ||
| group: root.group | ||
| zoom: zoomControl.value | ||
| backgroundColor: "#5e000000" | ||
|
|
||
| Mixxx.WaveformRendererEndOfTrack { | ||
| color: '#ff8872' | ||
| } | ||
|
|
||
| Mixxx.WaveformRendererPreroll { | ||
| color: '#ff8872' | ||
| } | ||
|
|
||
| Mixxx.WaveformRendererMarkRange { | ||
| // <!-- Loop --> | ||
| Mixxx.WaveformMarkRange { | ||
| startControl: "loop_start_position" | ||
| endControl: "loop_end_position" | ||
| enabledControl: "loop_enabled" | ||
| color: '#00b400' | ||
| opacity: 0.7 | ||
| disabledColor: '#FFFFFF' | ||
| disabledOpacity: 0.6 | ||
| } | ||
| // <!-- Intro --> | ||
| Mixxx.WaveformMarkRange { | ||
| startControl: "intro_start_position" | ||
| endControl: "intro_end_position" | ||
| color: '#2c5c9a' | ||
| opacity: 0.6 | ||
| durationTextColor: '#ffffff' | ||
| durationTextLocation: 'after' | ||
| } | ||
| // <!-- Outro --> | ||
| Mixxx.WaveformMarkRange { | ||
| startControl: "outro_start_position" | ||
| endControl: "outro_end_position" | ||
| color: '#2c5c9a' | ||
| opacity: 0.6 | ||
| durationTextColor: '#ffffff' | ||
| durationTextLocation: 'before' | ||
| } | ||
| } | ||
|
|
||
| Mixxx.WaveformRendererRGB { | ||
| axesColor: '#a1a1a1a1' | ||
| lowColor: '#ff2154d7' | ||
| midColor: '#cfb26606' | ||
| highColor: '#e5029c5c' | ||
| } | ||
|
|
||
| Mixxx.WaveformRendererStem { } | ||
|
|
||
| Mixxx.WaveformRendererBeat { | ||
| color: '#a1a1a1a1' | ||
| } | ||
|
|
||
| Mixxx.WaveformRendererMark { | ||
| playMarkerColor: 'cyan' | ||
| playMarkerBackground: 'orange' | ||
| defaultMark: Mixxx.WaveformMark { | ||
| align: "bottom|right" | ||
| color: "#00d9ff" | ||
| textColor: "#1a1a1a" | ||
| text: " %1 " | ||
| } | ||
|
|
||
| untilMark.showTime: true | ||
| untilMark.showBeats: true | ||
| untilMark.align: Mixxx.WaveformUntilMark.AlignBottom | ||
| untilMark.textSize: 11 | ||
|
|
||
| Mixxx.WaveformMark { | ||
| control: "cue_point" | ||
| text: 'CUE' | ||
| align: 'top|right' | ||
| color: 'red' | ||
| textColor: '#1a1a1a' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "loop_start_position" | ||
| text: '↻' | ||
| align: 'top|left' | ||
| color: 'green' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "loop_end_position" | ||
| align: 'bottom|right' | ||
| color: 'green' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "intro_start_position" | ||
| align: 'top|right' | ||
| color: 'blue' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "intro_end_position" | ||
| text: '◢' | ||
| align: 'top|left' | ||
| color: 'blue' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "outro_start_position" | ||
| text: '◣' | ||
| align: 'top|right' | ||
| color: 'blue' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| Mixxx.WaveformMark { | ||
| control: "outro_end_position" | ||
| align: 'top|left' | ||
| color: 'blue' | ||
| textColor: '#FFFFFF' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: scratchPositionEnableControl | ||
|
|
||
| group: root.group | ||
| key: "scratch_position_enable" | ||
| } | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: scratchPositionControl | ||
|
|
||
| group: root.group | ||
| key: "scratch_position" | ||
| } | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: wheelControl | ||
|
|
||
| group: root.group | ||
| key: "wheel" | ||
| } | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: rateRatioControl | ||
|
|
||
| group: root.group | ||
| key: "rate_ratio" | ||
| } | ||
|
|
||
| Mixxx.ControlProxy { | ||
| id: zoomControl | ||
|
|
||
| group: root.group | ||
| key: "waveform_zoom" | ||
| } | ||
| readonly property real effectiveZoomFactor: (1 / rateRatioControl.value) * (100 / zoomControl.value) | ||
|
|
||
| MouseArea { | ||
| property int mouseStatus: WaveformDisplay.MouseStatus.Normal | ||
| property point mouseAnchor: Qt.point(0, 0) | ||
|
|
||
| anchors.fill: parent | ||
| acceptedButtons: Qt.LeftButton | Qt.RightButton | ||
| onPressed: { | ||
| mouseAnchor = Qt.point(mouse.x, mouse.y); | ||
| if (mouse.button == Qt.LeftButton) { | ||
| if (mouseStatus == WaveformDisplay.MouseStatus.Bending) | ||
| wheelControl.parameter = 0.5; | ||
|
|
||
| mouseStatus = WaveformDisplay.MouseStatus.Scratching; | ||
| scratchPositionEnableControl.value = 1; | ||
| // TODO: Calculate position properly | ||
| scratchPositionControl.value = -mouse.x * zoomControl.value * 50; | ||
| } else { | ||
| if (mouseStatus == WaveformDisplay.MouseStatus.Scratching) | ||
| scratchPositionEnableControl.value = 0; | ||
|
|
||
| wheelControl.parameter = 0.5; | ||
| mouseStatus = WaveformDisplay.MouseStatus.Bending; | ||
| } | ||
| } | ||
| onPositionChanged: { | ||
| switch (mouseStatus) { | ||
| case WaveformDisplay.MouseStatus.Bending: { | ||
| const diff = mouse.x - mouseAnchor.x; | ||
| // Start at the middle of [0.0, 1.0], and emit values based on how far | ||
| // the mouse has traveled horizontally. Note, for legacy (MIDI) reasons, | ||
| // this is tuned to 127. | ||
| const v = 0.5 + (diff / root.width); | ||
| // clamp to [0.0, 1.0] | ||
| wheelControl.parameter = Math.max(Math.min(v, 1), 0); | ||
| break; | ||
| }; | ||
| case WaveformDisplay.MouseStatus.Scratching: | ||
| // TODO: Calculate position properly | ||
| scratchPositionControl.value = -mouse.x * zoomControl.value * 50; | ||
| break; | ||
| } | ||
| } | ||
| onReleased: { | ||
| switch (mouseStatus) { | ||
| case WaveformDisplay.MouseStatus.Bending: | ||
| wheelControl.parameter = 0.5; | ||
| break; | ||
| case WaveformDisplay.MouseStatus.Scratching: | ||
| scratchPositionEnableControl.value = 0; | ||
| break; | ||
| } | ||
| mouseStatus = WaveformDisplay.MouseStatus.Normal; | ||
| } | ||
|
|
||
| onWheel: { | ||
| if (wheel.angleDelta.y < 0 && zoomControl.value > 1) { | ||
| zoomControl.value -= 1; | ||
| } else if (wheel.angleDelta.y > 0 && zoomControl.value < 10.0) { | ||
| zoomControl.value += 1; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.