Commit graph

83 commits

Author SHA1 Message Date
Paweł Kołodziejski
06902574b4
GRIM: Janitorial 2022-06-08 01:12:00 +02:00
Paweł Kołodziejski
20cb0ae228
ALL: Cleanup ResidualVM -> ScummVM 2021-12-26 21:19:38 +01:00
Eugene Sandulenko
abea37c9bb
ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Max Horn
445fe63524 GRIM: fix global constructor warnings
Since now `_musicTable` always points to a an array allocated
via `new[]`, we can also simplify the `EMISound` destructor.
2021-08-07 10:46:14 +02:00
Max Horn
b7e6d61669 JANITORIAL: Fix compiler warnings about unused code 2021-08-07 10:46:14 +02:00
Eugene Sandulenko
a312ddce78 GRIM: Fix typo in error message 2020-10-12 13:13:34 +02:00
Pawel Kolodziejski
d5304e2568 ALL: Synced with ScummVM - rev: 33a47d23b8 2020-09-03 02:21:14 +02:00
Mathias Parnaudeau
a8e8b71550 EMI: Check _musicTable is null before it is used
After having installed EMI data and started the game, if we are in the situation
where it is asked to rename resource file FullMonkeyMap.imt from both CDs
into FullMonkeyMap1.imt and FullMonkeyMap2.imt, the game tries to start but
leads to an immediate segmentation fault.

In EMISound::setMusicState, _musicTable is checked againt nullptr but ... after
it is used. This check is moved up.
2020-02-21 07:11:56 +01:00
Dries Harnie
74a8f2d09c EMI: Support merged FullMonkeyMap.int as well 2019-05-13 20:55:21 +02:00
Bastien Bouclet
6708f19a50 GRIM: Fix invalid ADGF_DEMO flag usage 2017-07-26 20:12:35 +02:00
Joni Vähämäki
ec6241fa00 EMI: Fixed implementation of UpdateSoundPosition. 2014-08-14 17:51:08 +03:00
Joni Vähämäki
d5355e6713 EMI: Fixed sound panning. 2014-08-14 17:51:06 +03:00
Joni Vähämäki
896fd7cb42 EMI: Recalculate volume and balance for positioned sounds when the setup changes. Fixes #996 2014-08-14 17:50:58 +03:00
Joni Vähämäki
40fd8016dc EMI: Accept .lab suffix when detecting MP3 music. 2014-08-09 14:14:16 +03:00
Joni Vähämäki
c5954a2305 EMI: Make sure the music state id does not exceed the number of entries in the music table. 2014-08-09 14:14:14 +03:00
Joni Vähämäki
2264fd7c8e EMI: Remove MusicEntry constructors to fix C++98 compile error. 2014-08-07 13:03:54 +03:00
Joni Vähämäki
468e58b2e8 EMI: Pause loaded sounds also. 2014-08-06 19:43:30 +03:00
Joni Vähämäki
204aed2650 EMI: Save and restore sound track looping status. 2014-08-06 19:43:29 +03:00
Joni Vähämäki
b5e4aa4826 EMI: Refactor EMISound to get rid of the fixed number of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
e08141392e EMI: Replace assert with warning if EMISound runs out of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
9e482d1563 EMI: Initialize the fields of MusicEntry. 2014-08-06 19:43:27 +03:00
Joni Vähämäki
81d00e041f EMI: If the new music track is the same as the previous one, keep playing the previous one. 2014-08-06 19:43:25 +03:00
Joni Vähämäki
da2518bdb3 EMI: Add PS2 music table. 2014-08-06 19:43:23 +03:00
Joni Vähämäki
f198433a69 EMI: Comment saved boolean value which indicates whether the sound channel is active or not. 2014-08-06 19:43:22 +03:00
Joni Vähämäki
25f688764a EMI: Make use of brackets consistent in EMISound::initTrack. 2014-08-06 19:43:21 +03:00
Joni Vähämäki
1f8fe2a4aa EMI: Pass sound name as Common::String& to EMISound's methods. 2014-08-06 19:43:20 +03:00
Joni Vähämäki
f66f218832 EMI: Respect the loop flag passed as parameter to PlayLoadedSound. 2014-08-06 19:43:19 +03:00
Joni Vähämäki
923d33d37b EMI: Always fade in the new music if any previous music tracks are currently fading out. 2014-08-06 19:43:18 +03:00
Joni Vähämäki
146af5a498 EMI: Fix implementation of ImStateHasEnded. 2014-08-06 19:43:16 +03:00
Joni Vähämäki
2d087f405e EMI: When music quality is changed, immediately switch all active music tracks to the new quality. 2014-08-06 19:43:14 +03:00
Joni Vähämäki
94f8749045 EMI: Avoid repeated array access. 2014-08-06 19:43:13 +03:00
Joni Vähämäki
af58e0ebf8 EMI: Add debug prints to EMISound::getMsPos. 2014-08-06 19:43:12 +03:00
Joni Vähämäki
d9e2b2057c EMI: Do not free sound tracks in the audio thread. 2014-08-06 19:43:11 +03:00
Joni Vähämäki
007067c7ad EMI: Move handling of pooled sounds to EMISound. 2014-08-06 19:43:10 +03:00
Joni Vähämäki
0715853387 EMI: Save and restore sound tracks. 2014-08-06 19:43:08 +03:00
Joni Vähämäki
7a3cdcdca2 EMI: Pause sounds in draw mode. 2014-08-06 19:43:04 +03:00
Joni Vähämäki
617df50129 EMI: Extract common functionality from EMISound's startSfx and startSound methods. 2014-08-06 19:17:00 +03:00
Joni Vähämäki
e70d6e9af1 EMI: Respect balance and volume parameters when starting a voice. 2014-08-06 19:17:00 +03:00
Joni Vähämäki
f733939a38 EMI: Update _curMusicState also when state 0 is requested. 2014-08-06 19:16:59 +03:00
Joni Vähämäki
358e840817 EMI: Lock when channel state is modified from the game thread. 2014-08-06 19:16:58 +03:00
Joni Vähämäki
d9137d0ad3 EMI: Do not expose the sound handle in SoundTrack. 2014-08-06 19:16:58 +03:00
Joni Vähämäki
e3c6c1d66f EMI: Replace asserts with warning when trying to change parameters of a sound track that doesn't exist. 2014-08-06 19:16:57 +03:00
Joni Vähämäki
f3c5b3619e EMI: Free the sound channel immediately if sound track initialization fails. 2014-08-06 19:16:56 +03:00
Joni Vähämäki
0cd248a9a0 EMI: Move initialization of sound effects to EMISound. 2014-08-06 19:16:56 +03:00
Joni Vähämäki
26779a6206 EMI: Free channels that have finished playing. 2014-08-06 19:16:55 +03:00
Joni Vähämäki
a03a06b0f6 EMI: Initialize EMISound instead of iMuse at engine startup. 2014-08-06 19:16:54 +03:00
Joni Vähämäki
a8d48e2545 EMI: Pass a file path string instead of a file stream to SoundTrack::openSound. 2014-08-06 19:16:53 +03:00
Joni Vähämäki
4670ee3508 EMI: Push also the iMuse state number to the state stack. 2014-08-06 19:16:52 +03:00
Joni Vähämäki
b93add8a81 EMI: Music sync value 0 means no synching. 2014-08-06 19:16:51 +03:00
Joni Vähämäki
22413bde1b EMI: Do not cross-fade music if no music track was previously playing. 2014-08-06 19:16:51 +03:00