Merge pull request #32 from ruscher/main

v4.4.1: phone camera notifications, audio reliability, crash fixes

Author: ruscher

README.md

@@ -2,7 +2,7 @@
   <img src="usr/share/biglinux/bigcam/icons/bigcam.svg" alt="BigCam" width="128" height="128">
 </p>
 
-<h1 align="center">BigCam 4.4.0</h1>
+<h1 align="center">BigCam 4.4.1</h1>
 
 <p align="center">
   <b>The universal webcam control center for Linux — use any camera, including your smartphone, as a professional webcam. No expensive apps needed.</b>
@@ -21,7 +21,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/Version-4.4.0-brightgreen.svg" alt="Version 4.4.0">
+  <img src="https://img.shields.io/badge/Version-4.4.1-brightgreen.svg" alt="Version 4.4.1">
   <img src="https://img.shields.io/badge/License-GPLv3-blue.svg" alt="License: GPL v3">
   <img src="https://img.shields.io/badge/Platform-Linux-green.svg" alt="Platform: Linux">
   <img src="https://img.shields.io/badge/GTK-4.0-blue.svg" alt="GTK 4.0">
@@ -72,7 +72,7 @@
 - **Smile Capture removed**: Removed mediapipe-dependent smile detection feature entirely (code, README, translations).
 - **i18n verified**: All UI strings confirmed English and translation-ready across 29 languages.
 
-**Version 4.4.0** (current) is the **reliability and gallery UX overhaul**:
+**Version 4.4.1** (current) is the **phone camera & audio reliability update**:
 
 - **Redesigned Photo & Video galleries**: Grid/List view toggle, file metadata display (size, date, duration), selection mode with "Select All" and bulk delete with confirmation dialog, individual item delete with trash icon overlay. List view uses `AdwActionRow` with thumbnail prefix and formatted metadata subtitle.
 - **AirPlay stability fix**: When UxPlay dies unexpectedly (signal loss, crash), the disconnect handler now performs full cleanup — releases v4l2loopback device, resets UI, and emits the disconnect signal to the window. Previously, only the status label changed, leaving the stream engine locked and causing cascading failures on reconnect.
@@ -87,9 +87,31 @@ We are grateful to Rafael and Barnabé for starting this journey.
 
 ---
 
-## What's New in 4.4.0
+## What's New in 4.4.1
 
-### Photo & Video Galleries
+### Phone Camera Notifications
+
+- **Toast notification on connect**: AirPlay, scrcpy, and browser phone cameras now show a notification toast with a **"Show"** button instead of switching immediately. The current camera preview continues until the user chooses to switch.
+
+### Audio Reliability
+
+- **PipeWire stream-restore override**: BigCam now resets both mute and volume on its sink-inputs after pipeline start, overriding stale states saved by PipeWire's `module-stream-restore`.
+- **External source mute isolation**: Unmuting internal pipelines no longer inadvertently unmutes external sources (e.g. AirPlay audio) that the user intentionally deactivated via checkbox.
+- **Checkbox rebuild guard**: Audio source UI rebuilds (triggered by device changes) no longer fire spurious toggle signals.
+
+### Crash Fixes
+
+- **SIGSEGV on v4l2loopback**: Phone cameras (scrcpy/AirPlay) now use GStreamer instead of OpenCV direct capture for v4l2loopback devices, eliminating mmap-related SIGBUS/SIGSEGV crashes.
+- **SIGBUS on dialog close**: Phone camera dialog handlers now guard all widget access with a `_closed` flag, preventing access to destroyed GTK widgets after dialog dismissal.
+
+### Hotplug & Camera Persistence
+
+- **Phone cameras preserved across hotplug**: scrcpy and AirPlay cameras (using V4L2 backend) are no longer dropped from the camera list during hotplug detection scans.
+- **Resource cleanup on phone connect**: Background virtual cameras and hotplug monitoring are paused when a phone connects, freeing CPU and USB bandwidth.
+
+### Previous (4.4.0)
+
+#### Photo & Video Galleries
 
 - **Grid/List toggle**: Switch between thumbnail grid and detailed list view with a single click. View preference persists per-tab.
 - **List view metadata**: Each item shows a small thumbnail prefix, filename as title, and a formatted subtitle with file size, creation date, and duration (videos only).

default.nix

@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "bigcam";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = ./.;
 

usr/share/biglinux/bigcam/constants.py

@@ -5,7 +5,7 @@
 
 APP_ID = "br.com.biglinux.bigcam"
 APP_NAME = "BigCam"
-APP_VERSION = "4.4.0"
+APP_VERSION = "4.4.1"
 APP_ICON = "bigcam"
 APP_WEBSITE = "https://github.com/biglinux/bigcam"
 APP_ISSUE_URL = "https://github.com/biglinux/bigcam/issues"

