Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

music: add music directory backend #81

Merged
merged 1 commit into from
May 1, 2024
Merged

music: add music directory backend #81

merged 1 commit into from
May 1, 2024

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented May 1, 2024

This adds support to play both CDAudio single MP3 as well as loading individual tracks directly from a music directory.

game/music/music_main.c is just what game/music.c used to be, with the CDAudio code extracted to a separate backend.

The benefit is that the support for CDAudio is now a lot more compatible with the TR1 way of music handling.

Related: LostArtefacts/libtrx#6

@rr- rr- requested review from a team, eikehein, lahm86 and walkawayy and removed request for a team May 1, 2024 08:46
@rr- rr- added the Internal The invisible stuff label May 1, 2024
@rr- rr- added this to the 0.2 milestone May 1, 2024
Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

Works perfectly.

I wonder though for the situation where a player has neither the audio nor music folders present, if we should just fail silently rather throwing an assertion error. OG allows for both to be missing, and TR1X also allows for a missing music folder.

This adds support to play both CDAudio single MP3 as well as loading
individual tracks directly from a music directory.
@rr-
Copy link
Collaborator Author

rr- commented May 1, 2024

Works perfectly.

I wonder though for the situation where a player has neither the audio nor music folders present, if we should just fail silently rather throwing an assertion error. OG allows for both to be missing, and TR1X also allows for a missing music folder.

Thanks – fixed this.

@rr- rr- requested a review from lahm86 May 1, 2024 10:43
@rr- rr- merged commit 475ca7c into develop May 1, 2024
2 checks passed
@rr- rr- deleted the music-directory branch May 1, 2024 11:35
@rr- rr- added the TR2 label Oct 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Internal The invisible stuff TR2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants