[janvitos]

A follow-up to #1182, as suggested in its review: an Audio output row in the Insert menu (Gameplay) with Auto, Stereo and 5.1.

What

• Auto (the default) is Mix for 5.1 when the default output has 5.1 speakers #1182's behaviour: 5.1 when the default output device has 5.1 or more speakers, else stereo.
• Stereo or 5.1 chooses one whatever the device has. 5.1 on stereo speakers is mixed down, as before.
• Saved as audio_output= in hookshot_options.ini. host/nn_audio.c reads it from the file, the way nn_applet.c reads the Handheld profile, because the game asks for its speakers only once, at its start. The row says "(restart)", like Output resolution.
• HOS_AUDIO_CHANNELS=2 or 6 still wins over the menu.
• readme: the options table and a short note under it.

How it was tested

• Machine: Linux (CachyOS), RTX 4070 SUPER, default output stereo.

• In game: a game build with this host change, on the v2.0.8-rc.5 source plus Mix for 5.1 when the default output has 5.1 speakers #1182, with headless runs. In each run the log line and the dumped audio's channel count match:

  audio_output	HOS_AUDIO_CHANNELS	The game is told	Dump
  1	—	stereo (the Insert menu's Audio output)	2 ch
  2	—	5.1 (the Insert menu's Audio output)	6 ch
  0	—	stereo (the default output has 2 channels)	2 ch
  1	6	5.1 (HOS_AUDIO_CHANNELS)	6 ch

• Not tested: the menu row itself wasn't seen in game. This PC has no Vulkan toolchain, so the build used the release's prebuilt Vulkan back end.

• New test: tests/test_audio_output_menu.py compiles the real au_speakers and au_menu_output together with the menu's ini_key and tx_audio_output. It writes the row's choice under the key the menu would save, so a renamed row or key fails it. It covers Auto with a 2-, 6- and 8-channel device, Stereo, 5.1, hand-edited 3 and -1 (clamped as the menu reads them), and HOS_AUDIO_CHANNELS over the menu. It's registered in run_all.py with --cxx g++. I checked that it fails when the host ignores the menu, when the key is misspelled or when the row is renamed.

• Windows: host/nn_audio.c passes a syntax check with mingw-w64 and has the same warnings as main's.

• Suite: on this branch (on 09e4eb5), python -I -B tests/run_all.py gives 144 passed, 2 failed, 17 skipped on Linux. Both failures are the same on unchanged main here:

  • nx2/test_nup_read_name.py needs zstandard, which isn't installed here.
  • tests/test_output_resolution.py aborts on its first case.

🤖 Generated with Claude Code

[janvitos]

The two failing checks are tests/test_output_resolution.py, which also fails on main's own CI (fe611e4, Linux and Windows). tests/test_audio_output_menu.py passes on both, and both Vulkan back-end builds pass.

[janvitos]

Thanks. Rebased onto main (ac3bd44) as 4856258:

• The row now ends hn_audio_output, true, true}: a restart row, still preset-exempt, so a change shows "(after restart)", joins the Restart needed list, and closing the menu offers the restart.
• The values are plain Auto, Stereo, 5.1, with a hint line each (hn_audio_output via MENU_HINTS).
• menu_restart.h's comment now counts six restart rows (kMax is 8).
• The test checks the row's hint, restart and preset_exempt fields and the hints against main's Row.