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

[RDY] Support more audio formats for background music #1364

Merged
merged 3 commits into from Aug 16, 2018

Conversation

tobylane
Copy link
Member

@tobylane tobylane commented Mar 8, 2018

This plays major file types from this sdl2_mixer page, others could be added. I'm not sure on the names waveform and instructional.

The support that the second commit talks about is broad, for me it's brew install libvorbis; brew reinstall sdl2_mixer --with-mpg123 --with-flac --with-libmikmod --with-fluid-synth. The equivalent could be done for the deps repo.

Fixes #540 and #821.

-- (MIDI) audio, then follow these steps:
-- 1) Find MP3 versions of the original tracks (for example the remixes by ZR
-- If you want to listen to non-Theme-Hospital music, then follow these steps:
-- 1) Find updated versions of the original tracks (for example the remixes by ZR
-- from http://www.a-base.dds.nl/temp/ThemeHospital_ZRRemix.zip ) or any
-- other music you want to listen to.
-- 2) Ensure that SMPEG.dll (or equivalent for your platform) is present.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SMPEG.dll is not used on any platform anymore, and different libraries are needed for different sound formats. This comment should be generalized.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually remove that line completely. This is for end users, and we will ship with all relevant libraries.

-- High quality (MP3 rather than MIDI) audio replacements.
-- If you want to listen to high quality MP3 audio rather than the original XMI
-- (MIDI) audio, then follow these steps:
-- If you want to listen to non-Theme-Hospital music, then follow these steps:
-- 1) Find MP3 versions of the original tracks (for example the remixes by ZR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MP3 comment here needs to be generalized for more music formats

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the comment about SMPEG here; this is meant for end users, and we will ship with every relevant library.

@tobylane
Copy link
Member Author

tobylane commented Mar 8, 2018

The third comment removes a persistable function. I haven't done this before, is there something extra in removing them, or is that only for functions in a savegame?

@TheCycoONE
Copy link
Member

Normally you can't remove persistable functions, but that one is outside of any possible save, so I'm not sure why it was marked that way in the first place.

If your save games load, it should be good.

@TheCycoONE
Copy link
Member

What's the state of this @tobylane

@tobylane
Copy link
Member Author

tobylane commented Aug 3, 2018

I've removed the other commit and rebased. Ready now.

@tobylane tobylane changed the title [RFC] Support more audio formats for background music [RDY] Support more audio formats for background music Aug 3, 2018
@TheCycoONE
Copy link
Member

Tested 👍

@TheCycoONE TheCycoONE merged commit 96a9a0b into CorsixTH:master Aug 16, 2018
@tobylane tobylane deleted the mp3 branch June 24, 2019 16:04
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