discstation 0.1.31 → 0.1.32

package/README.md

@@ -25,8 +25,8 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
   the remote starts an open `DiscStation-XXXX` access point; join it from a
   phone, the captive portal (or `http://192.168.4.1`) lists nearby networks
   — pick yours, enter the password, done. It reconnects on every boot after
-  that. Change networks later: **hold SELECT for 10 s** on the home screen
-  to wipe the credentials and reopen the portal.
+  that. Change networks later: **hold HOME/BACK for 10 s** on the home
+  screen to wipe the credentials and reopen the portal.
   Power users can instead `cp arduino/<board>/secrets.h.example secrets.h`
   and set `WIFI_SSID` / `WIFI_PASS` at build time (git-ignored).
 - **Host side:** nothing to configure. With no USB cable present the host
@@ -47,7 +47,7 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
 | **Burn Video DVD** | YouTube URL or local file → ffmpeg 2-pass → DVD-Video disc |
 | **Burn Data DVD** | Any files/folders → ISO/Joliet data disc (no quality loss) |
 | **Burn MPG** | Re-burn a previously converted movie.mpg |
-| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) |
+| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) — the OLED remote shows a live spectrum visualizer of the actual audio (Linux only for now; see `docs/PLATFORM_SUPPORT.md`) |
 | **Rip** | Audio CD → FLAC (MusicBrainz); DVD-Video → VIDEO_TS mirror or HandBrake MKV (TMDb naming) |
 
 ## Project Structure

package/arduino/DiscStation/DiscStation.ino

@@ -47,7 +47,7 @@
 #define VU_ENTRY_DELAY_MS  10000  // stay on the text status screen this long after entering PLAY
 #define VU_RESUME_DELAY_MS  7000  // ...and this long after any input while already in PLAY
 
-#define WIFI_RESET_HOLD_MS      10000  // hold SELECT this long on HOME to wipe Wi-Fi creds
+#define WIFI_RESET_HOLD_MS      10000  // hold HOME/BACK this long on HOME to wipe Wi-Fi creds
 #define WIFI_CONNECT_TIMEOUT_MS 18000  // give a stored-creds join this long before falling to the portal
 #define WIFI_RETRY_MS           15000  // if a live link drops, force a re-join after this
 
