diff --git a/2. LivePatch.reason b/2. LivePatch.reason index b922daf..fdb421a 100644 Binary files a/2. LivePatch.reason and b/2. LivePatch.reason differ diff --git a/6. OBS Studio.lnk b/6. OBS Studio.lnk new file mode 100644 index 0000000..4af878e Binary files /dev/null and b/6. OBS Studio.lnk differ diff --git a/configs/obs24-scene.json b/configs/obs24-scene.json index d5472ea..9f30f50 100644 --- a/configs/obs24-scene.json +++ b/configs/obs24-scene.json @@ -14,7 +14,7 @@ "id": "wasapi_output_capture", "mixers": 255, "monitoring_type": 0, - "muted": false, + "muted": true, "name": "Desktop Audio", "prev_ver": 402653187, "private_settings": {}, @@ -27,7 +27,7 @@ "use_device_timing": true }, "sync": 0, - "volume": 0.87474912405014038 + "volume": 0.0 }, "current_program_scene": "Scene", "current_scene": "Scene", @@ -87,6 +87,91 @@ } ], "sources": [ + { + "balance": 0.5, + "deinterlace_field_order": 0, + "deinterlace_mode": 0, + "enabled": true, + "flags": 0, + "hotkeys": { + "libobs.mute": [], + "libobs.push-to-mute": [], + "libobs.push-to-talk": [], + "libobs.unmute": [] + }, + "id": "asio_input_capture", + "mixers": 255, + "monitoring_type": 0, + "muted": false, + "name": "ASIO", + "prev_ver": 402653187, + "private_settings": {}, + "push-to-mute": false, + "push-to-mute-delay": 0, + "push-to-talk": false, + "push-to-talk-delay": 0, + "settings": { + "device_id": "ReaRoute ASIO (x64)", + "route 0": 14, + "route 1": 15 + }, + "sync": 0, + "volume": 1.0 + }, + { + "balance": 0.5, + "deinterlace_field_order": 0, + "deinterlace_mode": 0, + "enabled": true, + "flags": 0, + "hotkeys": { + "libobs.mute": [], + "libobs.push-to-mute": [], + "libobs.push-to-talk": [], + "libobs.unmute": [] + }, + "id": "dshow_input", + "mixers": 255, + "monitoring_type": 0, + "muted": true, + "name": "Video Capture Device", + "prev_ver": 402653187, + "private_settings": {}, + "push-to-mute": false, + "push-to-mute-delay": 0, + "push-to-talk": false, + "push-to-talk-delay": 0, + "settings": { + "last_video_device_id": "c922 Pro Stream Webcam:\\\\?\\usb#22vid_046d&pid_085c&mi_00#227&c21b532&1&0000#22{65e8773d-8f56-11d0-a3b9-00a0c9223196}\\global", + "video_device_id": "c922 Pro Stream Webcam:\\\\?\\usb#22vid_046d&pid_085c&mi_00#227&c21b532&1&0000#22{65e8773d-8f56-11d0-a3b9-00a0c9223196}\\global" + }, + "sync": 0, + "volume": 0.0 + }, + { + "balance": 0.5, + "deinterlace_field_order": 0, + "deinterlace_mode": 0, + "enabled": true, + "flags": 0, + "hotkeys": {}, + "id": "monitor_capture", + "mixers": 0, + "monitoring_type": 0, + "muted": false, + "name": "Display Capture", + "prev_ver": 402653187, + "private_settings": {}, + "push-to-mute": false, + "push-to-mute-delay": 0, + "push-to-talk": false, + "push-to-talk-delay": 0, + "settings": { + "capture_cursor": true + }, + "sync": 0, + "volume": 1.0 + }, { "balance": 0.5, "deinterlace_field_order": 0, @@ -115,7 +200,7 @@ "push-to-talk-delay": 0, "settings": { "custom_size": false, - "id_counter": 10, + "id_counter": 11, "items": [ { "align": 5, @@ -134,8 +219,8 @@ "locked": false, "name": "Display Capture", "pos": { - "x": 102.0, - "y": 143.0 + "x": 0.0, + "y": 0.0 }, "private_settings": {}, "rot": 0.0, @@ -144,7 +229,7 @@ "y": 1.0 }, "scale_filter": "disable", - "visible": true + "visible": false }, { "align": 5, @@ -163,14 +248,43 @@ "locked": false, "name": "Video Capture Device", "pos": { - "x": 1209.0, - "y": 547.0 + "x": 0.0, + "y": 590.0 }, "private_settings": {}, "rot": 0.0, "scale": { - "x": 1.1109374761581421, - "y": 1.1104166507720947 + "x": 1.0203125476837158, + "y": 1.0208333730697632 + }, + "scale_filter": "disable", + "visible": true + }, + { + "align": 5, + "bounds": { + "x": 0.0, + "y": 0.0 + }, + "bounds_align": 0, + "bounds_type": 0, + "crop_bottom": 0, + "crop_left": 0, + "crop_right": 0, + "crop_top": 0, + "group_item_backup": false, + "id": 11, + "locked": false, + "name": "Video Capture Device", + "pos": { + "x": 1920.0, + "y": 592.0 + }, + "private_settings": {}, + "rot": 0.0, + "scale": { + "x": -1.0171874761581421, + "y": 1.0166666507720947 }, "scale_filter": "disable", "visible": true @@ -208,91 +322,6 @@ }, "sync": 0, "volume": 1.0 - }, - { - "balance": 0.5, - "deinterlace_field_order": 0, - "deinterlace_mode": 0, - "enabled": true, - "flags": 0, - "hotkeys": {}, - "id": "monitor_capture", - "mixers": 0, - "monitoring_type": 0, - "muted": false, - "name": "Display Capture", - "prev_ver": 402653187, - "private_settings": {}, - "push-to-mute": false, - "push-to-mute-delay": 0, - "push-to-talk": false, - "push-to-talk-delay": 0, - "settings": { - "capture_cursor": true - }, - "sync": 0, - "volume": 1.0 - }, - { - "balance": 0.5, - "deinterlace_field_order": 0, - "deinterlace_mode": 0, - "enabled": true, - "flags": 0, - "hotkeys": { - "libobs.mute": [], - "libobs.push-to-mute": [], - "libobs.push-to-talk": [], - "libobs.unmute": [] - }, - "id": "dshow_input", - "mixers": 255, - "monitoring_type": 0, - "muted": false, - "name": "Video Capture Device", - "prev_ver": 402653187, - "private_settings": {}, - "push-to-mute": false, - "push-to-mute-delay": 0, - "push-to-talk": false, - "push-to-talk-delay": 0, - "settings": { - "last_video_device_id": "c922 Pro Stream Webcam:\\\\?\\usb#22vid_046d&pid_085c&mi_00#227&c21b532&1&0000#22{65e8773d-8f56-11d0-a3b9-00a0c9223196}\\global", - "video_device_id": "c922 Pro Stream Webcam:\\\\?\\usb#22vid_046d&pid_085c&mi_00#227&c21b532&1&0000#22{65e8773d-8f56-11d0-a3b9-00a0c9223196}\\global" - }, - "sync": 0, - "volume": 1.0 - }, - { - "balance": 0.5, - "deinterlace_field_order": 0, - "deinterlace_mode": 0, - "enabled": true, - "flags": 0, - "hotkeys": { - "libobs.mute": [], - "libobs.push-to-mute": [], - "libobs.push-to-talk": [], - "libobs.unmute": [] - }, - "id": "asio_input_capture", - "mixers": 255, - "monitoring_type": 0, - "muted": false, - "name": "ASIO", - "prev_ver": 402653187, - "private_settings": {}, - "push-to-mute": false, - "push-to-mute-delay": 0, - "push-to-talk": false, - "push-to-talk-delay": 0, - "settings": { - "device_id": "ReaRoute ASIO (x64)", - "route 0": 0, - "route 1": 1 - }, - "sync": 0, - "volume": 1.0 } ], "transition_duration": 300, diff --git a/configs/traktor-settings.tsi b/configs/traktor-settings.tsi index 3a7b120..e5d5c35 100644 --- a/configs/traktor-settings.tsi +++ b/configs/traktor-settings.tsi @@ -51,7 +51,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -355,7 +355,7 @@ - +