X-Git-Url: http://git.scottworley.com/srec/blobdiff_plain/bde510f000f49fd4dd0265e201d1e765a2c44db6..b3399b18f91a2f2e12ac9858f8f8e008a60138cd:/srec.py diff --git a/srec.py b/srec.py index bacc1df..8207c91 100644 --- a/srec.py +++ b/srec.py @@ -8,6 +8,7 @@ from dataclasses import dataclass from datetime import datetime import os import subprocess +import sys from typing import Any, Callable import gi @@ -19,12 +20,21 @@ from gi.repository import GLib # nopep8 pylint: disable=wrong-import-position @dataclass -class Recording: - filename: str +class Stream: process: subprocess.Popen[bytes] + def stop(self) -> None: + stdin = self.process.stdin + assert stdin is not None + try: + stdin.write(b'q') + stdin.flush() + except BrokenPipeError: + print("Stream already stopped?", file=sys.stderr) + self.process.wait() + -recording: Recording | None = None +recording: Stream | None = None def make_filename() -> str: @@ -76,8 +86,7 @@ def on_start_recording(_: Gtk.Button, stack: Gtk.Stack) -> None: command = (['ffmpeg', '-framerate', '25'] + video_source(stack) + ['-f', 'pulse', '-ac', '2', '-i', 'default', filename]) # pylint: disable=consider-using-with - recording = Recording( - filename=filename, + recording = Stream( process=subprocess.Popen(command, stdin=subprocess.PIPE)) stack.set_visible_child_name("recording") @@ -85,11 +94,7 @@ def on_start_recording(_: Gtk.Button, stack: Gtk.Stack) -> None: def on_stop_recording(_: Gtk.Button, stack: Gtk.Stack) -> None: global recording # pylint: disable=global-statement assert recording is not None - stdin = recording.process.stdin - assert stdin is not None - stdin.write(b'q') - stdin.flush() - recording.process.wait() + recording.stop() recording = None stack.set_visible_child_name("not_recording") @@ -106,7 +111,7 @@ def make_button(label: str, action: Callable[[ def make_share_control() -> Gtk.CheckButton: - can_share = os.path.exists('/sys/module/v4l2looback') + can_share = os.path.exists('/sys/module/v4l2loopback') control = Gtk.CheckButton( label='Share Webcam', sensitive=can_share, active=can_share) control.set_margin_start(20)