diff --git a/2. LivePatch.reason b/2. LivePatch.reason index 9742cd6..cb3869a 100644 Binary files a/2. LivePatch.reason and b/2. LivePatch.reason differ diff --git a/configs/obs24-scene.json b/configs/obs24-scene.json index 2fd0160..9df0eb2 100644 --- a/configs/obs24-scene.json +++ b/configs/obs24-scene.json @@ -87,6 +87,125 @@ } ], "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": "browser_source", + "mixers": 255, + "monitoring_type": 0, + "muted": false, + "name": "Android CAM", + "prev_ver": 402653187, + "private_settings": {}, + "push-to-mute": false, + "push-to-mute-delay": 0, + "push-to-talk": false, + "push-to-talk-delay": 0, + "settings": { + "height": 720, + "is_local_file": false, + "reroute_audio": true, + "restart_when_active": false, + "url": "http://192.168.32.178:8080/browserfs.html", + "width": 1280 + }, + "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": 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, @@ -96,9 +215,11 @@ "hotkeys": { "OBSBasic.SelectScene": [], "libobs.hide_scene_item.ASIO": [], + "libobs.hide_scene_item.Android CAM": [], "libobs.hide_scene_item.Display Capture": [], "libobs.hide_scene_item.Video Capture Device": [], "libobs.show_scene_item.ASIO": [], + "libobs.show_scene_item.Android CAM": [], "libobs.show_scene_item.Display Capture": [], "libobs.show_scene_item.Video Capture Device": [] }, @@ -115,7 +236,7 @@ "push-to-talk-delay": 0, "settings": { "custom_size": false, - "id_counter": 11, + "id_counter": 16, "items": [ { "align": 5, @@ -159,18 +280,47 @@ "crop_right": 0, "crop_top": 0, "group_item_backup": false, - "id": 8, + "id": 16, "locked": false, - "name": "Video Capture Device", + "name": "Android CAM", "pos": { - "x": 763.0, - "y": 508.0 + "x": 1271.0, + "y": 732.0 }, "private_settings": {}, "rot": 0.0, "scale": { - "x": -1.1921875476837158, - "y": 1.1916667222976685 + "x": -0.48359376192092896, + "y": 0.48333331942558289 + }, + "scale_filter": "disable", + "visible": false + }, + { + "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": 8, + "locked": false, + "name": "Video Capture Device", + "pos": { + "x": 716.0, + "y": 543.0 + }, + "private_settings": {}, + "rot": 0.0, + "scale": { + "x": -1.1187499761581421, + "y": 1.1187499761581421 }, "scale_filter": "disable", "visible": true @@ -192,14 +342,14 @@ "locked": false, "name": "Video Capture Device", "pos": { - "x": 1159.0, - "y": 509.0 + "x": 1206.0, + "y": 544.0 }, "private_settings": {}, "rot": 0.0, "scale": { - "x": 1.1890624761581421, - "y": 1.1895833015441895 + "x": 1.1156250238418579, + "y": 1.1166666746139526 }, "scale_filter": "disable", "visible": true @@ -237,91 +387,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": 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": { - "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 } ], "transition_duration": 300,