summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--roles/edit/templates/emacsconf-edit.el1
-rw-r--r--roles/obs/tasks/main.yml14
-rw-r--r--roles/obs/tasks/obs-setup.yml4
-rw-r--r--roles/obs/tasks/track.yml11
-rw-r--r--roles/obs/tasks/user.yml1
-rw-r--r--roles/obs/templates/bashrc1
-rw-r--r--roles/obs/templates/emacsconf-stream-config.el2
-rwxr-xr-xroles/obs/templates/mpv-track24
-rw-r--r--roles/obs/templates/mpv.conf35
-rw-r--r--roles/obs/templates/scenes.json771
-rwxr-xr-xroles/obs/templates/start-background-music5
11 files changed, 477 insertions, 392 deletions
diff --git a/roles/edit/templates/emacsconf-edit.el b/roles/edit/templates/emacsconf-edit.el
index 6ca3efa..195170a 100644
--- a/roles/edit/templates/emacsconf-edit.el
+++ b/roles/edit/templates/emacsconf-edit.el
@@ -86,3 +86,4 @@
(find-file "{{ emacsconf_private_dir }}/conf.org")
(emacsconf-add-org-after-todo-state-change-hook)
(unless noninteractive (emacsconf-erc-connect))
+(setq tab-width 2)
diff --git a/roles/obs/tasks/main.yml b/roles/obs/tasks/main.yml
index 5974142..806e9f2 100644
--- a/roles/obs/tasks/main.yml
+++ b/roles/obs/tasks/main.yml
@@ -57,6 +57,7 @@
regexp: '(AllowUsers(?!.*\b{{ emacsconf_id }}-{{ item.id }}\b).*)$'
replace: \1 {{ emacsconf_id }}-{{ item.id }}
loop: "{{ emacsconf_tracks }}"
+
- name: Set emacsconf_user timezone
lineinfile:
line: export TZ={{ emacsconf_timezone }}
@@ -77,3 +78,16 @@
path: "{{ emacsconf_asset_dir }}"
state: directory
mode: 0775
+- name: Set up scripts
+ tags: wip
+ template:
+ src: "{{ item }}"
+ dest: /usr/local/bin
+ mode: 0755
+ loop:
+ - overlay
+ - music
+ - play
+ - play-with-intro
+ - intro
+ - bbb
diff --git a/roles/obs/tasks/obs-setup.yml b/roles/obs/tasks/obs-setup.yml
index a64d4bd..b2f8b07 100644
--- a/roles/obs/tasks/obs-setup.yml
+++ b/roles/obs/tasks/obs-setup.yml
@@ -32,7 +32,7 @@
group: "{{ emacsconf_group }}"
dest: "~{{ emacsconf_user }}/.config/obs-studio/basic/scenes/{{ emacsconf_id }}.json"
- name: Copy overlay template for video
- tags: obs-scene, wip
+ tags: obs-scene
copy:
src: overlay.svg
dest: "~{{ emacsconf_user }}/video.svg"
@@ -40,7 +40,7 @@
group: "{{ emacsconf_group }}"
mode: 0664
- name: Copy overlay template for video
- tags: obs-scene, wip
+ tags: obs-scene
copy:
src: overlay.svg
dest: "~{{ emacsconf_user }}/other.svg"
diff --git a/roles/obs/tasks/track.yml b/roles/obs/tasks/track.yml
index 8b138ae..3993848 100644
--- a/roles/obs/tasks/track.yml
+++ b/roles/obs/tasks/track.yml
@@ -27,7 +27,7 @@
group: "{{ emacsconf_group }}"
state: directory
- name: Add MPV profile
- tags: mpv-conf, wip
+ tags: mpv-conf
template:
src: mpv.conf
dest: "~{{ emacsconf_user }}/.config/mpv/mpv.conf"
@@ -100,14 +100,7 @@
src: "/data/{{ emacsconf_id }}/assets/stream"
dest: "~{{ emacsconf_user }}/stream"
state: link
- - name: Create background music script
- tags: wip
- template:
- src: start-background-music
- dest: "~{{ emacsconf_user }}/bin/start-background-music"
- owner: "{{ emacsconf_user }}"
- group: "{{ emacsconf_group }}"
- mode: 0775
+
- name: Reset vars
tags: obs-scene, obs-profile, mpv, wip, mumble
set_fact:
diff --git a/roles/obs/tasks/user.yml b/roles/obs/tasks/user.yml
index 00e68a8..187edb2 100644
--- a/roles/obs/tasks/user.yml
+++ b/roles/obs/tasks/user.yml
@@ -30,6 +30,7 @@
state: directory
owner: "{{ emacsconf_user }}"
- name: Set up bashrc
+ tags: wip
template:
src: bashrc
dest: "/home/{{ emacsconf_user }}/.bashrc"
diff --git a/roles/obs/templates/bashrc b/roles/obs/templates/bashrc
index 3fef0df..16a07f0 100644
--- a/roles/obs/templates/bashrc
+++ b/roles/obs/templates/bashrc
@@ -112,7 +112,6 @@ if ! shopt -oq posix; then
fi
fi
-alias play=track-mpv
alias qa-louder="pactl set-sink-volume qa +5% "
alias qa-quieter="pactl set-sink-volume qa -5% "
alias qa-vol="pactl set-sink-volume qa "
diff --git a/roles/obs/templates/emacsconf-stream-config.el b/roles/obs/templates/emacsconf-stream-config.el
index 3901c41..bd5ffd7 100644
--- a/roles/obs/templates/emacsconf-stream-config.el
+++ b/roles/obs/templates/emacsconf-stream-config.el
@@ -15,3 +15,5 @@
(add-to-list 'load-path "~/emacsconf-el")
(require 'emacsconf)
(require 'emacsconf-stream)
+(emacsconf-stream-display-clock-and-countdown)
+(setq tab-width 2)
diff --git a/roles/obs/templates/mpv-track b/roles/obs/templates/mpv-track
index bb87677..87849e1 100755
--- a/roles/obs/templates/mpv-track
+++ b/roles/obs/templates/mpv-track
@@ -16,26 +16,6 @@ if [[ ! -f $FILE ]]; then
fi
shift
SLUG=$(echo "$FILE" | perl -ne 'if (/^emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-other.png ]]; then
- echo "Found other overlay for $SLUG, copying"
- cp /data/emacsconf/assets/overlays/$SLUG-other.png ~/other.png
-else
- echo "Could not find /data/emacsconf/assets/overlays/$SLUG-other.png, please override ~/other.png manually"
- cp /data/emacsconf/assets/overlays/blank-other.png ~/other.png
-fi
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-video.png ]]; then
- echo "Found video overlay for $SLUG, copying"
- cp /data/emacsconf/assets/overlays/$SLUG-video.png ~/video.png
-else
- echo "Could not find /data/emacsconf/assets/overlays/$SLUG-video.png, override ~/video.png manually"
- cp /data/emacsconf/assets/overlays/blank-video.png ~/video.png
-fi
-if [[ "x$BY_SLUG" == "x1" ]] && [[ -f /data/emacsconf/assets/intros/$SLUG.webm ]]; then
- INTRO=/data/emacsconf/assets/intros/$SLUG.webm
- echo "Found intro $INTRO"
-else
- echo "Could not find /data/emacsconf/assets/intros/$SLUG.webm"
-fi
-
+overlay $SLUG
# Play the video
-DISPLAY="${DISPLAY:-:{{ item.vnc_id }}}" mpv --input-ipc-server={{ emacsconf_home }}/mpv-socket-{{ emacsconf_id }}-{{ item.id }} --audio-device=pulse/vid --profile={{ emacsconf_id }}-talks $FILE $* &
+mpv $FILE $* &
diff --git a/roles/obs/templates/mpv.conf b/roles/obs/templates/mpv.conf
index a30136d..f529ff3 100644
--- a/roles/obs/templates/mpv.conf
+++ b/roles/obs/templates/mpv.conf
@@ -1,17 +1,13 @@
# {{ ansible_managed }}
# Requires mpv >= 0.34.0
-
-input-ipc-server={{ emacsconf_home }}/mpv-socket-{{ emacsconf_id }}-{{ item.id }}
+input-ipc-server=~/mpv-socket
audio-device=pulse/vid
-# Comment out the next line if you don't want this profile loaded by default.
-profile={{ emacsconf_id }}-talks
-# Then you can load it with `--profile={{ emacsconf_id }}-talks`
+osc=no
+profile=captions
-# This puts the video in the top right so that there's room on the left for the logo and some text
-[{{ emacsconf_id }}-talks]
+[captions]
# Positioning
video-zoom=-0.15
-video-align-x=1
video-align-y=-1
sub-use-margins=yes
sub-scale-by-window=yes
@@ -32,24 +28,5 @@ sub-shadow-offset=1.2
sub-ass-force-style=Kerning=yes
sub-ass-line-spacing=0
-[{{ emacsconf_id }}-old]
-# Positioning
-video-zoom=-0.15
-video-pan-y=-0.055
-sub-use-margins=yes
-sub-scale-by-window=yes
-sub-pos=103
-sub-margin-x=150
-sub-margin-y=40
-# Style
-sub-font="{{ emacsconf_font }}"
-sub-color="1/0.82/0"
-sub-blur=0.2
-sub-scale=0.9
-sub-font-size=40
-sub-border-size=0
-sub-border-color=0/1
-sub-shadow-color=0/1
-sub-shadow-offset=1.2
-sub-ass-force-style=Kerning=yes
-sub-ass-line-spacing=0
+[full]
+video-zoom=0
diff --git a/roles/obs/templates/scenes.json b/roles/obs/templates/scenes.json
index 69e058f..1bc26cc 100644
--- a/roles/obs/templates/scenes.json
+++ b/roles/obs/templates/scenes.json
@@ -1,6 +1,6 @@
{
- "current_program_scene": "Emergency",
- "current_scene": "Emergency",
+ "current_program_scene": "Z - Rebroadcasting",
+ "current_scene": "Z - Rebroadcasting",
"current_transition": "Fade",
"groups": [],
"modules": {
@@ -11,12 +11,24 @@
"switch_if_not_matching": false,
"switches": [
{
- "scene": "Video audio and screen",
- "window_title": ".*mpv"
- },
- {
"scene": "All track audio and screen",
"window_title": ".*Mozilla Firefox"
+ },
+ {
+ "scene": "Z - Rebroadcasting",
+ "window_title": "(dev|gen).webm - mpv"
+ },
+ {
+ "scene": "Z - Rebroadcasting",
+ "window_title": ".*dev.webm.*"
+ },
+ {
+ "scene": "Z - Rebroadcasting",
+ "window_title": ".*gen.webm.*"
+ },
+ {
+ "scene": "Video audio and screen",
+ "window_title": ".*mpv"
}
]
},
@@ -75,6 +87,9 @@
},
{
"name": "Emergency"
+ },
+ {
+ "name": "Z - Rebroadcasting"
}
],
"sources": [
@@ -84,49 +99,18 @@
"deinterlace_mode": 0,
"enabled": true,
"flags": 0,
- "hotkeys": {},
- "id": "text_ft2_source",
- "mixers": 0,
- "monitoring_type": 0,
- "muted": false,
- "name": "Thank you for your patience",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "font": {
- "face": "Sans Serif",
- "flags": 0,
- "size": 28,
- "style": ""
- },
- "text": "Thank you for your patience"
- },
- "sync": 0,
- "versioned_id": "text_ft2_source_v2",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
"hotkeys": {
"OBSBasic.SelectScene": [],
"libobs.hide_scene_item.Screen Capture (XSHM)": [],
- "libobs.hide_scene_item.mumble": [],
+ "libobs.hide_scene_item.vid": [],
"libobs.show_scene_item.Screen Capture (XSHM)": [],
- "libobs.show_scene_item.mumble": []
+ "libobs.show_scene_item.vid": []
},
"id": "scene",
"mixers": 0,
"monitoring_type": 0,
"muted": false,
- "name": "Only mumble and screen",
+ "name": "Z - Rebroadcasting",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
@@ -135,7 +119,7 @@
"push-to-talk-delay": 0,
"settings": {
"custom_size": false,
- "id_counter": 2,
+ "id_counter": 3,
"items": [
{
"align": 5,
@@ -157,7 +141,7 @@
},
"id": 1,
"locked": false,
- "name": "mumble",
+ "name": "vid",
"pos": {
"x": 0,
"y": 0
@@ -192,7 +176,7 @@
"hide_transition": {
"duration": 0
},
- "id": 2,
+ "id": 3,
"locked": false,
"name": "Screen Capture (XSHM)",
"pos": {
@@ -224,193 +208,25 @@
"enabled": true,
"flags": 0,
"hotkeys": {
- "libobs.mute": [],
- "libobs.push-to-mute": [],
- "libobs.push-to-talk": [],
- "libobs.unmute": []
- },
- "id": "pulse_output_capture",
- "mixers": 255,
- "monitoring_type": 0,
- "muted": false,
- "name": "mumble",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "device_id": "mumble.monitor"
- },
- "sync": 0,
- "versioned_id": "pulse_output_capture",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
- "hotkeys": {},
- "id": "text_ft2_source",
- "mixers": 0,
- "monitoring_type": 0,
- "muted": false,
- "name": "News",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "font": {
- "face": "Sans Serif",
- "flags": 0,
- "size": 24,
- "style": ""
- },
- "from_file": true,
- "outline": true,
- "text_file": "/home/{{ emacsconf_id }}-gen/news.txt"
- },
- "sync": 0,
- "versioned_id": "text_ft2_source_v2",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
- "hotkeys": {},
- "id": "image_source",
- "mixers": 0,
- "monitoring_type": 0,
- "muted": false,
- "name": "Other overlay",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "file": "/home/{{ emacsconf_id }}-gen/other.png"
- },
- "sync": 0,
- "versioned_id": "image_source",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
- "hotkeys": {},
- "id": "image_source",
- "mixers": 0,
- "monitoring_type": 0,
- "muted": false,
- "name": "Video",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "file": "/home/{{ emacsconf_id }}-gen/video.png"
- },
- "sync": 0,
- "versioned_id": "image_source",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
- "hotkeys": {},
- "id": "image_source",
- "mixers": 0,
- "monitoring_type": 0,
- "muted": false,
- "name": "Video overlay",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "file": "/home/{{ emacsconf_id }}-gen/video.png"
- },
- "sync": 0,
- "versioned_id": "image_source",
- "volume": 1
- },
- {
- "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": "pulse_output_capture",
- "mixers": 255,
- "monitoring_type": 0,
- "muted": false,
- "name": "qa",
- "prev_ver": 469762051,
- "private_settings": {},
- "push-to-mute": false,
- "push-to-mute-delay": 0,
- "push-to-talk": false,
- "push-to-talk-delay": 0,
- "settings": {
- "device_id": "qa.monitor"
- },
- "sync": 0,
- "versioned_id": "pulse_output_capture",
- "volume": 1
- },
- {
- "balance": 0.5,
- "deinterlace_field_order": 0,
- "deinterlace_mode": 0,
- "enabled": true,
- "flags": 0,
- "hotkeys": {
- "OBSBasic.SelectScene": [],
+ "OBSBasic.SelectScene": [
+ {
+ "alt": true,
+ "key": "OBS_KEY_M",
+ "shift": true
+ }
+ ],
"libobs.hide_scene_item.News": [],
- "libobs.hide_scene_item.Other overlay": [],
- "libobs.hide_scene_item.Screen Capture (XSHM)": [],
+ "libobs.hide_scene_item.Thank you for your patience": [],
"libobs.hide_scene_item.mumble": [],
- "libobs.hide_scene_item.qa": [],
- "libobs.hide_scene_item.vid": [],
"libobs.show_scene_item.News": [],
- "libobs.show_scene_item.Other overlay": [],
- "libobs.show_scene_item.Screen Capture (XSHM)": [],
- "libobs.show_scene_item.mumble": [],
- "libobs.show_scene_item.qa": [],
- "libobs.show_scene_item.vid": []
+ "libobs.show_scene_item.Thank you for your patience": [],
+ "libobs.show_scene_item.mumble": []
},
"id": "scene",
"mixers": 0,
"monitoring_type": 0,
"muted": false,
- "name": "All track audio and screen",
+ "name": "Emergency",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
@@ -419,7 +235,7 @@
"push-to-talk-delay": 0,
"settings": {
"custom_size": false,
- "id_counter": 26,
+ "id_counter": 3,
"items": [
{
"align": 5,
@@ -441,16 +257,53 @@
},
"id": 1,
"locked": false,
- "name": "Screen Capture (XSHM)",
+ "name": "mumble",
"pos": {
- "x": 115,
+ "x": 0,
"y": 0
},
"private_settings": {},
"rot": 0,
"scale": {
- "x": 0.91015625,
- "y": 0.9097222089767456
+ "x": 1,
+ "y": 1
+ },
+ "scale_filter": "disable",
+ "show_transition": {
+ "duration": 0
+ },
+ "visible": true
+ },
+ {
+ "align": 5,
+ "blend_method": "default",
+ "blend_type": "normal",
+ "bounds": {
+ "x": 539,
+ "y": 191
+ },
+ "bounds_align": 0,
+ "bounds_type": 2,
+ "crop_bottom": 0,
+ "crop_left": 0,
+ "crop_right": 0,
+ "crop_top": 0,
+ "group_item_backup": false,
+ "hide_transition": {
+ "duration": 0
+ },
+ "id": 2,
+ "locked": false,
+ "name": "News",
+ "pos": {
+ "x": 383,
+ "y": 274
+ },
+ "private_settings": {},
+ "rot": 0,
+ "scale": {
+ "x": 1,
+ "y": 1
},
"scale_filter": "disable",
"show_transition": {
@@ -476,9 +329,9 @@
"hide_transition": {
"duration": 0
},
- "id": 12,
+ "id": 3,
"locked": false,
- "name": "qa",
+ "name": "Thank you for your patience",
"pos": {
"x": 0,
"y": 0
@@ -494,7 +347,47 @@
"duration": 0
},
"visible": true
- },
+ }
+ ]
+ },
+ "sync": 0,
+ "versioned_id": "scene",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {
+ "OBSBasic.SelectScene": [],
+ "libobs.hide_scene_item.News": [],
+ "libobs.hide_scene_item.Screen Capture (XSHM)": [],
+ "libobs.hide_scene_item.Video": [],
+ "libobs.hide_scene_item.Video overlay": [],
+ "libobs.hide_scene_item.vid": [],
+ "libobs.show_scene_item.News": [],
+ "libobs.show_scene_item.Screen Capture (XSHM)": [],
+ "libobs.show_scene_item.Video": [],
+ "libobs.show_scene_item.Video overlay": [],
+ "libobs.show_scene_item.vid": []
+ },
+ "id": "scene",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "Video audio and screen",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "custom_size": false,
+ "id_counter": 14,
+ "items": [
{
"align": 5,
"blend_method": "default",
@@ -513,7 +406,7 @@
"hide_transition": {
"duration": 0
},
- "id": 14,
+ "id": 1,
"locked": false,
"name": "vid",
"pos": {
@@ -550,9 +443,9 @@
"hide_transition": {
"duration": 0
},
- "id": 23,
+ "id": 5,
"locked": false,
- "name": "Other overlay",
+ "name": "Screen Capture (XSHM)",
"pos": {
"x": 0,
"y": 0
@@ -587,9 +480,46 @@
"hide_transition": {
"duration": 0
},
- "id": 24,
+ "id": 12,
"locked": false,
- "name": "News",
+ "name": "Video overlay",
+ "pos": {
+ "x": 0,
+ "y": 0
+ },
+ "private_settings": {},
+ "rot": 0,
+ "scale": {
+ "x": 1,
+ "y": 1
+ },
+ "scale_filter": "disable",
+ "show_transition": {
+ "duration": 0
+ },
+ "visible": false
+ },
+ {
+ "align": 5,
+ "blend_method": "default",
+ "blend_type": "normal",
+ "bounds": {
+ "x": 0,
+ "y": 0
+ },
+ "bounds_align": 0,
+ "bounds_type": 0,
+ "crop_bottom": 0,
+ "crop_left": 0,
+ "crop_right": 0,
+ "crop_top": 0,
+ "group_item_backup": false,
+ "hide_transition": {
+ "duration": 0
+ },
+ "id": 13,
+ "locked": false,
+ "name": "Video",
"pos": {
"x": 0,
"y": 0
@@ -624,9 +554,9 @@
"hide_transition": {
"duration": 0
},
- "id": 25,
+ "id": 14,
"locked": false,
- "name": "mumble",
+ "name": "News",
"pos": {
"x": 0,
"y": 0
@@ -655,21 +585,28 @@
"deinterlace_mode": 0,
"enabled": true,
"flags": 0,
- "hotkeys": {},
- "id": "xshm_input",
- "mixers": 0,
+ "hotkeys": {
+ "libobs.mute": [],
+ "libobs.push-to-mute": [],
+ "libobs.push-to-talk": [],
+ "libobs.unmute": []
+ },
+ "id": "pulse_output_capture",
+ "mixers": 255,
"monitoring_type": 0,
"muted": false,
- "name": "Screen Capture (XSHM)",
+ "name": "vid",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
"push-to-mute-delay": 0,
"push-to-talk": false,
"push-to-talk-delay": 0,
- "settings": {},
+ "settings": {
+ "device_id": "vid.monitor"
+ },
"sync": 0,
- "versioned_id": "xshm_input",
+ "versioned_id": "pulse_output_capture",
"volume": 1
},
{
@@ -678,28 +615,21 @@
"deinterlace_mode": 0,
"enabled": true,
"flags": 0,
- "hotkeys": {
- "libobs.mute": [],
- "libobs.push-to-mute": [],
- "libobs.push-to-talk": [],
- "libobs.unmute": []
- },
- "id": "pulse_output_capture",
- "mixers": 255,
+ "hotkeys": {},
+ "id": "xshm_input",
+ "mixers": 0,
"monitoring_type": 0,
"muted": false,
- "name": "vid",
+ "name": "Screen Capture (XSHM)",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
"push-to-mute-delay": 0,
"push-to-talk": false,
"push-to-talk-delay": 0,
- "settings": {
- "device_id": "vid.monitor"
- },
+ "settings": {},
"sync": 0,
- "versioned_id": "pulse_output_capture",
+ "versioned_id": "xshm_input",
"volume": 1
},
{
@@ -711,21 +641,23 @@
"hotkeys": {
"OBSBasic.SelectScene": [],
"libobs.hide_scene_item.News": [],
+ "libobs.hide_scene_item.Other overlay": [],
"libobs.hide_scene_item.Screen Capture (XSHM)": [],
- "libobs.hide_scene_item.Video": [],
- "libobs.hide_scene_item.Video overlay": [],
+ "libobs.hide_scene_item.mumble": [],
+ "libobs.hide_scene_item.qa": [],
"libobs.hide_scene_item.vid": [],
"libobs.show_scene_item.News": [],
+ "libobs.show_scene_item.Other overlay": [],
"libobs.show_scene_item.Screen Capture (XSHM)": [],
- "libobs.show_scene_item.Video": [],
- "libobs.show_scene_item.Video overlay": [],
+ "libobs.show_scene_item.mumble": [],
+ "libobs.show_scene_item.qa": [],
"libobs.show_scene_item.vid": []
},
"id": "scene",
"mixers": 0,
"monitoring_type": 0,
"muted": false,
- "name": "Video audio and screen",
+ "name": "All track audio and screen",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
@@ -734,7 +666,7 @@
"push-to-talk-delay": 0,
"settings": {
"custom_size": false,
- "id_counter": 14,
+ "id_counter": 26,
"items": [
{
"align": 5,
@@ -756,7 +688,44 @@
},
"id": 1,
"locked": false,
- "name": "vid",
+ "name": "Screen Capture (XSHM)",
+ "pos": {
+ "x": 115,
+ "y": 0
+ },
+ "private_settings": {},
+ "rot": 0,
+ "scale": {
+ "x": 0.91015625,
+ "y": 0.9097222089767456
+ },
+ "scale_filter": "disable",
+ "show_transition": {
+ "duration": 0
+ },
+ "visible": true
+ },
+ {
+ "align": 5,
+ "blend_method": "default",
+ "blend_type": "normal",
+ "bounds": {
+ "x": 0,
+ "y": 0
+ },
+ "bounds_align": 0,
+ "bounds_type": 0,
+ "crop_bottom": 0,
+ "crop_left": 0,
+ "crop_right": 0,
+ "crop_top": 0,
+ "group_item_backup": false,
+ "hide_transition": {
+ "duration": 0
+ },
+ "id": 12,
+ "locked": false,
+ "name": "qa",
"pos": {
"x": 0,
"y": 0
@@ -791,9 +760,9 @@
"hide_transition": {
"duration": 0
},
- "id": 5,
+ "id": 14,
"locked": false,
- "name": "Screen Capture (XSHM)",
+ "name": "vid",
"pos": {
"x": 0,
"y": 0
@@ -828,9 +797,9 @@
"hide_transition": {
"duration": 0
},
- "id": 12,
+ "id": 23,
"locked": false,
- "name": "Video overlay",
+ "name": "Other overlay",
"pos": {
"x": 0,
"y": 0
@@ -845,7 +814,7 @@
"show_transition": {
"duration": 0
},
- "visible": false
+ "visible": true
},
{
"align": 5,
@@ -865,9 +834,9 @@
"hide_transition": {
"duration": 0
},
- "id": 13,
+ "id": 24,
"locked": false,
- "name": "Video",
+ "name": "News",
"pos": {
"x": 0,
"y": 0
@@ -902,9 +871,9 @@
"hide_transition": {
"duration": 0
},
- "id": 14,
+ "id": 25,
"locked": false,
- "name": "News",
+ "name": "mumble",
"pos": {
"x": 0,
"y": 0
@@ -934,25 +903,185 @@
"enabled": true,
"flags": 0,
"hotkeys": {
- "OBSBasic.SelectScene": [
- {
- "alt": true,
- "key": "OBS_KEY_M",
- "shift": true
- }
- ],
- "libobs.hide_scene_item.News": [],
- "libobs.hide_scene_item.Thank you for your patience": [],
+ "libobs.mute": [],
+ "libobs.push-to-mute": [],
+ "libobs.push-to-talk": [],
+ "libobs.unmute": []
+ },
+ "id": "pulse_output_capture",
+ "mixers": 255,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "qa",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "device_id": "qa.monitor"
+ },
+ "sync": 0,
+ "versioned_id": "pulse_output_capture",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {},
+ "id": "image_source",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "Video overlay",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "file": "/home/{{ emacsconf_id }}-gen/video.png"
+ },
+ "sync": 0,
+ "versioned_id": "image_source",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {},
+ "id": "image_source",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "Video",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "file": "/home/{{ emacsconf_id }}-gen/video.png"
+ },
+ "sync": 0,
+ "versioned_id": "image_source",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {},
+ "id": "image_source",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "Other overlay",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "file": "/home/{{ emacsconf_id }}-gen/other.png"
+ },
+ "sync": 0,
+ "versioned_id": "image_source",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {},
+ "id": "text_ft2_source",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "News",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "font": {
+ "face": "Sans Serif",
+ "flags": 0,
+ "size": 24,
+ "style": ""
+ },
+ "from_file": true,
+ "outline": true,
+ "text_file": "/home/{{ emacsconf_id }}-gen/news.txt"
+ },
+ "sync": 0,
+ "versioned_id": "text_ft2_source_v2",
+ "volume": 1
+ },
+ {
+ "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": "pulse_output_capture",
+ "mixers": 255,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "mumble",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "device_id": "mumble.monitor"
+ },
+ "sync": 0,
+ "versioned_id": "pulse_output_capture",
+ "volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {
+ "OBSBasic.SelectScene": [],
+ "libobs.hide_scene_item.Screen Capture (XSHM)": [],
"libobs.hide_scene_item.mumble": [],
- "libobs.show_scene_item.News": [],
- "libobs.show_scene_item.Thank you for your patience": [],
+ "libobs.show_scene_item.Screen Capture (XSHM)": [],
"libobs.show_scene_item.mumble": []
},
"id": "scene",
"mixers": 0,
"monitoring_type": 0,
"muted": false,
- "name": "Emergency",
+ "name": "Only mumble and screen",
"prev_ver": 469762051,
"private_settings": {},
"push-to-mute": false,
@@ -961,7 +1090,7 @@
"push-to-talk-delay": 0,
"settings": {
"custom_size": false,
- "id_counter": 3,
+ "id_counter": 2,
"items": [
{
"align": 5,
@@ -1005,43 +1134,6 @@
"blend_method": "default",
"blend_type": "normal",
"bounds": {
- "x": 539,
- "y": 191
- },
- "bounds_align": 0,
- "bounds_type": 2,
- "crop_bottom": 0,
- "crop_left": 0,
- "crop_right": 0,
- "crop_top": 0,
- "group_item_backup": false,
- "hide_transition": {
- "duration": 0
- },
- "id": 2,
- "locked": false,
- "name": "News",
- "pos": {
- "x": 383,
- "y": 274
- },
- "private_settings": {},
- "rot": 0,
- "scale": {
- "x": 1,
- "y": 1
- },
- "scale_filter": "disable",
- "show_transition": {
- "duration": 0
- },
- "visible": true
- },
- {
- "align": 5,
- "blend_method": "default",
- "blend_type": "normal",
- "bounds": {
"x": 0,
"y": 0
},
@@ -1055,9 +1147,9 @@
"hide_transition": {
"duration": 0
},
- "id": 3,
+ "id": 2,
"locked": false,
- "name": "Thank you for your patience",
+ "name": "Screen Capture (XSHM)",
"pos": {
"x": 0,
"y": 0
@@ -1079,6 +1171,37 @@
"sync": 0,
"versioned_id": "scene",
"volume": 1
+ },
+ {
+ "balance": 0.5,
+ "deinterlace_field_order": 0,
+ "deinterlace_mode": 0,
+ "enabled": true,
+ "flags": 0,
+ "hotkeys": {},
+ "id": "text_ft2_source",
+ "mixers": 0,
+ "monitoring_type": 0,
+ "muted": false,
+ "name": "Thank you for your patience",
+ "prev_ver": 469762051,
+ "private_settings": {},
+ "push-to-mute": false,
+ "push-to-mute-delay": 0,
+ "push-to-talk": false,
+ "push-to-talk-delay": 0,
+ "settings": {
+ "font": {
+ "face": "Sans Serif",
+ "flags": 0,
+ "size": 28,
+ "style": ""
+ },
+ "text": "Thank you for your patience"
+ },
+ "sync": 0,
+ "versioned_id": "text_ft2_source_v2",
+ "volume": 1
}
],
"transition_duration": 300,
diff --git a/roles/obs/templates/start-background-music b/roles/obs/templates/start-background-music
deleted file mode 100755
index af28208..0000000
--- a/roles/obs/templates/start-background-music
+++ /dev/null
@@ -1,5 +0,0 @@
-if screen -list | grep -q background; then
- echo "Already running in screen, attach with screen -x background"
-else
- screen -S background /bin/bash -c "mpv ~/stream/background.wav --loop=yes"
-fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:52:09 +0000