Rename: Recording → Stream

[srec] / srec.py

diff --git a/srec.py b/srec.py
index 01b5a8ca7ec1200aff08d41fe85e718f224f5341..8207c91352fa434fdc32c6ebf971bec236d4cafe 100644 (file)
--- a/srec.py
+++ b/srec.py
@@ -8,6 +8,7 @@ from dataclasses import dataclass
 from datetime import datetime
 import os
 import subprocess
 from datetime import datetime
 import os
 import subprocess

+import sys

 from typing import Any, Callable
 
 import gi
 from typing import Any, Callable
 
 import gi


@@ -19,12 +20,21 @@ from gi.repository import GLib  # nopep8 pylint: disable=wrong-import-position
 
 
 @dataclass
 
 
 @dataclass

-class Recording:
-    filename: str
+class Stream:

     process: subprocess.Popen[bytes]
 
     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:
 
 
 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
     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")
 
         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
 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")
 
     recording = None
     stack.set_visible_child_name("not_recording")