Skip to content

Commit

Permalink
fixup! feat: add screen rendering for S4Mk3
Browse files Browse the repository at this point in the history
  • Loading branch information
@acolombier
acolombier committed Jan 19, 2025
1 parent 153c03b commit ea98715
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 11 deletions.
8 changes: 4 additions & 4 deletions res/controllers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/Overlays/TopControls.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Item {
label: fxType.value == 1 ? ((fxSelect1.description == "Delay") ? "DELAY" : (fxSelect1.description == "Reverb") ? "REVRB" : (fxSelect1.description == "Flanger") ? "FLANG" : (fxSelect1.description == "Flanger Pulse") ? "FLN-P" : (fxSelect1.description == "Flanger Flux") ? "FLN-F" : (fxSelect1.description == "Gater") ? "GATER" : (fxSelect1.description == "Beatmasher 2") ? "BEATM" : (fxSelect1.description == "Delay T3") ? "T3DELAY" : (fxSelect1.description == "Filter LFO") ? "FLT-O" : (fxSelect1.description == "Filter Pulse") ? "FLT-P" : (fxSelect1.description == "Filter") ? "FILTR" : (fxSelect1.description == "Filter:92 Pulse") ? "F92-O" : (fxSelect1.description == "Filter:92 Pulse") ? "F92-P" : (fxSelect1.description == "Filter:92") ? "FLT92" : (fxSelect1.description == "Phaser") ? "PHFXASR" : (fxSelect1.description == "Phaser Pulse") ? "PHS-P" : (fxSelect1.description == "Phaser Flux") ? "PHS-F" : (fxSelect1.description == "Reverse Grain") ? "REVGR" : (fxSelect1.description == "Turntable FX") ? "TTFX" : (fxSelect1.description == "Iceverb") ? "ICEVB" : (fxSelect1.description == "Reverb T3") ? "T3REVRB" : (fxSelect1.description == "Ringmodulator") ? "RINGM" : (fxSelect1.description == "Digital LoFi") ? "LOFI" : (fxSelect1.description == "Mulholland Drive") ? "MHDRV" : (fxSelect1.description == "Transpose Stretch") ? "TRANS" : (fxSelect1.description == "BeatSlicer") ? "SLICER" : (fxSelect1.description == "Formant Filter") ? "FFTR" : (fxSelect1.description == "Peak Filter") ? "PFTR" : (fxSelect1.description == "Tape Delay") ? "TPDELAY" : (fxSelect1.description == "Ramp Delay") ? "RMPDLY" : (fxSelect1.description == "Auto Bouncer") ? "ABOUNCE" : (fxSelect1.description == "Bouncer") ? "BOUNCER" : (fxKnob3name.value == "LASLI") ? "LASLI" : (fxKnob3name.value == "GRANP") ? "GRANP" : (fxKnob3name.value == "B-O-M") ? "B-O-M" : (fxKnob3name.value == "POWIN") ? "POWIN" : (fxKnob3name.value == "EVNHR") ? "EVNHR" : (fxKnob3name.value == "ZZZRP") ? "ZZZRP" : (fxKnob3name.value == "STRRS") ? "STRRS" : (fxKnob3name.value == "STRRF") ? "STRRF" : (fxKnob3name.value == "DARKM") ? "DARKM" : (fxKnob3name.value == "FTEST") ? "FTEST" : fxSelect1.description) : "DRY/WET"
buttonLabel: fxType.value == 1 ? "ON" : ""
fxEnabled: (fxType.value != 1) || fxSelect1.value
barBgColor: barBgColor
barBgColor: topLabels.barBgColor
isPatternPlayer: (fxType.value == 2 ? true : false)
}
TopInfoDetails {
Expand All @@ -276,7 +276,7 @@ Item {
label: fxKnob1name.value
buttonLabel: fxButton1name.value
fxEnabled: (fxSelect1.value || ((fxType.value == 1) && fxSelect1.value) )
barBgColor: barBgColor
barBgColor: topLabels.barBgColor
isPatternPlayer: (fxType.value == 2 ? true : false)
}

Expand All @@ -287,7 +287,7 @@ Item {
label: fxKnob2name.value
buttonLabel: fxButton2name.value
fxEnabled: (fxSelect2.value || ((fxType.value == 1) && fxSelect1.value) )
barBgColor: barBgColor
barBgColor: topLabels.barBgColor
isPatternPlayer: (fxType.value == 2 ? true : false)
}

Expand All @@ -298,7 +298,7 @@ Item {
label: fxKnob3name.value
buttonLabel: fxButton3name.value
fxEnabled: (fxSelect3.value || ((fxType.value == 1) && fxSelect1.value) )
barBgColor: barBgColor
barBgColor: topLabels.barBgColor
isPatternPlayer: (fxType.value == 2 ? true : false)
}
}
Expand Down
163 changes: 156 additions & 7 deletions ...ontrollers/TraktorKontrolS4MK3Screens/S4MK3/AdvancedScreen/Waveform/WaveformContainer.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import '../Widgets' as Widgets
import '../Overlays' as Overlays
import '../ViewModels' as ViewModels

import "../../../../../qml/" as Skin
import Mixxx 1.0 as Mixxx
import Mixxx.Controls 1.0 as MixxxControls

Item {
id: view
Expand All @@ -31,20 +32,168 @@ Item {
// WAVEFORM Position
//------------------------------------------------------------------------------------------------------------------

Skin.WaveformRow {
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"
}

MixxxControls.WaveformDisplay {
id: singleWaveform
group: `[Channel${view.deckId}]`
x: 0
width: 316
// height: (settings.alwaysShowTempoInfo || deckInfo.adjustEnabled ? (settings.hideStripe ? content.waveformHeight + display.secondRowHeight-51 : content.waveformHeight-38) : (!deckInfo.showBPMInfo ? (settings.hideStripe ? content.waveformHeight + display.secondRowHeight-13 : content.waveformHeight) : (settings.hideStripe ? content.waveformHeight + display.secondRowHeight-51 : content.waveformHeight-38))) + (settings.hidePhase && settings.hidePhrase ? 16 : 0) + (!settings.hidePhase && !settings.hidePhrase ? -16 : 0)
height: view.height

shader.axesColor: 'transparent'

zoomControlRatio: 100
Behavior on height { PropertyAnimation { duration: 90} }
// anchors.left: parent.left
// anchors.top: phase.bottom
anchors.fill: parent
zoom: zoomControl.value
backgroundColor: "#36000000"

Mixxx.WaveformRendererEndOfTrack {
color: 'blue'
}

Mixxx.WaveformRendererPreroll {
color: '#998977'
}

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: '#00ffffff'
lowColor: 'red'
midColor: 'green'
highColor: 'blue'
}

Mixxx.WaveformRendererStem { }

Mixxx.WaveformRendererBeat {
color: '#cfcfcf'
}

Mixxx.WaveformRendererMark {
playMarkerColor: 'cyan'
playMarkerBackground: 'transparent'
defaultMark: Mixxx.WaveformMark {
align: "bottom|right"
color: "#FF0000"
textColor: "#FFFFFF"
text: " %1 "
}

untilMark.showTime: true
untilMark.showBeats: true
untilMark.align: Mixxx.WaveformUntilMark.AlignCenter
untilMark.textSize: 14

Mixxx.WaveformMark {
control: "cue_point"
text: 'C'
align: 'top|right'
color: 'red'
textColor: '#FFFFFF'
}
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'
}
}
}

//--------------------------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit ea98715

Please sign in to comment.