Make stop_streams idempotent

[srec] / srec.py

diff --git a/srec.py b/srec.py
index 0828310be4dfc96b2b21cc912462ed5937b31331..c4d5d54a4106c4d826d2236035a2355397cd78e6 100644 (file)
--- a/srec.py
+++ b/srec.py
@@ -11,6 +11,7 @@ from datetime import datetime
 import os
 import subprocess
 import sys
 import os
 import subprocess
 import sys

+import time

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


@@ -42,6 +43,7 @@ class Stream:
 
 
 recording: Stream | None = None
 
 
 recording: Stream | None = None

+sharing: Stream | None = None

 
 
 def make_filename() -> str:
 
 
 def make_filename() -> str:


@@ -56,9 +58,18 @@ def make_filename() -> str:
 def video_source(stack: Gtk.Stack) -> list[str]:
     if stack.get_child_by_name('not_recording').get_first_child().get_active():
         return ['-f', 'x11grab', '-i', ':0.0+0,0']
 def video_source(stack: Gtk.Stack) -> list[str]:
     if stack.get_child_by_name('not_recording').get_first_child().get_active():
         return ['-f', 'x11grab', '-i', ':0.0+0,0']

+    if is_sharing_enabled(stack):
+        return ['-f', 'v4l2', '-i', '/dev/video9']

     return ['-f', 'v4l2', '-i', '/dev/video0']
 
 
     return ['-f', 'v4l2', '-i', '/dev/video0']
 
 

+def is_sharing_enabled(stack: Gtk.Stack) -> bool:
+    enabled = stack.get_child_by_name('not_recording').get_first_child(
+    ).get_next_sibling().get_next_sibling().get_active()
+    assert isinstance(enabled, bool)
+    return enabled
+
+

 def find_size_display(stack: Gtk.Stack) -> Gtk.Label:
     return stack.get_child_by_name(
         'recording').get_first_child().get_next_sibling()
 def find_size_display(stack: Gtk.Stack) -> Gtk.Label:
     return stack.get_child_by_name(
         'recording').get_first_child().get_next_sibling()


@@ -89,24 +100,45 @@ def begin_monitoring_file_size(size_display: Gtk.Label, filename: str) -> None:
     GLib.timeout_add_seconds(1, update_size_display)
 
 
     GLib.timeout_add_seconds(1, update_size_display)
 
 

-def on_start_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
-    global recording  # pylint: disable=global-statement
+def on_start_button(_: Gtk.Button, stack: Gtk.Stack) -> None:
+    global recording, sharing  # pylint: disable=global-statement

     assert recording is None
     assert recording is None

+    assert sharing is None

 
     filename = make_filename()
     begin_monitoring_file_size(find_size_display(stack), filename)
 
 
     filename = make_filename()
     begin_monitoring_file_size(find_size_display(stack), filename)
 

+    stack.set_visible_child_name("recording")
+
+    if is_sharing_enabled(stack):
+        out_opts = [
+            '-f', 'v4l2', '-framerate', '25', '-codec:v', 'rawvideo',
+            '-pix_fmt', 'yuv420p',
+        ]
+        sharing = Stream.start(
+            ['ffmpeg', '-i', '/dev/video0']
+            + out_opts + ['/dev/video8']
+            + out_opts + ['/dev/video9'])
+        time.sleep(3)  # Bad!!  We should not be sleeping in this thread!
+

     recording = Stream.start(
         ['ffmpeg', '-framerate', '25'] + video_source(stack) +
         ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])
     recording = Stream.start(
         ['ffmpeg', '-framerate', '25'] + video_source(stack) +
         ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])

-    stack.set_visible_child_name("recording")

 
 
 
 

-def on_stop_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
-    global recording  # pylint: disable=global-statement
+def stop_streams() -> None:
+    global recording, sharing  # pylint: disable=global-statement
+    if recording is not None:
+        recording.stop()
+        recording = None
+    if sharing is not None:
+        sharing.stop()
+        sharing = None
+
+
+def on_stop_button(_: Gtk.Button, stack: Gtk.Stack) -> None:

     assert recording is not None
     assert recording is not None

-    recording.stop()
-    recording = None
+    stop_streams()

     stack.set_visible_child_name("not_recording")
 
 
     stack.set_visible_child_name("not_recording")
 
 


@@ -142,12 +174,12 @@ def on_activate(app: Gtk.Application) -> None:
     nr_box.append(screen)
     nr_box.append(Gtk.CheckButton(label='Webcam', active=True, group=screen))
     nr_box.append(make_share_control())
     nr_box.append(screen)
     nr_box.append(Gtk.CheckButton(label='Webcam', active=True, group=screen))
     nr_box.append(make_share_control())

-    nr_box.append(make_button("Start Recording", on_start_recording, stack))
+    nr_box.append(make_button("Start Recording", on_start_button, stack))

     stack.add_named(nr_box, "not_recording")
 
     r_box = Gtk.Box()
     r_box.set_orientation(Gtk.Orientation.VERTICAL)
     stack.add_named(nr_box, "not_recording")
 
     r_box = Gtk.Box()
     r_box.set_orientation(Gtk.Orientation.VERTICAL)

-    r_box.append(make_button("Stop Recording", on_stop_recording, stack))
+    r_box.append(make_button("Stop Recording", on_stop_button, stack))

     r_box.append(Gtk.Label(use_markup=True, justify=Gtk.Justification.CENTER))
     stack.add_named(r_box, "recording")
 
     r_box.append(Gtk.Label(use_markup=True, justify=Gtk.Justification.CENTER))
     stack.add_named(r_box, "recording")