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

Enable back support for OpenAL #831

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f501bfa
Enable sound only on OpenAL
damiencarol Mar 4, 2024
57c6a26
Remove usless debug
damiencarol Mar 4, 2024
9f2e1c2
Refactor again some definitions to be more common between OpenAL and …
damiencarol Mar 4, 2024
bf405df
Fix setGlobalVolume and setAudioDevice generic function
damiencarol Mar 4, 2024
10f1d2e
Fix a wrong pragma
damiencarol Mar 5, 2024
e39685f
Add helper for OpenAL
damiencarol Mar 5, 2024
fe746bc
Revert bck modifications for gitignore
damiencarol Mar 5, 2024
93ae0c8
Revert a useless change
damiencarol Mar 5, 2024
9d69e09
Fix USE_FMOD/FMOD_ENABLED pragmas
damiencarol Mar 5, 2024
a7f9122
Reverst useless changes
damiencarol Mar 6, 2024
e76c52b
Revert useless changes
damiencarol Mar 6, 2024
03a56a2
Add missing implementation
damiencarol Mar 6, 2024
792f13c
Remove useless check
damiencarol Mar 6, 2024
2731f9f
Implement notification sound
damiencarol Mar 6, 2024
6f0a979
Add comments
damiencarol Mar 6, 2024
f7e74ca
Unblock more musics
damiencarol Mar 8, 2024
5681450
Fix silly required include
damiencarol Mar 8, 2024
ba6e5bc
Add more musics
damiencarol Mar 9, 2024
c934ed6
Fix compilation error when no sound
damiencarol Mar 9, 2024
90e2f4c
more fixes
damiencarol Mar 9, 2024
6f582c3
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Mar 11, 2024
fe6ebc4
Add missing musics
damiencarol Mar 12, 2024
9aaa8ac
Fix null pointer exception
damiencarol Mar 12, 2024
4bcc86f
More refactoring
damiencarol Mar 13, 2024
2aa9511
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Mar 14, 2024
73fc3ce
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Mar 18, 2024
3ab4dfe
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Mar 21, 2024
1ee51e3
Complete release of sound/musics
damiencarol Mar 21, 2024
aa33e40
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Apr 3, 2024
feb4ef9
Merge branch 'TurningWheel:master' into openal_refresh
damiencarol Nov 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/engine/audio/defines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

Uint32 numsounds = 0;

bool levelmusicplaying = false; // seems to be common to all sound libraries

#ifdef USE_FMOD
FMOD::System* fmod_system = nullptr;

Expand Down Expand Up @@ -55,7 +57,6 @@ FMOD::Sound* hamletmusic = nullptr;
FMOD::Sound* tutorialmusic = nullptr;
FMOD::Sound* gameovermusic = nullptr;
FMOD::Sound* introstorymusic = nullptr;
bool levelmusicplaying = false;

FMOD::Channel* music_channel = nullptr;
FMOD::Channel* music_channel2 = nullptr;
Expand All @@ -78,4 +79,29 @@ bool sfxUseDynamicAmbientVolume = true;
bool sfxUseDynamicEnvironmentVolume = true;

void* fmod_extraDriverData = nullptr;
#endif //USE_FMOD

#elif defined USE_OPENAL


OPENAL_BUFFER* introductionmusic = nullptr;

OPENAL_BUFFER** intromusic = nullptr;
OPENAL_BUFFER** minesmusic = nullptr;
OPENAL_BUFFER** swampmusic = nullptr;
OPENAL_BUFFER** labyrinthmusic = nullptr;
OPENAL_BUFFER** ruinsmusic = nullptr;
OPENAL_BUFFER** underworldmusic = nullptr;
OPENAL_BUFFER** hellmusic = nullptr;

OPENAL_SOUND* music_channel = nullptr;
OPENAL_SOUND* music_channel2 = nullptr;
OPENAL_SOUND* music_resume = nullptr;

OPENAL_CHANNELGROUP *sound_group = nullptr;
OPENAL_CHANNELGROUP *soundAmbient_group = nullptr;
OPENAL_CHANNELGROUP *soundEnvironment_group = nullptr;
OPENAL_CHANNELGROUP *soundNotification_group = nullptr;
OPENAL_CHANNELGROUP *music_group = nullptr;
OPENAL_CHANNELGROUP *music_notification_group = nullptr;

#endif
Loading
Loading