Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change: Try stopping extmidi player with SIGINT first. #11404

Merged
merged 1 commit into from Nov 27, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Oct 28, 2023

Motivation / Problem

On Linux with extmidi music playback, stopping playback or switching to the next track may leave stuck notes. This is because it's down to the external player to turn those notes off, and we kill the process with SIGTERM which can interrupt this.

Description

Instead, try sending SIGINT first, and if that fails fall back to SIGTERM then SIGKILL. This can give the player a chance to issue MIDI note-off commands.

This fixes at least pmidi leaving stuck notes on.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

src/music/extmidi.cpp Outdated Show resolved Hide resolved
This may give the player a chance to issue MIDI note-off commands.

The kill/waitpid cycle is also less aggressive, waiting 50ms each time.
@PeterN PeterN merged commit 4c6ccb5 into OpenTTD:master Nov 27, 2023
20 checks passed
@PeterN PeterN deleted the extmidi-sigint branch November 27, 2023 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants