diff --git a/src/clyphx-pro/X-Controls.txt b/src/clyphx-pro/X-Controls.txt index 5346fb5..3cc5762 100644 --- a/src/clyphx-pro/X-Controls.txt +++ b/src/clyphx-pro/X-Controls.txt @@ -84,4 +84,9 @@ AUTOMATION_ARM = NOTE, 1, 54, 127, 0, SATM AUTOMATION_REENABLE = NOTE, 1, 55, 127, 0, SATMR -SESSION_REC = NOTE, 1, 56, 127, 0, SREC \ No newline at end of file +SESSION_REC = NOTE, 1, 56, 127, 0, SREC + +# Controls for Streamdeck XL +# Using IAC Driver StreamdeckToDaw + +DECK_A_NUDGE_CLIP_NOTES_DEL = CC, 10, 67, 127, 0, SEL/CLIP NOTES DEL ; SEL/CLIP ENVCLR ; SEL/DEV VAR 1 ; SEL/DEV VARRECALL ; MSG "EMPTIED CLIP" ; PUSH MSG "EMPTIED CLIP" diff --git a/src/loopback/Devices.plist b/src/loopback/Devices.plist index 0e42b26..da2ecae 100644 Binary files a/src/loopback/Devices.plist and b/src/loopback/Devices.plist differ diff --git a/src/loopback/RecentApps.plist b/src/loopback/RecentApps.plist index 3e8dda4..6e6acfe 100644 Binary files a/src/loopback/RecentApps.plist and b/src/loopback/RecentApps.plist differ diff --git a/src/patches/Control Traktor v5 - Params - Dk.amxd b/src/patches/Control Traktor v5 - Params - Dk.amxd deleted file mode 100644 index da6f76f..0000000 Binary files a/src/patches/Control Traktor v5 - Params - Dk.amxd and /dev/null differ diff --git a/src/patches/Control Traktor v5 - Params - Global.amxd b/src/patches/Control Traktor v5 - Params - Global.amxd deleted file mode 100644 index 602d334..0000000 Binary files a/src/patches/Control Traktor v5 - Params - Global.amxd and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Loop Recorder Rack.adg b/src/presets/Control Traktor v5 - Loop Recorder Rack.adg deleted file mode 100644 index e06055a..0000000 Binary files a/src/presets/Control Traktor v5 - Loop Recorder Rack.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Params - Dk Rack.adg b/src/presets/Control Traktor v5 - Params - Dk Rack.adg deleted file mode 100644 index b56c9f3..0000000 Binary files a/src/presets/Control Traktor v5 - Params - Dk Rack.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Params - Dk.adv b/src/presets/Control Traktor v5 - Params - Dk.adv deleted file mode 100644 index f54af90..0000000 Binary files a/src/presets/Control Traktor v5 - Params - Dk.adv and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Params - Global Rack.adg b/src/presets/Control Traktor v5 - Params - Global Rack.adg deleted file mode 100644 index ec6db32..0000000 Binary files a/src/presets/Control Traktor v5 - Params - Global Rack.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Params - Global.adv b/src/presets/Control Traktor v5 - Params - Global.adv deleted file mode 100644 index d99bde3..0000000 Binary files a/src/presets/Control Traktor v5 - Params - Global.adv and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Dk A Rack.adg b/src/presets/Control Traktor v5 - Triggers - Dk A Rack.adg deleted file mode 100644 index 9b61323..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Dk A Rack.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Dk B Rack.adg b/src/presets/Control Traktor v5 - Triggers - Dk B Rack.adg deleted file mode 100644 index 7995e03..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Dk B Rack.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk A.adg b/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk A.adg deleted file mode 100644 index fe49b47..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk A.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk B.adg b/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk B.adg deleted file mode 100644 index eae7c0f..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Freeze Slices - Dk B.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk A.adg b/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk A.adg deleted file mode 100644 index 5b19e4a..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk A.adg and /dev/null differ diff --git a/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk B.adg b/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk B.adg deleted file mode 100644 index 779507d..0000000 Binary files a/src/presets/Control Traktor v5 - Triggers - Hot Cues - Dk B.adg and /dev/null differ diff --git a/src/bome-midi-translator-pro/mcu-pro.bmtp b/src/presets/bome-midi-translator-pro/mcu-pro.bmtp similarity index 100% rename from src/bome-midi-translator-pro/mcu-pro.bmtp rename to src/presets/bome-midi-translator-pro/mcu-pro.bmtp diff --git a/src/presets/live/CT6 Params.adv b/src/presets/live/CT6 Params.adv new file mode 100644 index 0000000..b47cfd0 Binary files /dev/null and b/src/presets/live/CT6 Params.adv differ diff --git a/src/presets/live/CT6 Rack.adg b/src/presets/live/CT6 Rack.adg new file mode 100644 index 0000000..e7c43a4 Binary files /dev/null and b/src/presets/live/CT6 Rack.adg differ diff --git a/src/presets/live/CT6 Seq Pads.adg b/src/presets/live/CT6 Seq Pads.adg new file mode 100644 index 0000000..51d64ee Binary files /dev/null and b/src/presets/live/CT6 Seq Pads.adg differ diff --git a/src/sets/CT6.als b/src/sets/CT6.als new file mode 100644 index 0000000..fd33104 Binary files /dev/null and b/src/sets/CT6.als differ diff --git a/src/sets/Control Traktor v4.als b/src/sets/Control Traktor v4.als deleted file mode 100644 index a4cc8a6..0000000 Binary files a/src/sets/Control Traktor v4.als and /dev/null differ diff --git a/src/sets/Control Traktor v5 - Simpler.als b/src/sets/Control Traktor v5 - Simpler.als deleted file mode 100644 index bc427ad..0000000 Binary files a/src/sets/Control Traktor v5 - Simpler.als and /dev/null differ diff --git a/src/sets/Control Traktor v5.als b/src/sets/Control Traktor v5.als deleted file mode 100644 index 56c8208..0000000 Binary files a/src/sets/Control Traktor v5.als and /dev/null differ diff --git a/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-22.streamDeckProfilesBackup b/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-22.streamDeckProfilesBackup new file mode 100644 index 0000000..c1fd9d3 Binary files /dev/null and b/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-22.streamDeckProfilesBackup differ diff --git a/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-26.streamDeckProfilesBackup b/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-26.streamDeckProfilesBackup new file mode 100644 index 0000000..11c0753 Binary files /dev/null and b/src/streamdeck-xl/backups/Stream Deck - 06-12-2024 - 14-26.streamDeckProfilesBackup differ diff --git a/src/streamdeck-xl/backups/Stream Deck - 27-11-2024 - 23-22.streamDeckProfilesBackup b/src/streamdeck-xl/backups/Stream Deck - 27-11-2024 - 23-22.streamDeckProfilesBackup new file mode 100644 index 0000000..581d745 Binary files /dev/null and b/src/streamdeck-xl/backups/Stream Deck - 27-11-2024 - 23-22.streamDeckProfilesBackup differ diff --git a/src/streamdeck-xl/icons/button-creator/freeze-slice-count.png b/src/streamdeck-xl/icons/button-creator/freeze-slice-count.png new file mode 100644 index 0000000..3012197 Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/freeze-slice-count.png differ diff --git a/src/streamdeck-xl/icons/button-creator/freeze-slice-size.png b/src/streamdeck-xl/icons/button-creator/freeze-slice-size.png new file mode 100644 index 0000000..f767a81 Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/freeze-slice-size.png differ diff --git a/src/streamdeck-xl/icons/button-creator/freeze.png b/src/streamdeck-xl/icons/button-creator/freeze.png new file mode 100644 index 0000000..9949596 Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/freeze.png differ diff --git a/src/streamdeck-xl/icons/button-creator/live-clear-clip.png b/src/streamdeck-xl/icons/button-creator/live-clear-clip.png new file mode 100644 index 0000000..9c54564 Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/live-clear-clip.png differ diff --git a/src/streamdeck-xl/icons/button-creator/live-tempo-phase-nudge.png b/src/streamdeck-xl/icons/button-creator/live-tempo-phase-nudge.png new file mode 100644 index 0000000..abe274f Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/live-tempo-phase-nudge.png differ diff --git a/src/streamdeck-xl/icons/button-creator/push-pad-mode.png b/src/streamdeck-xl/icons/button-creator/push-pad-mode.png new file mode 100644 index 0000000..409eddf Binary files /dev/null and b/src/streamdeck-xl/icons/button-creator/push-pad-mode.png differ diff --git a/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-count.xml b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-count.xml new file mode 100644 index 0000000..aa6666d --- /dev/null +++ b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-count.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-size.xml b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-size.xml new file mode 100644 index 0000000..1906291 --- /dev/null +++ b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/freeze-slice-size.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/leds-to-push.xml b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/leds-to-push.xml new file mode 100644 index 0000000..8ff7228 --- /dev/null +++ b/src/streamdeck-xl/plugins/streamdeck-midi-plugin/cycle-files/leds-to-push.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/streamdeck-xl/profiles/Traktor.streamDeckProfile b/src/streamdeck-xl/profiles/Traktor.streamDeckProfile index 3d793b9..8aa7310 100644 Binary files a/src/streamdeck-xl/profiles/Traktor.streamDeckProfile and b/src/streamdeck-xl/profiles/Traktor.streamDeckProfile differ diff --git a/src/traktor/CT6 - App Export.tsi b/src/traktor/CT6 - App Export.tsi new file mode 100644 index 0000000..6f71228 --- /dev/null +++ b/src/traktor/CT6 - App Export.tsi @@ -0,0 +1,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/traktor/CT6 - Deck A.tsi b/src/traktor/CT6 - Deck A.tsi new file mode 100644 index 0000000..a4757dd --- /dev/null +++ b/src/traktor/CT6 - Deck A.tsi @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/traktor/CT6 - Deck B.tsi b/src/traktor/CT6 - Deck B.tsi new file mode 100644 index 0000000..76de86b --- /dev/null +++ b/src/traktor/CT6 - Deck B.tsi @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/traktor/CT6 - Global.tsi b/src/traktor/CT6 - Global.tsi new file mode 100644 index 0000000..aab83d4 --- /dev/null +++ b/src/traktor/CT6 - Global.tsi @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/traktor/Control Traktor v5 - Stream Deck.tsi b/src/traktor/CT6 - Korg nanoKEY2.tsi similarity index 58% rename from src/traktor/Control Traktor v5 - Stream Deck.tsi rename to src/traktor/CT6 - Korg nanoKEY2.tsi index 84b8823..14524f3 100644 --- a/src/traktor/Control Traktor v5 - Stream Deck.tsi +++ b/src/traktor/CT6 - Korg nanoKEY2.tsi @@ -1,5 +1,5 @@ - + diff --git a/src/traktor/CT6 - S8.tsi b/src/traktor/CT6 - S8.tsi new file mode 100644 index 0000000..fe2ccb6 --- /dev/null +++ b/src/traktor/CT6 - S8.tsi @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/traktor/CT6 - Streamdeck XL.tsi b/src/traktor/CT6 - Streamdeck XL.tsi new file mode 100644 index 0000000..f58348f --- /dev/null +++ b/src/traktor/CT6 - Streamdeck XL.tsi @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/traktor/Control Traktor v5 - App Export.tsi b/src/traktor/Control Traktor v5 - App Export.tsi deleted file mode 100644 index 9a507a4..0000000 --- a/src/traktor/Control Traktor v5 - App Export.tsi +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/traktor/Control Traktor v5 - Dk A.tsi b/src/traktor/Control Traktor v5 - Dk A.tsi deleted file mode 100644 index 8433535..0000000 --- a/src/traktor/Control Traktor v5 - Dk A.tsi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/traktor/Control Traktor v5 - Dk B.tsi b/src/traktor/Control Traktor v5 - Dk B.tsi deleted file mode 100644 index 5557848..0000000 --- a/src/traktor/Control Traktor v5 - Dk B.tsi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/traktor/Control Traktor v5 - Global.tsi b/src/traktor/Control Traktor v5 - Global.tsi deleted file mode 100644 index 1d847c6..0000000 --- a/src/traktor/Control Traktor v5 - Global.tsi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/traktor/Control Traktor v5 - Korg nanoKEY Studio.tsi b/src/traktor/Control Traktor v5 - Korg nanoKEY Studio.tsi deleted file mode 100644 index eb6a555..0000000 --- a/src/traktor/Control Traktor v5 - Korg nanoKEY Studio.tsi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/traktor/Control Traktor v5 - S8.tsi b/src/traktor/Control Traktor v5 - S8.tsi deleted file mode 100644 index a6684ca..0000000 --- a/src/traktor/Control Traktor v5 - S8.tsi +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/traktor/qml.diff b/src/traktor/qml.diff deleted file mode 100644 index 02d52d2..0000000 --- a/src/traktor/qml.diff +++ /dev/null @@ -1,205 +0,0 @@ -diff --git qml/CSI/Common/Deck_S8Style.qml qml/CSI/Common/Deck_S8Style.qml -index 431b26e..cbc9469 100755 ---- qml/CSI/Common/Deck_S8Style.qml -+++ qml/CSI/Common/Deck_S8Style.qml -@@ -14,6 +14,7 @@ Module - property alias deckFocus: deckFocusProp.value - - property bool keyOrBPMOverlay: false; -+ readonly property bool tempoCoarseDefault: true // TODO prefs.tempoCoarseDefault not working (false = fine AND coarse) - - //------------------------------------------------------------------------------------------------------------------ - -@@ -1403,8 +1404,8 @@ Module - enabled: focusedDeckId == 1 - - Wire { from: "%surface%.back"; to: "decks.1.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.1.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.1.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.1.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.1.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck B -@@ -1413,8 +1414,8 @@ Module - enabled: focusedDeckId == 2 - - Wire { from: "%surface%.back"; to: "decks.2.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.2.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.2.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.2.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.2.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck C -@@ -1423,8 +1424,8 @@ Module - enabled: focusedDeckId == 3 - - Wire { from: "%surface%.back"; to: "decks.3.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.3.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.3.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.3.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.3.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck D -@@ -1433,8 +1434,8 @@ Module - enabled: focusedDeckId == 4 - - Wire { from: "%surface%.back"; to: "decks.4.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.4.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.4.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.4.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.4.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - } - -diff --git qml/CSI/S5/Mixer.qml qml/CSI/S5/Mixer.qml -index 65c880e..352beec 100755 ---- qml/CSI/S5/Mixer.qml -+++ qml/CSI/S5/Mixer.qml -@@ -5,11 +5,12 @@ Module - id: mixer - property bool shift: false - property string surface: "" -+ readonly property bool tempoCoarseDefault: true - - // Master Clock - MasterClock { name: "MasterTempo" } -- Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.coarse"; enabled: shift } -- Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.fine"; enabled: !shift } -+ Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.coarse"; enabled: tempoCoarseDefault ? !shift : shift } -+ Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.fine"; enabled: tempoCoarseDefault ? shift : !shift } - - - // Channels -diff --git qml/CSI/S5/S5Deck.qml qml/CSI/S5/S5Deck.qml -index e35062f..02532e7 100755 ---- qml/CSI/S5/S5Deck.qml -+++ qml/CSI/S5/S5Deck.qml -@@ -15,6 +15,7 @@ Module - property string settingsPath: "path" - property string propertiesPath: "path" - property alias deckFocus: deckFocusProp.value -+ readonly property bool tempoCoarseDefault: true - function initializeModule() - { - updateFocusDependentDeckTypes(); -@@ -1564,8 +1565,8 @@ Module - enabled: focusedDeckId == 1 - - Wire { from: "%surface%.back"; to: "decks.1.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.1.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.1.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.1.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.1.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck B -@@ -1574,8 +1575,8 @@ Module - enabled: focusedDeckId == 2 - - Wire { from: "%surface%.back"; to: "decks.2.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.2.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.2.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.2.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.2.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck C -@@ -1584,8 +1585,8 @@ Module - enabled: focusedDeckId == 3 - - Wire { from: "%surface%.back"; to: "decks.3.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.3.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.3.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.3.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.3.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - - // Deck D -@@ -1594,8 +1595,8 @@ Module - enabled: focusedDeckId == 4 - - Wire { from: "%surface%.back"; to: "decks.4.tempo.reset" } -- Wire { from: "%surface%.browse"; to: "decks.4.tempo.fine"; enabled: !module.shift } -- Wire { from: "%surface%.browse"; to: "decks.4.tempo.coarse"; enabled: module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.4.tempo.fine"; enabled: tempoCoarseDefault ? module.shift : !module.shift } -+ Wire { from: "%surface%.browse"; to: "decks.4.tempo.coarse"; enabled: tempoCoarseDefault ? !module.shift : module.shift } - } - } - -diff --git qml/CSI/S8/Mixer.qml qml/CSI/S8/Mixer.qml -index e9289af..893f78f 100755 ---- qml/CSI/S8/Mixer.qml -+++ qml/CSI/S8/Mixer.qml -@@ -5,11 +5,12 @@ Module - id: mixer - property bool shift: false - property string surface: "" -+ readonly property bool tempoCoarseDefault: true - - // Master Clock - MasterClock { name: "MasterTempo" } -- Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.coarse"; enabled: shift } -- Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.fine"; enabled: !shift } -+ Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.coarse"; enabled: tempoCoarseDefault ? !shift : shift } -+ Wire { from: "%surface%.mixer.tempo"; to: "MasterTempo.fine"; enabled: tempoCoarseDefault ? shift : !shift } - - // Channels - Channel -diff --git qml/Screens/Defines/Prefs.qml qml/Screens/Defines/Prefs.qml -new file mode 100644 -index 0000000..23fc9a5 ---- /dev/null -+++ qml/Screens/Defines/Prefs.qml -@@ -0,0 +1,13 @@ -+import QtQuick 2.0 -+ -+QtObject { -+ -+ // deck preferences -+ readonly property string deckLiveTextTL: "Live Input" -+ readonly property string deckLiveTextTM: " " -+ readonly property string deckLiveTextTR: "XENYX" -+ readonly property string deckLiveTextBL: "Traktor Audio Passthru" -+ readonly property string deckLiveTextBM: " " -+ readonly property string deckLiveTextBR: "1202" -+ -+} -diff --git qml/Screens/S8/Views/Deck/DeckHeader.qml qml/Screens/S8/Views/Deck/DeckHeader.qml -index ca10e13..b26e3fb 100755 ---- qml/Screens/S8/Views/Deck/DeckHeader.qml -+++ qml/Screens/S8/Views/Deck/DeckHeader.qml -@@ -317,13 +317,13 @@ Item { - bottom_right_text.explicitName = " "; - } - else if (deckType == DeckType.Live) { -- top_left_text.explicitName = "Live Input"; -- bottom_left_text.explicitName = "Traktor Audio Passthru"; -+ top_left_text.explicitName = prefs.deckLiveTextTL; -+ bottom_left_text.explicitName = prefs.deckLiveTextBL; - // Force the the following DeckHeaderText to be empty -- top_middle_text.explicitName = " "; -- top_right_text.explicitName = " "; -- bottom_middle_text.explicitName = " "; -- bottom_right_text.explicitName = " "; -+ top_middle_text.explicitName = prefs.deckLiveTextTM; -+ top_right_text.explicitName = prefs.deckLiveTextTR; -+ bottom_middle_text.explicitName = prefs.deckLiveTextBM; -+ bottom_right_text.explicitName = prefs.deckLiveTextBR; - } - else if ((deckType == DeckType.Track) && !isLoaded) { - top_left_text.explicitName = "No Track Loaded"; -diff --git qml/Screens/S8/Views/Screen.qml qml/Screens/S8/Views/Screen.qml -index 995cec9..ef6150c 100755 ---- qml/Screens/S8/Views/Screen.qml -+++ qml/Screens/S8/Views/Screen.qml -@@ -76,6 +76,7 @@ Item { - Defines.Utils {id: utils} - Defines.Colors {id: colors} - Defines.Durations {id: durations} -+ Defines.Prefs {id: prefs} - - width: 480 - height: 272