libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 04:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,366 Commits 6 Branches 5 Tags
Commit Graph

5366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Teichroeb
dc57920d53 Merge pull request #995 from klusark/smushprim 
GRIM/EMI: Simplify primitive drawing, and don't draw primitives over movies.
 2014-08-06 09:55:18 -07:00
Joel Teichroeb
67440488ff Merge pull request #964 from JoseJX/FixTextPositions 
EMI: Correct problems with text positions and word wrapping.
 2014-08-06 09:51:58 -07:00
Joel Teichroeb
c9fd449092 Merge pull request #972 from Akz-/emi-sounds-rebase 
EMI: Improvements to the sound system
 2014-08-06 09:51:25 -07: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
f31ac635a9 EMI: Implement SCXTrack::setLooping. 2014-08-06 19:43:26 +03:00
Joni Vähämäki
93140ed84a EMI: Do not dispose SCX tracks after playing. 2014-08-06 19:43:26 +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
685803cc83 EMI: Fix pop at the end of SCX playback. 2014-08-06 19:43:24 +03:00
Joni Vähämäki
5e8d3dad0c EMI: Implement seeking to start position for SCX tracks. 2014-08-06 19:43:24 +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
1da4de97ae EMI: Add comment about the mutex in EMISound. 2014-08-06 19:43:22 +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
7c4e942253 EMI: Add comment about disposing of AIFF tracks. 2014-08-06 19:43:20 +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
04e86e79c2 EMI: Disable talk delay. 2014-08-06 19:43:18 +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
5569953f5f EMI: Fix disposing of AIFF sound streams. 2014-08-06 19:43:17 +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
2a8820bbee EMI: Remove EMI-specific methods from SoundPlayer. 2014-08-06 19:43:16 +03:00
Joni Vähämäki
219e0a18dc EMI: Clean up EMISound header. 2014-08-06 19:43:15 +03:00
Joni Vähämäki
bef2b6016f EMI: Make callback and updateTrack methods of EMISound private. 2014-08-06 19:43:14 +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
23055d20d4 EMI: Do not stop the sound in SoundTrack's destructor since the handle may have been invalidated by derived classes. 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
9866dbf745 EMI: Cache AIFF files. 2014-08-06 19:43:10 +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
9ee420b0d0 EMI: Explicitly initialize g_imuse/g_emisound to null. 2014-08-06 19:43:09 +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
c563efe1cd EMI: Implement start offset in AIFFTrack and VimaTrack. 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
c4decc05c5 EMI: Parse the first parameter of ImPushState. 
This fixes the credits music not playing in the main menu.
 2014-08-06 19:16:53 +03:00