Skip to content

Unify and cleanup sound related code into single sndlib module#374

Merged
Lgt2x merged 7 commits intoDescentDevelopers:mainfrom
winterheart:sndlib
May 22, 2024
Merged

Unify and cleanup sound related code into single sndlib module#374
Lgt2x merged 7 commits intoDescentDevelopers:mainfrom
winterheart:sndlib

Conversation

@winterheart
Copy link
Collaborator

Pull Request Type

  • GitHub Workflow changes
  • Documentation or Wiki changes
  • Build and Dependency changes
  • Runtime changes
    • Render changes
    • Audio changes
    • Input changes
    • Network changes
    • Other changes

Description

Unify and cleanup sound related code into sndlib module. Update linux part to use SDL2 function calls instead of legacy SDL1.

Currently there two independent sound engines - sndlib and mvelib (played only on MVE cutscenes). This is major preparation before unify MVE sound related code to use single sndlib as sound back-end.

Related Issues

Related to #289

Screenshots (if applicable)

Checklist

  • I have tested my changes locally and verified that they work as intended.
  • I have documented any new or modified functionality.
  • I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
  • I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

@winterheart winterheart force-pushed the sndlib branch 2 times, most recently from 99d8755 to 749a783 Compare May 20, 2024 11:49
@JeodC JeodC requested review from bryanperris and jmarshall23 May 20, 2024 11:56
@JeodC
Copy link
Collaborator

JeodC commented May 20, 2024

Tested artifact in windows and sound works as expected both in movies and in levels.

@JeodC JeodC added the cleanup Code cleanup label May 20, 2024
Consolidate all sound related code into one module.
Properly include and reuse produced static lib in other components.
Moving common macros into ssl_lib.h
Split linux geometry class implementation into own file, rename directx geometry.cpp to ds3dgeometry.cpp
Minor fixes and enhancements.
Copy link
Member

@Lgt2x Lgt2x left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

@@ -24,4 +24,6 @@ set(CPPS
add_library(manage STATIC ${HEADERS} ${CPPS})
Copy link
Member

Choose a reason for hiding this comment

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

this lib is really badly named, maybe a good target to split up next

@Lgt2x Lgt2x merged commit 60cb3a0 into DescentDevelopers:main May 22, 2024
@winterheart winterheart deleted the sndlib branch May 27, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cleanup Code cleanup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants