From 56e27f88179967205c09babe8206fccf62305af8 Mon Sep 17 00:00:00 2001
From: deflax <deflax@users.noreply.github.com>
Date: Mon, 30 Mar 2020 04:26:53 +0300
Subject: [PATCH 1/2] Update README.md

---
 README.md | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 23fc705..80e99b2 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,52 @@
 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:
+    - mine mixer output to 1/4
+    - cue to output 3/4
+    - rewire host
+    - traktor decks A to D via in 1/2, 3/4, 5/6, 7/8
+
 - native instruments traktor pro 3
-  provides:
-    - master clock via generic midi
+  - provides:
+    - master clock via ableton link
     - 3d party audio beatmatched and routed via jack (audio only, no timeline sync)
 
 - propellerhead reason 10
-  provides:
-    - mixing to 1/2
-    - dsp
-    - monitoring to 3/4
+  - provides:
+    - effect dsp
     - modular synth
     - drum machines
-  accepts:
-    - mic/line in 1/2
+
 
 controllers:
 - akai midi mix
-  controls:
-    - reason mixers
-    - dsp
+  - controls:
+    - ableton main mixer
 - novation remote le 25
-  controls:
+  - controls:
     - modular synths
     - drum machines
 
-audio:
-- jack:
-  provides:
-    - audio input for reason
-  accepts:
-    - audio output for traktor
+hardware:
 - focusrite scarlett 2i4 2nd Gen
-  provides:
+  - provides:
     - main output 1/2
     - headphones output 3/4
-  accepts:
+  - accepts:
     - mic/line in 1/2
 
 streaming:
 - obs:
-  accepts:
-    - main output 1/2
+  - accepts:
+    - input:  output 1/2
     - camera1: display capture of audio software
     - camera2: logitech c922 to record controllers
-    - camera3: android ip cam (optional)
\ No newline at end of file
+    - camera3: android ip cam (optional)

From c3a7b5918003f60a2355c5f93ac97f53bf51cf74 Mon Sep 17 00:00:00 2001
From: deflax <deflax@users.noreply.github.com>
Date: Mon, 30 Mar 2020 04:30:45 +0300
Subject: [PATCH 2/2] Update README.md

---
 README.md | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 80e99b2..b887b07 100644
--- a/README.md
+++ b/README.md
@@ -6,28 +6,24 @@ software:
     - from system capture mic to traktor
     - from traktor to ableton
     - from ableton to system playback
-
 - ableton live lite 10:
   - provides:
-    - mine mixer output to 1/4
-    - cue to output 3/4
-    - rewire host
-    - traktor decks A to D via in 1/2, 3/4, 5/6, 7/8
-
+    - 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
 - native instruments traktor pro 3
   - provides:
     - master clock via ableton link
-    - 3d party audio beatmatched and routed via jack (audio only, no timeline sync)
-
+    - 3d party tracks beatmatched and routed via jack (audio only, no timeline sync)
 - propellerhead reason 10
   - provides:
-    - effect dsp
-    - modular synth
+    - effects dsp
+    - modular synths
     - drum machines
 
-
 controllers:
-- akai midi mix
+- akai midimix
   - controls:
     - ableton main mixer
 - novation remote le 25