diff options
| -rwxr-xr-x | example-scripts/control-server/generate-cut-list.py | 1 | ||||
| -rwxr-xr-x | example-scripts/ffmpeg/source-background-loop.sh | 2 | ||||
| -rwxr-xr-x | example-scripts/ffmpeg/source-nostream-pause-loop.sh | 2 | ||||
| -rwxr-xr-x | example-scripts/gstreamer/source-background-loop.py | 1 | ||||
| -rw-r--r-- | voctogui/README.md | 7 | ||||
| -rw-r--r-- | voctogui/lib/toolbar/misc.py | 8 |
6 files changed, 17 insertions, 4 deletions
diff --git a/example-scripts/control-server/generate-cut-list.py b/example-scripts/control-server/generate-cut-list.py index 23a0b33..959ab58 100755 --- a/example-scripts/control-server/generate-cut-list.py +++ b/example-scripts/control-server/generate-cut-list.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import socket import datetime import sys diff --git a/example-scripts/ffmpeg/source-background-loop.sh b/example-scripts/ffmpeg/source-background-loop.sh index 3613862..d88164d 100755 --- a/example-scripts/ffmpeg/source-background-loop.sh +++ b/example-scripts/ffmpeg/source-background-loop.sh @@ -2,7 +2,7 @@ . `dirname "$0"`/../config.sh wget -nc -O /tmp/bg.ts http://c3voc.mazdermind.de/testfiles/bg.ts while true; do cat /tmp/bg.ts || exit 1; done |\ - ffmpeg -re -i - \ + ffmpeg -y -nostdin -re -i - \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] " \ diff --git a/example-scripts/ffmpeg/source-nostream-pause-loop.sh b/example-scripts/ffmpeg/source-nostream-pause-loop.sh index 69ac366..d65ffb7 100755 --- a/example-scripts/ffmpeg/source-nostream-pause-loop.sh +++ b/example-scripts/ffmpeg/source-nostream-pause-loop.sh @@ -2,7 +2,7 @@ . `dirname "$0"`/../config.sh wget -nc -O /tmp/pause.ts http://c3voc.mazdermind.de/testfiles/pause.ts while true; do cat /tmp/pause.ts || exit 1; done |\ - ffmpeg -re -i - \ + ffmpeg -y -nostdin -re -i - \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] " \ diff --git a/example-scripts/gstreamer/source-background-loop.py b/example-scripts/gstreamer/source-background-loop.py index 8b65088..79ffbad 100755 --- a/example-scripts/gstreamer/source-background-loop.py +++ b/example-scripts/gstreamer/source-background-loop.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import sys, gi, signal gi.require_version('Gst', '1.0') diff --git a/voctogui/README.md b/voctogui/README.md index 7283da0..156a086 100644 --- a/voctogui/README.md +++ b/voctogui/README.md @@ -6,8 +6,8 @@ ### Composition Modes - `F1` Fullscreen - `F2` Picture in Picture -- `F1` Side-by-Side Equal -- `F1` Side-by-Side Preview +- `F3` Side-by-Side Equal +- `F4` Side-by-Side Preview ### Select A-Source - `1` Source Nr. 1 @@ -19,5 +19,8 @@ - `Ctrl+2` Source Nr. 2 - … +### Other options +- `t` Cut + ### Select an Audio-Source Click twice on the Selection Combobox, the select your Source within 5 Seconds (It will auto-lock again after 5 Seconds) diff --git a/voctogui/lib/toolbar/misc.py b/voctogui/lib/toolbar/misc.py index 32dd96c..9528b67 100644 --- a/voctogui/lib/toolbar/misc.py +++ b/voctogui/lib/toolbar/misc.py @@ -4,12 +4,17 @@ from gi.repository import Gtk from lib.config import Config import lib.connection as Connection + class MiscToolbarController(object): """ Manages Accelerators and Clicks Misc buttons """ def __init__(self, drawing_area, win, uibuilder): self.log = logging.getLogger('MiscToolbarController') + # Accelerators + accelerators = Gtk.AccelGroup() + win.add_accel_group(accelerators) + closebtn = uibuilder.find_widget_recursive(drawing_area, 'close') closebtn.set_visible( Config.getboolean('misc', 'close') ) closebtn.connect('clicked', self.on_closebtn_clicked) @@ -18,6 +23,9 @@ class MiscToolbarController(object): cutbtn.set_visible( Config.getboolean('misc', 'cut') ) cutbtn.connect('clicked', self.on_cutbtn_clicked) + key, mod = Gtk.accelerator_parse('t') + cutbtn.add_accelerator('clicked', accelerators, key, mod, Gtk.AccelFlags.VISIBLE) + def on_closebtn_clicked(self, btn): self.log.info('close-button clicked') Gtk.main_quit() |