diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 06f98bf..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Backup/ -Samples/ \ No newline at end of file diff --git a/2. Ableton LivePatch/2. LivePatch.als b/2. Ableton LivePatch/2. LivePatch.als deleted file mode 100644 index 693ab36..0000000 Binary files a/2. Ableton LivePatch/2. LivePatch.als and /dev/null differ diff --git a/2. Ableton LivePatch/Ableton Project Info/AProject.ico b/2. Ableton LivePatch/Ableton Project Info/AProject.ico deleted file mode 100644 index d3af83e..0000000 Binary files a/2. Ableton LivePatch/Ableton Project Info/AProject.ico and /dev/null differ diff --git a/2. Ableton LivePatch/Ableton Project Info/Project8_1.cfg b/2. Ableton LivePatch/Ableton Project Info/Project8_1.cfg deleted file mode 100644 index 01b0562..0000000 Binary files a/2. Ableton LivePatch/Ableton Project Info/Project8_1.cfg and /dev/null differ diff --git a/2. Ableton LivePatch/Desktop.ini b/2. Ableton LivePatch/Desktop.ini deleted file mode 100644 index c2c3d6c..0000000 --- a/2. Ableton LivePatch/Desktop.ini +++ /dev/null @@ -1,5 +0,0 @@ -[.ShellClassInfo] -ConfirmFileOp=0 -NoSharing=0 -IconFile=Ableton Project Info/AProject.ico -IconIndex=0 diff --git a/4. LivePatch.reason b/2. LivePatch.reason similarity index 72% rename from 4. LivePatch.reason rename to 2. LivePatch.reason index 8765939..f940275 100644 Binary files a/4. LivePatch.reason and b/2. LivePatch.reason differ diff --git a/5. Jack Control - load patchbay.lnk b/4. Jack Control - use to load the patchbay config.lnk similarity index 100% rename from 5. Jack Control - load patchbay.lnk rename to 4. Jack Control - use to load the patchbay config.lnk diff --git a/README.md b/README.md index b887b07..2b46e07 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,11 @@ digital music setup deflax 2020 software: - jack: - links: - - from system capture mic to traktor - - from traktor to ableton - - from ableton to system playback -- ableton live lite 10: - - provides: - - traktor decks A to D tracks via in 1/2, 3/4, 5/6, 7/8 - - reason host via rewire - - main mixer output via out 1/2 - - cue via out 3/4 + - from system capture mic to reason + - from traktor to reason + - from reason to system playback - native instruments traktor pro 3 - provides: - - master clock via ableton link - 3d party tracks beatmatched and routed via jack (audio only, no timeline sync) - propellerhead reason 10 - provides: @@ -25,7 +18,7 @@ software: controllers: - akai midimix - controls: - - ableton main mixer + - mixers - novation remote le 25 - controls: - modular synths diff --git a/configs/AppData/Roaming/Ableton/Live 10.1.9/Preferences/Preferences.cfg b/configs/AppData/Roaming/Ableton/Live 10.1.9/Preferences/Preferences.cfg deleted file mode 100644 index 93dd8de..0000000 Binary files a/configs/AppData/Roaming/Ableton/Live 10.1.9/Preferences/Preferences.cfg and /dev/null differ diff --git a/configs/traktor-settings.tsi b/configs/traktor-settings.tsi index 64604d1..58068c5 100644 --- a/configs/traktor-settings.tsi +++ b/configs/traktor-settings.tsi @@ -51,7 +51,7 @@ - + @@ -142,8 +142,8 @@ - - + + @@ -205,7 +205,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -391,7 +391,7 @@ - + diff --git a/configs/patchbay.xml b/configs/traktor2reason.xml similarity index 72% rename from configs/patchbay.xml rename to configs/traktor2reason.xml index bd20331..9cab3c0 100644 --- a/configs/patchbay.xml +++ b/configs/traktor2reason.xml @@ -1,16 +1,10 @@ - + capture_1 capture_2 - - out1 - out2 - out3 - out4 - out1 out2 @@ -25,6 +19,12 @@ out11 out12 + + out1 + out2 + out3 + out4 + @@ -33,16 +33,6 @@ playback_3 playback_4 - - in1 - in2 - in3 - in4 - in5 - in6 - in7 - in8 - in1 in2 @@ -59,12 +49,28 @@ in13 in14 + + in1 + in2 + in3 + in4 + in5 + in6 + in7 + in8 + in9 + in10 + + + in9 + in10 + - - - + + +