usr/share/biglinux/bigcam/core/audio_monitor.py

@@ -520,12 +520,66 @@ def _start_source(self, source: str) -> None:
         if vol_elem:
             self._volume_elements[source] = vol_elem
 
+        # Override PipeWire's stream-restore mute state
+        if not self._muted:
+            GLib.timeout_add(300, self._ensure_sink_inputs_unmuted)
+
     def _stop_source(self, source: str) -> None:
         pipeline = self._pipelines.pop(source, None)
         self._volume_elements.pop(source, None)
         if pipeline:
             pipeline.set_state(Gst.State.NULL)
 
+    def _ensure_sink_inputs_unmuted(self) -> bool:
+        """Override PipeWire's module-stream-restore mute for BigCam sinks."""
+        try:
+            result = subprocess.run(
+                ["pactl", "list", "sink-inputs"],
+                capture_output=True, text=True, timeout=3,
+            )
+            if result.returncode != 0:
+                return GLib.SOURCE_REMOVE
+            cur_idx: int | None = None
+            is_bigcam = False
+            for line in result.stdout.splitlines():
+                stripped = line.strip()
+                if stripped.startswith("Sink Input #"):
+                    if is_bigcam and cur_idx is not None:
+                        subprocess.run(
+                            ["pactl", "set-sink-input-mute", str(cur_idx), "0"],
+                            capture_output=True, timeout=3,
+                        )
+                        subprocess.run(
+                            ["pactl", "set-sink-input-volume", str(cur_idx), "100%"],
+                            capture_output=True, timeout=3,
+                        )
+                    try:
+                        cur_idx = int(stripped.split("#", 1)[1])
+                    except ValueError:
+                        cur_idx = None
+                    is_bigcam = False
+                elif 'application.name = "BigCam"' in stripped:
+                    is_bigcam = True
+            # Handle last entry
+            if is_bigcam and cur_idx is not None:
+                subprocess.run(
+                    ["pactl", "set-sink-input-mute", str(cur_idx), "0"],
+                    capture_output=True, timeout=3,
+                )
+                subprocess.run(
+                    ["pactl", "set-sink-input-volume", str(cur_idx), "100%"],
+                    capture_output=True, timeout=3,
+                )
+        except (FileNotFoundError, subprocess.TimeoutExpired):
+            pass
+
+        # Re-mute external sources that the user intentionally deactivated
+        for name, info in self._external.items():
+            if not info.get("active", True):
+                self._pactl_mute_external(name, True)
+
+        return GLib.SOURCE_REMOVE
+
     def _on_bus_eos(
         self, _bus: Gst.Bus, _msg: Gst.Message, source: str
     ) -> None:

usr/share/biglinux/bigcam/core/camera_manager.py

@@ -129,7 +129,10 @@ def _worker() -> None:
     def _on_detection_done(self, cameras: list[CameraInfo]) -> bool:
         # Preserve manually-added cameras (IP, phone) across hotplug scans
         manual_backends = {BackendType.IP, BackendType.PHONE}
-        manual_cameras = [c for c in self._cameras if c.backend in manual_backends]
+        manual_cameras = [
+            c for c in self._cameras
+            if c.backend in manual_backends or c.id.startswith("phone:")
+        ]
         seen_ids = {c.id for c in cameras}
         for mc in manual_cameras:
             if mc.id not in seen_ids:

usr/share/biglinux/bigcam/core/stream_engine.py

