Stop streams on exit

[srec] / srec.py

diff --git a/srec.py b/srec.py
index 962c147045b95ecbf76a0bca5dfca2b66e4cf5be..b3abee1e9ba0fa558211d8b419b87f369ffd1630 100644 (file)
--- a/srec.py
+++ b/srec.py
@@ -100,7 +100,7 @@ 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:
+def on_start_button(_: Gtk.Button, stack: Gtk.Stack) -> None:

     global recording, sharing  # pylint: disable=global-statement
     assert recording is None
     assert sharing is None
     global recording, sharing  # pylint: disable=global-statement
     assert recording is None
     assert sharing is None


@@ -126,14 +126,19 @@ def on_start_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
         ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])
 
 
         ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])
 
 

-def on_stop_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
+def stop_streams() -> None:

     global recording, sharing  # pylint: disable=global-statement
     global recording, sharing  # pylint: disable=global-statement

-    assert recording is not None
-    recording.stop()
-    recording = None
+    if recording is not None:
+        recording.stop()
+        recording = None

     if sharing is not None:
         sharing.stop()
         sharing = 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
+    stop_streams()

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


@@ -169,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")
 


@@ -186,6 +191,7 @@ def main() -> None:
     app = Gtk.Application(application_id='net.chkno.srec')
     app.connect('activate', on_activate)
     app.run(None)
     app = Gtk.Application(application_id='net.chkno.srec')
     app.connect('activate', on_activate)
     app.run(None)

+    stop_streams()

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':