@@ -796,6 +796,8 @@ void parseMessage(String msg) {
     line2 = "Playing disc";
     playSeekMode = false;          // always start in volume mode
     vuSuppressUntil = millis() + VU_ENTRY_DELAY_MS;   // text screen first, bars after a beat
+    lastVuAt = 0;                  // fresh session - unknown yet whether the host even sends VU: at all
+    visualizerActive = false;
     Out.print("POT:");             // push the last-used volume so playback starts at it
     Out.println(playVolume);
     drawPlay();
@@ -1326,9 +1328,19 @@ void loop() {
   // PLAY is included because a static "PLAYING" screen is just as low-current
   // as HOME/STANDBY were - the power bank doesn't care what's on screen, only
   // that the draw stays static this long.
+  //
+  // In PLAY specifically, if this session has never received a single VU:
+  // (lastVuAt == 0 - the host/platform doesn't support the visualizer, e.g.
+  // macOS today), don't make the user wait out the full generic idle timer
+  // for an animation - drop into the spinning-disc screensaver as soon as
+  // the text-hold window (vuSuppressUntil) expires. Once any VU: does
+  // arrive this stops applying (lastVuAt is no longer 0) and PLAY behaves
+  // exactly as before, showing bars instead.
+  bool playSkippingToScreensaver = (uiState == UI_PLAY) && (lastVuAt == 0) &&
+      (long)(millis() - vuSuppressUntil) >= 0;
   if (displayOk && !displayBlank &&
       (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_PLAY) &&
-      (long)(millis() - lastInputTime) >= IDLE_BLANK_MS) {
+      ((long)(millis() - lastInputTime) >= IDLE_BLANK_MS || playSkippingToScreensaver)) {
     displayBlank = true;
     saverStep = 0;
     lastSaverFrame = 0;

package/docs/PLATFORM_SUPPORT.md

@@ -27,21 +27,49 @@ Set `DISC_DEVICE` if automatic drive detection fails. The one known limitation
 is **audio-CD *burning*** — `cdrdao` is the only option and often cannot claim
 the drive on recent macOS; DiscStation reports this clearly instead of hanging.
 
-### ESP32 remote: OLED spectrum visualizer
-
-The visualizer needs a one-time manual setup, since macOS has no built-in
-way to tap "whatever's currently playing" the way Linux's PulseAudio does:
-
-1. `brew install blackhole-2ch` (done automatically by `install-macos.sh`).
-2. Open **Audio MIDI Setup** (in Applications/Utilities), click **+** →
-   **Create Multi-Output Device**, and check both **BlackHole 2ch** and your
-   real output (speakers/headphones).
-3. In **System Settings → Sound**, set that Multi-Output Device as the
-   default output. Audio stays audible (routed to your real device) and is
-   simultaneously tapped (via BlackHole) for the visualizer's FFT.
-
-Without this setup the visualizer silently does nothing and PLAY just shows
-its normal text screen — nothing else is affected.
+### ESP32 remote: OLED spectrum visualizer — not currently working on macOS
+
+**Confirmed broken, not just a setup step.** The visualizer's macOS capture
+path (`ffmpeg -f avfoundation` reading the BlackHole loopback device) was
+built and the BlackHole/Multi-Output-Device routing was set up and verified
+correct on real hardware — but `ffmpeg`'s capture consistently returns
+silence (valid-looking output, zero errors, every sample exactly `0`) even
+with the native macOS Sound input level meter confirmed showing real,
+moving signal on BlackHole at the same moment. That combination — real
+signal present at the OS/driver level, silently zeroed once it reaches an
+app's capture buffer — is macOS's system-audio-capture privacy protection
+muting an untrusted capturer, not a permission checkbox that was missed:
+Microphone and Screen & System Audio Recording were both granted to
+`ffmpeg` with no change.
+
+The legitimate modern API for this (CoreAudio's Process Tap,
+`AudioHardwareCreateProcessTap`, macOS 14.2+) requires a properly
+code-signed app bundle requesting a specific entitlement, with its own
+dedicated system consent dialog — a bare ad-hoc-signed Homebrew CLI binary
+like `ffmpeg` structurally cannot satisfy that, regardless of which Privacy
+& Security toggles are flipped. Making the visualizer work on macOS would
+mean building a small signed helper app around that API — a real, separate
+project, not started.
+
+**Everything else works normally** — audio-CD/DVD/video playback, ripping,
+burning, and the web UI are all unaffected. PLAY just always shows the
+normal text status screen on macOS instead of ever switching to bars.
+
+If BlackHole is already installed from an earlier attempt at this, it's
+harmless to leave in place — it just won't do anything useful for
+DiscStation until/unless the above gets built.
+
+### Troubleshooting playback ("mpv not found" / play fails to start)
+
+- **`install-macos.sh` installs `mpv` via Homebrew** — if playback fails to
+  start, confirm it actually landed: `mpv --version` in Terminal. If that
+  fails, either the installer never ran to completion or was interrupted;
+  re-run `install-macos.sh` (or `discstation-setup`) rather than installing
+  `mpv` in isolation, since other steps may be incomplete too.
+- **Apple Music auto-opening on disc insert can hold the drive**, so
+  DiscStation's own `mpv` can fail or hang trying to claim it right after.
+  System Settings → **CDs & DVDs** (only shown with an optical drive
+  connected) → set "When you insert a music CD" to **Ignore**.
 
 ## Windows
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",

package/src/discstation.py

@@ -3448,7 +3448,29 @@ def start_vu_visualizer(ser):
     return stop_event, pause_event
 
 
-def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
+def _audio_cd_track_seek(delta, track_starts):
+    """Seek to the start of the next/previous track using the CD TOC's own
+    per-track offsets (already in seconds from track 1's start - see
+    audio_track_metadata) instead of mpv's own chapter list. Works whether
+    or not mpv has track chapters for this stream: macOS's piped
+    cd-paranoia audio has none, since mpv just sees one continuous stream,
+    not the disc itself - time-pos still works fine either way."""
+    if not track_starts:
+        mpv_command(["add", "chapter", delta])
+        return
+    track = mpv_query(["get_property", "chapter"])
+    if not isinstance(track, (int, float)):
+        position = mpv_query(["get_property", "time-pos"])
+        track = max((i for i, start in enumerate(track_starts) if start <= position), default=0) \
+            if isinstance(position, (int, float)) else 0
+    target = max(0, min(len(track_starts) - 1, int(track) + delta))
+    mpv_command(["seek", track_starts[target], "absolute"])
+
+
+def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None, stdin_proc=None):
+    """stdin_proc: an already-started subprocess whose stdout feeds mpv's
+    stdin (e.g. macOS's cd-paranoia-into-mpv audio CD pipe) - mpv reads `-`
+    as its input in cmd in that case. Stopped alongside mpv on cleanup."""
     try:
         os.unlink(MPV_SOCKET)
     except OSError:
@@ -3472,7 +3494,14 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
     # writes block, wedging the whole play loop. We drive mpv over the IPC
     # socket, so none of that output is wanted.
     proc = subprocess.Popen(run_as_desktop_user(cmd), env=env,
+                            stdin=(stdin_proc.stdout if stdin_proc else None),
                             stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    if stdin_proc:
+        # Close our own copy of the read end now that mpv's had it duped into
+        # its own stdin - otherwise we're also holding it open, so cd-paranoia
+        # never gets SIGPIPE (and just hangs writing into a full pipe buffer)
+        # if mpv exits first.
+        stdin_proc.stdout.close()
     vu_stop = None
 
     try:
@@ -3540,7 +3569,7 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
 
                 elif line == "FF:BIG":
                     if kind == "audio_cd":
-                        mpv_command(["add", "chapter", 1])
+                        _audio_cd_track_seek(1, track_starts)
                         send(ser, "PLAY_STATUS:Next track")
                     else:
                         mpv_command(["seek", 120])
@@ -3554,7 +3583,7 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
                     except ValueError:
                         continue
                     if kind == "audio_cd":
-                        mpv_command(["add", "chapter", 1])
+                        _audio_cd_track_seek(1, track_starts)
                         send(ser, "PLAY_STATUS:Next track")
                     else:
                         mpv_command(["seek", seek_sec])
@@ -3564,7 +3593,7 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
 
                 elif line == "REW:BIG":
                     if kind == "audio_cd":
-                        mpv_command(["add", "chapter", -1])
+                        _audio_cd_track_seek(-1, track_starts)
                         send(ser, "PLAY_STATUS:Prev track")
                     else:
                         mpv_command(["seek", -120])
@@ -3578,7 +3607,7 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
                     except ValueError:
                         continue
                     if kind == "audio_cd":
-                        mpv_command(["add", "chapter", -1])
+                        _audio_cd_track_seek(-1, track_starts)
                         send(ser, "PLAY_STATUS:Prev track")
                     else:
                         mpv_command(["seek", -seek_sec])
@@ -3604,6 +3633,8 @@ def _run_mpv(ser, cmd, label, kind=None, track_titles=None, track_starts=None):
             vu_stop.set()
         if proc.poll() is None:
             discstation_burn.stop_process(proc)
+        if stdin_proc and stdin_proc.poll() is None:
+            discstation_burn.stop_process(stdin_proc)
         try:
             os.unlink(MPV_SOCKET)
         except OSError:
@@ -3774,11 +3805,40 @@ def play_flow(ser):
 
     elif kind == "audio_cd":
         _, track_titles, track_starts = audio_track_metadata(device)
-        if discstation_host.system_name() == "windows":
+        system = discstation_host.system_name()
+        if system == "windows":
             # mpv on Windows has no libcdio - cdda:// is unavailable there
             # ("disabled at compile-time"). Windows Media Player's own COM
             # control plays it fine via Windows' native CD-audio support.
             _play_audio_cd_windows(ser, device, track_titles)
+        elif system == "darwin":
+            # Homebrew's mpv formula doesn't depend on libcdio either (no
+            # build option to add it) - confirmed live: `mpv cdda://` says
+            # "protocol ... disabled at compile-time" and --cdrom-device
+            # isn't even a recognized option. Same shape of gap as Windows,
+            # different fix: stream the disc via cd-paranoia (already used
+            # for ripping) into mpv's stdin instead of mpv opening the
+            # drive itself. mpv still does all actual playback + IPC
+            # control (pause/volume/stop), just fed a pipe instead of the
+            # disc directly.
+            paranoia = None
+            for name in ("cd-paranoia", "cdparanoia"):
+                try:
+                    paranoia = discstation_burn.tool(name)
+                    break
+                except FileNotFoundError:
+                    continue
+            if not paranoia:
+                raise RuntimeError("cd-paranoia not installed (brew install libcdio-paranoia)")
+            rip_proc = subprocess.Popen(
+                [paranoia, "-d", rip_device(device), "1-", "-"],
+                stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+            audio_device = discstation_host.audio_output_device()
+            cmd = [mpv, "--input-ipc-server=" + MPV_SOCKET, "--force-window=no", "--idle=no", "-"]
+            if audio_device:
+                cmd.insert(1, "--audio-device=" + audio_device)
+                print(f"Audio CD output: {audio_device}")
+            _run_mpv(ser, cmd, "Playing audio CD", kind, track_titles, track_starts, stdin_proc=rip_proc)
         else:
             audio_device = discstation_host.audio_output_device()
             cmd = [