@@ -731,7 +731,9 @@ def _build_paintable_pipeline(self, gst_source: str, target_fps: int = 0) -> boo
         (bypasses GStreamer's internal queue/timing, like guvcview).
         """
         # Radical anti-flicker: use appsink (like guvcview) instead of paintable sink
-        if self._prefer_v4l2 and "v4l2src" in gst_source:
+        # Skip for phone cameras — v4l2loopback + OpenCV mmap causes SIGBUS/SIGSEGV
+        is_phone = self._current_camera and self._current_camera.id.startswith("phone:")
+        if self._prefer_v4l2 and "v4l2src" in gst_source and not is_phone:
             if self._build_direct_pipeline(gst_source, target_fps):
                 return True
 
@@ -865,14 +867,18 @@ def _build_direct_pipeline(self, gst_source: str, target_fps: int = 0) -> bool:
             return False
 
         # Configure format to match what BigCam normally uses
-        cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter.fourcc('M', 'J', 'P', 'G'))
+        # For phone cameras (v4l2loopback), skip MJPG — the writer sets the
+        # raw format (YUY2/NV12) and forcing MJPG can cause SIGBUS/SIGSEGV.
+        is_phone = camera.id.startswith("phone:")
+        if not is_phone:
+            cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter.fourcc('M', 'J', 'P', 'G'))
         fmt = self._current_fmt
         if fmt:
             cap.set(cv2.CAP_PROP_FRAME_WIDTH, fmt.width)
             cap.set(cv2.CAP_PROP_FRAME_HEIGHT, fmt.height)
             if fmt.fps:
                 cap.set(cv2.CAP_PROP_FPS, max(fmt.fps))
-        else:
+        elif not is_phone:
             cap.set(cv2.CAP_PROP_FRAME_WIDTH, 1280)
             cap.set(cv2.CAP_PROP_FRAME_HEIGHT, 720)
             cap.set(cv2.CAP_PROP_FPS, 30)

usr/share/biglinux/bigcam/ui/phone_camera_dialog.py

@@ -71,6 +71,8 @@ def __init__(
         self._active_mode: str | None = None
         # Track which tab started scrcpy (USB or Wi-Fi)
         self._scrcpy_tab: str | None = None
+        # Guard against widget access after dialog destroyed
+        self._closed: bool = False
 
         self._build_ui()
         self._connect_backend_signals()
@@ -1627,38 +1629,42 @@ def _on_scrcpy_stop(self, _btn: Gtk.Button) -> None:
     def _on_scrcpy_connected(
         self, _scrcpy: ScrcpyCamera, w: int, h: int
     ) -> None:
-        self._set_dot_color(0.2, 0.78, 0.35)
-        if self._scrcpy_tab == _TAB_USB:
-            self._set_status(_("Connected via USB"))
-        else:
-            self._set_status(_("Connected via Wi-Fi"))
-        self._set_resolution(w, h)
+        if not self._closed:
+            self._set_dot_color(0.2, 0.78, 0.35)
+            if self._scrcpy_tab == _TAB_USB:
+                self._set_status(_("Connected via USB"))
+            else:
+                self._set_status(_("Connected via Wi-Fi"))
+            self._set_resolution(w, h)
         self.emit("scrcpy-connected", w, h)
 
     def _on_scrcpy_disconnected(self, _scrcpy: ScrcpyCamera) -> None:
-        self._set_dot_color(0.85, 0.2, 0.2)
-        self._set_status(_("Disconnected"))
-        self._set_resolution(0, 0)
-        # Reset only the tab that started scrcpy
-        if self._scrcpy_tab == _TAB_USB:
-            self._usb_start_btn.set_visible(True)
-            self._usb_stop_btn.set_visible(False)
-        elif self._scrcpy_tab == _TAB_WIFI_ADV:
-            self._scrcpy_start_btn.set_visible(True)
-            self._scrcpy_stop_btn.set_visible(False)
-        else:
-            # Unknown source — reset both
-            self._scrcpy_start_btn.set_visible(True)
-            self._scrcpy_stop_btn.set_visible(False)
-            self._usb_start_btn.set_visible(True)
-            self._usb_stop_btn.set_visible(False)
-        self._scrcpy_tab = None
-        self._set_mode_lock(None)
+        if not self._closed:
+            self._set_dot_color(0.85, 0.2, 0.2)
+            self._set_status(_("Disconnected"))
+            self._set_resolution(0, 0)
+            # Reset only the tab that started scrcpy
+            if self._scrcpy_tab == _TAB_USB:
+                self._usb_start_btn.set_visible(True)
+                self._usb_stop_btn.set_visible(False)
+            elif self._scrcpy_tab == _TAB_WIFI_ADV:
+                self._scrcpy_start_btn.set_visible(True)
+                self._scrcpy_stop_btn.set_visible(False)
+            else:
+                # Unknown source — reset both
+                self._scrcpy_start_btn.set_visible(True)
+                self._scrcpy_stop_btn.set_visible(False)
+                self._usb_start_btn.set_visible(True)
+                self._usb_stop_btn.set_visible(False)
+            self._scrcpy_tab = None
+            self._set_mode_lock(None)
         self.emit("scrcpy-disconnected")
 
     def _on_scrcpy_status_changed(
         self, _scrcpy: ScrcpyCamera, status: str
     ) -> None:
+        if self._closed:
+            return
         if status == "starting":
             self._set_dot_color(1.0, 0.76, 0.03)
             self._set_status(_("Starting…"))
@@ -1752,9 +1758,10 @@ def _on_airplay_stop(self, _btn: Gtk.Button) -> None:
     def _on_airplay_connected(
         self, _receiver: AirPlayReceiver, w: int, h: int
     ) -> None:
-        self._set_dot_color(0.2, 0.78, 0.35)
-        self._set_status(_("AirPlay connected"))
-        self._set_resolution(w, h)
+        if not self._closed:
+            self._set_dot_color(0.2, 0.78, 0.35)
+            self._set_status(_("AirPlay connected"))
+            self._set_resolution(w, h)
         self.emit("airplay-connected", w, h)
 
     def _on_airplay_disconnected(
@@ -1763,39 +1770,48 @@ def _on_airplay_disconnected(
         if not self._airplay.running:
             # UxPlay process died — full cleanup
             VirtualCamera.release_device("phone:airplay")
-            self._airplay_start_btn.set_visible(True)
-            self._airplay_stop_btn.set_visible(False)
-            self._set_dot_color(0.6, 0.6, 0.6)
-            self._set_status(_("AirPlay stopped unexpectedly"))
-            self._set_resolution(0, 0)
-            self._set_mode_lock(None)
+            if not self._closed:
+                self._airplay_start_btn.set_visible(True)
+                self._airplay_stop_btn.set_visible(False)
+                self._set_dot_color(0.6, 0.6, 0.6)
+                self._set_status(_("AirPlay stopped unexpectedly"))
+                self._set_resolution(0, 0)
+                self._set_mode_lock(None)
             self.emit("airplay-disconnected")
         else:
             # Client disconnected but UxPlay still running (can reconnect)
-            self._set_dot_color(1.0, 0.76, 0.03)
-            self._set_status(_("Waiting for AirPlay connection…"))
-            self._set_resolution(0, 0)
+            if not self._closed:
+                self._set_dot_color(1.0, 0.76, 0.03)
+                self._set_status(_("Waiting for AirPlay connection…"))
+                self._set_resolution(0, 0)
+            # Tell window to restore previous camera while waiting
+            self.emit("airplay-disconnected")
 
     def _on_airplay_status_changed(
         self, _receiver: AirPlayReceiver, status: str
     ) -> None:
-        self._set_status(status)
+        if not self._closed:
+            self._set_status(status)
 
     # ══════════════════════════════════════════════════════════════════
     #  DIALOG LIFECYCLE
     # ══════════════════════════════════════════════════════════════════
 
     def _on_dialog_closed(self, _dialog: Adw.Dialog) -> None:
+        self._closed = True
         if self._usb_poll_id:
             GLib.source_remove(self._usb_poll_id)
             self._usb_poll_id = 0
         for sid in self._server_sig_ids:
             self._server.disconnect(sid)
         self._server_sig_ids.clear()
-        for sid in self._scrcpy_sig_ids:
-            self._scrcpy.disconnect(sid)
-        self._scrcpy_sig_ids.clear()
-        if self._airplay:
+        # Only disconnect scrcpy signals if scrcpy is NOT running
+        if not self._scrcpy.running:
+            for sid in self._scrcpy_sig_ids:
+                self._scrcpy.disconnect(sid)
+            self._scrcpy_sig_ids.clear()
+        # Only disconnect airplay signals if airplay is NOT running
+        if self._airplay and not self._airplay.running:
             for sid in self._airplay_sig_ids:
                 self._airplay.disconnect(sid)
             self._airplay_sig_ids.clear()

usr/share/biglinux/bigcam/ui/preview_area.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-
 import gi
 
 gi.require_version("Gtk", "4.0")
@@ -334,6 +333,8 @@ def set_audio_monitor(self, monitor: AudioMonitor | None) -> None:
             self._audio_box.set_visible(False)
 
     def _on_sources_changed(self, mon: AudioMonitor) -> None:
+        # Block toggle handler during UI rebuild
+        self._audio_rebuilding = True
         # Clear old checkboxes
         while True:
             child = self._audio_checks_box.get_first_child()
@@ -354,6 +355,7 @@ def _on_sources_changed(self, mon: AudioMonitor) -> None:
         sources = mon.sources
         if not sources:
             self._audio_box.set_visible(False)
+            self._audio_rebuilding = False
             return
 
         for idx, (src_name, label) in enumerate(sources, start=1):
@@ -424,6 +426,7 @@ def _on_sources_changed(self, mon: AudioMonitor) -> None:
             self._audio_box.add_controller(self._audio_hover_ctrl)
 
         self._audio_box.set_visible(True)
+        self._audio_rebuilding = False
 
     def _on_audio_hover_enter(self, *_args) -> None:
         """Show volume sliders when mouse enters the audio overlay."""
@@ -437,7 +440,7 @@ def _on_audio_hover_leave(self, *_args) -> None:
     def _on_audio_check_toggled(
         self, check: Gtk.CheckButton, source_name: str
     ) -> None:
-        if not self._audio_monitor:
+        if not self._audio_monitor or getattr(self, '_audio_rebuilding', False):
             return
         is_active = self._audio_monitor.is_active(source_name)
         want_active = check.get_active()