OBS overlays, starting to get publish and edit on res

2 files changed, 41 insertions, 38 deletions

diff --git a/roles/obs/templates/mpv.conf b/roles/obs/templates/mpv.conf
index 9aff3ee..b1bd1ca 100644
--- a/roles/obs/templates/mpv.conf
+++ b/roles/obs/templates/mpv.conf
@@ -15,7 +15,7 @@ sub-use-margins=yes
 sub-scale-by-window=yes
 sub-pos=103
 sub-margin-x=120
-sub-margin-y=40
+sub-margin-y=20
 sub-align-x=left
 # Style
 sub-font="{{ emacsconf_font }}"
diff --git a/roles/obs/templates/scenes.json b/roles/obs/templates/scenes.json
index 4e6e4bd..a92f29e 100644
--- a/roles/obs/templates/scenes.json
+++ b/roles/obs/templates/scenes.json
@@ -1,6 +1,6 @@
 {
-  "current_program_scene": "All track audio and screen",
-  "current_scene": "All track audio and screen",
+  "current_program_scene": "Video audio and screen",
+  "current_scene": "Video audio and screen",
   "current_transition": "Fade",
   "groups": [
     {
@@ -30,8 +30,8 @@
       "push-to-talk-delay": 0,
       "settings": {
         "custom_size": true,
-        "cx": 103,
-        "cy": 507,
+        "cx": 494,
+        "cy": 715,
         "id_counter": 0,
         "items": [
           {
@@ -56,11 +56,11 @@
             "locked": false,
             "name": "News",
             "pos": {
-              "x": 22,
-              "y": 390
+              "x": 12,
+              "y": 0
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -93,11 +93,11 @@
             "locked": false,
             "name": "URL",
             "pos": {
-              "x": 55,
-              "y": 389
+              "x": 114,
+              "y": 691
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -131,7 +131,7 @@
             "name": "Logo",
             "pos": {
               "x": 0,
-              "y": 404
+              "y": 603
             },
             "private_settings": {},
             "rot": 0,
@@ -236,6 +236,8 @@
       "push-to-talk": false,
       "push-to-talk-delay": 0,
       "settings": {
+        "color2": 4294967295,
+        "drop_shadow": false,
         "font": {
           "face": "Sans Serif",
           "flags": 0,
@@ -243,6 +245,7 @@
           "style": ""
         },
         "from_file": true,
+        "outline": true,
         "text_file": "/home/{{ emacsconf_id }}-{{ item.id }}/news.txt"
       },
       "sync": 0,
@@ -271,7 +274,7 @@
         "font": {
           "face": "Sans Serif",
           "flags": 0,
-          "size": 24,
+          "size": 20,
           "style": ""
         },
         "from_file": true,
@@ -346,14 +349,14 @@
         "OBSBasic.SelectScene": [],
         "libobs.hide_scene_item.Bottom": [],
         "libobs.hide_scene_item.Screen Capture (XSHM)": [],
-        "libobs.hide_scene_item.dev-qa": [],
-        "libobs.hide_scene_item.dev-vid": [],
         "libobs.hide_scene_item.emacsconf base": [],
+        "libobs.hide_scene_item.gen-qa": [],
+        "libobs.hide_scene_item.gen-vid": [],
         "libobs.show_scene_item.Bottom": [],
         "libobs.show_scene_item.Screen Capture (XSHM)": [],
-        "libobs.show_scene_item.dev-qa": [],
-        "libobs.show_scene_item.dev-vid": [],
-        "libobs.show_scene_item.emacsconf base": []
+        "libobs.show_scene_item.emacsconf base": [],
+        "libobs.show_scene_item.gen-qa": [],
+        "libobs.show_scene_item.gen-vid": []
       },
       "id": "scene",
       "mixers": 0,
@@ -503,11 +506,11 @@
             "locked": false,
             "name": "News",
             "pos": {
-              "x": 31,
-              "y": 595
+              "x": 21,
+              "y": 6
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -540,11 +543,11 @@
             "locked": false,
             "name": "URL",
             "pos": {
-              "x": 64,
-              "y": 594
+              "x": 123,
+              "y": 697
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -615,7 +618,7 @@
             "name": "{{ emacsconf_id }} base",
             "pos": {
               "x": 9,
-              "y": 205
+              "y": 6
             },
             "private_settings": {},
             "rot": 0,
@@ -734,11 +737,11 @@
       "hotkeys": {
         "OBSBasic.SelectScene": [],
         "libobs.hide_scene_item.Screen Capture (XSHM)": [],
-        "libobs.hide_scene_item.dev-vid": [],
         "libobs.hide_scene_item.emacsconf base": [],
+        "libobs.hide_scene_item.gen-vid": [],
         "libobs.show_scene_item.Screen Capture (XSHM)": [],
-        "libobs.show_scene_item.dev-vid": [],
-        "libobs.show_scene_item.emacsconf base": []
+        "libobs.show_scene_item.emacsconf base": [],
+        "libobs.show_scene_item.gen-vid": []
       },
       "id": "scene",
       "mixers": 0,
@@ -851,11 +854,11 @@
             "locked": false,
             "name": "News",
             "pos": {
-              "x": 31,
-              "y": 580
+              "x": 12,
+              "y": 0
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -888,11 +891,11 @@
             "locked": false,
             "name": "URL",
             "pos": {
-              "x": 64,
-              "y": 579
+              "x": 114,
+              "y": 691
             },
             "private_settings": {},
-            "rot": -90,
+            "rot": 0,
             "scale": {
               "x": 1,
               "y": 1
@@ -925,8 +928,8 @@
             "locked": false,
             "name": "Logo",
             "pos": {
-              "x": 9,
-              "y": 594
+              "x": 0,
+              "y": 603
             },
             "private_settings": {},
             "rot": 0,
@@ -962,8 +965,8 @@
             "locked": false,
             "name": "{{ emacsconf_id }} base",
             "pos": {
-              "x": 9,
-              "y": 190
+              "x": 0,
+              "y": 0
             },
             "private_settings": {},
             "rot": 0,