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

Separate ffmpeg/mpv and audiomixer conditionals #15872

Merged

Conversation

zoltanvb
Copy link
Contributor

@zoltanvb zoltanvb commented Nov 5, 2023

Description

There are cases when mixer exists without ffmpeg. In such cases, some music content can still be added to the mixer for playback. Logic added to separate the two cases.

Now it behaves as follows:

  • music file extensions supported by either the mixer or the media player will appear in content list if "use builtin mediaplayer" is enabled
  • "Add to mixer" / "Add to mixer and play" entries will be present if there is audiomixer and the respective format support is compiled in
  • "Play in Media Player" (renamed from "Run") will be present if the media player supports the file. (Note: it needed an extra check because tracker modules like s3m are not supported by ffmpeg, and for wav, FFMPEG support for wav files is broken #3388 is still open so it will be horrible,)

There are a few minor improvements that could still be done: if there is any core that supports the particular music file type (such as ep128emu and wav support), "Run" will not be shown, unless "use builtin mediaplayer" is turned off, and "add to mixer and play" does not turn on mixer, although that would be convenient.

Related Issues

Closes #8451

There are cases when mixer exists without ffmpeg. In such cases,
some music content can still be added to the mixer for playback.
Logic added to separate the two cases.
@LibretroAdmin LibretroAdmin merged commit e35afdb into libretro:master Nov 5, 2023
22 checks passed
@zoltanvb zoltanvb deleted the audio_mixer_ffmpeg_untangle branch November 11, 2023 09:44
Sunderland93 pushed a commit to Sunderland93/RetroArch that referenced this pull request Dec 26, 2024
There are cases when mixer exists without ffmpeg. In such cases,
some music content can still be added to the mixer for playback.
Logic added to separate the two cases.
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.

[Android] Audio Mixer/Media Player not working
2 participants