Commit Graph

50 Commits

Author SHA1 Message Date
Paweł Kołodziejski
a8b5484086 remove code duplication
svn-id: r29714
2007-12-04 11:45:20 +00:00
Paweł Kołodziejski
1e49111dc7 correction based on disassembly
svn-id: r29712
2007-12-04 00:48:02 +00:00
Paweł Kołodziejski
deca7aa821 remove code duplication
svn-id: r29710
2007-12-03 19:38:05 +00:00
Gregory Montoir
1a2d4c9c28 revised mutex handling a bit in dimuse :
- protected access to Track.used in startSound
- removed mutex lock in cloneToFadeOutTrack as it's always called with mutex already locked on (shouldn't change anything, though, due to mutex re-entrancy)

svn-id: r29705
2007-12-02 14:34:33 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Chris Apers
500481c4ec Cleanup: remove obsolete code (PalmOS 68K version not supported anymore)
svn-id: r28803
2007-09-01 19:13:04 +00:00
Sven Hesse
2dd1dd5300 Fixing Full Throttle. If I understand the code correctly, this *should* be correct not break anything else. ;)
svn-id: r28338
2007-07-30 19:54:51 +00:00
Travis Howell
de29c28483 Only set soundMode, if compressed segment exists.
svn-id: r28227
2007-07-27 01:33:05 +00:00
Filippos Karapetis
533ebe13d2 Fix for bug #1761530 - "COMI: iMUSE-related crash on startup"
svn-id: r28226
2007-07-27 00:59:12 +00:00
Travis Howell
e243dc8e36 Add support for FLAC compression of sound bundles in The Dig and COMI.
svn-id: r28173
2007-07-23 02:34:21 +00:00
Max Horn
425e6e278b cleanup (in particular, don't call something 'soundHandle' which is not a Mixer::SoundHandle)
svn-id: r28162
2007-07-22 09:17:23 +00:00
Max Horn
7a6f0b7460 SCUMM/iMuse Digital: Pause sounds after loading them
svn-id: r28158
2007-07-21 19:53:18 +00:00
Max Horn
f4c0b853cc Fixed sound factory messup caused by my previous commit
svn-id: r28111
2007-07-15 19:24:00 +00:00
Paweł Kołodziejski
8ca6751b21 renamed variable in IMuseDigital music code
svn-id: r27049
2007-06-02 09:07:29 +00:00
Paweł Kołodziejski
1a915d076c cleanup names
svn-id: r27041
2007-06-01 12:18:33 +00:00
Paweł Kołodziejski
75e3c7d4c5 rename some imuse variables
svn-id: r27040
2007-06-01 11:41:07 +00:00
Paweł Kołodziejski
e51845f053 rename some imuse variables
svn-id: r27039
2007-06-01 11:22:49 +00:00
Paweł Kołodziejski
4e08f9d1b1 small correction of comment
svn-id: r27038
2007-06-01 09:02:16 +00:00
Paweł Kołodziejski
73623fb326 added comments for imuse digital variables
svn-id: r27037
2007-06-01 08:59:21 +00:00
Paweł Kołodziejski
7bd01608d6 added comment to cloneToFadeOutTrack()
svn-id: r27025
2007-05-30 22:51:08 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
abf59db15e Make sure Track::soundHandle is always initialize, and added a FIXME (see also bug #1635361)
svn-id: r26259
2007-03-20 19:40:34 +00:00
Max Horn
3d52e20b9b Change IMuseDigital::stopAllSounds to simply do what it names suggest, i.e. stop all sounds immediately (instead of waiting for the imuse timer to do the required work). Not heavily tested, as I don't know of specific spots in Dig/FT/CoMI which make use of this
svn-id: r26258
2007-03-20 19:37:31 +00:00
Max Horn
d0c30bfd9a Undoing my previous (upon closer review, bogus) change to IMuseDigital::refreshScripts -- the problem is a bit deeper. Sorry for the noise :-(
svn-id: r26257
2007-03-20 19:06:37 +00:00
Max Horn
2c0f341ef8 Correct error message
svn-id: r26256
2007-03-20 19:04:51 +00:00
Max Horn
c485719ad4 oops
svn-id: r26255
2007-03-20 19:00:16 +00:00
Max Horn
f5559de703 Fix a potential race condition (leading to lockups) in IMuseDigital::refreshScripts
svn-id: r26254
2007-03-20 18:59:28 +00:00
Max Horn
e56b44d1fa cleanup
svn-id: r26253
2007-03-20 18:45:54 +00:00
Torbjörn Andersson
cee6c45be6 Applied my own patch #1672572, after discussing it with Fingolfin. We no longer
store mixer flags in our savegames. Instead, we store different flags which
just happen to have the exact same values as the mixer flags have right now.
This should keep savegames working even if the mixer flags ever change.

svn-id: r25928
2007-03-02 17:30:29 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Torbjörn Andersson
a1a16d1579 Use consistent naming for the preprocessor constants used to guarantee that
header files are only included once. Many of them didn't have a SCUMM prefix
which could have lead to clashes with common header files.

svn-id: r25727
2007-02-19 17:48:19 +00:00
Willem Jan Palenstijn
5e93000a75 fix compile error
svn-id: r25612
2007-02-15 20:24:03 +00:00
Paweł Kołodziejski
310e275a79 not need this hack as smush player is no longer on another thread
svn-id: r25610
2007-02-15 17:53:59 +00:00
Gregory Montoir
7fa8e652a0 added missing MKID_BE macros
svn-id: r25560
2007-02-13 20:58:20 +00:00
Max Horn
0fc672025c Removed obsolete call to Mixer::isPaused
svn-id: r25353
2007-02-03 18:08:10 +00:00
Max Horn
9edf1e6a1a cleanup
svn-id: r24407
2006-10-21 12:44:10 +00:00
Max Horn
4973c657b8 Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases)
svn-id: r24169
2006-10-07 13:57:06 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
2006-09-17 20:36:48 +00:00
Torbjörn Andersson
6358547a43 More whitespace changes.
svn-id: r23496
2006-07-14 13:33:58 +00:00
Torbjörn Andersson
2531fd5873 Added player for the Kyra 3 VQA cutscenes, based on my earlier prototype. It
could use some cleanup, and there are a couple of TODOs sprinkled throughout
the code, but it seems to work reasonably well. Until the Kyra 3 main menu is
implemented, it won't actually be used though.

It uses the appendable audio stream class, which I have moved out of the SCUMM
engine.

svn-id: r22526
2006-05-18 21:46:07 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
0891a91acc Change some uses of ScummFile to the more generic BaseScummFile
svn-id: r22113
2006-04-23 17:47:40 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +00:00
Max Horn
bac32d1a5c Moved ScummFile etc. to the new file.cpp / file.h
svn-id: r21038
2006-03-03 15:16:02 +00:00
Max Horn
6ff8d3b9fd Turn _file member of BundleMgr into a pointer
svn-id: r21037
2006-03-03 14:55:04 +00:00
Max Horn
6914121f61 Replaced MKID by MID_BE in most places in the SCUMM engine
svn-id: r20862
2006-02-25 02:12:58 +00:00
Max Horn
e389bcf497 Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game
svn-id: r20795
2006-02-20 16:51:30 +00:00
Paweł Kołodziejski
1fb19714e2 added experimental hook handle on 8,9 sub opcode music
svn-id: r20779
2006-02-19 23:25:27 +00:00
Paweł Kołodziejski
8b76033dc3 added more asserts into imuse digi code
svn-id: r20733
2006-02-16 21:50:14 +00:00
Max Horn
26ee630756 Moved engines to the new engines/ directory
svn-id: r20582
2006-02-11 22:45:04 +00:00