Commit Graph

227 Commits

Author SHA1 Message Date
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
2005-01-09 03:15:59 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
f15f517bb4 Add 'speech' sound type to mixer; make use of that in iMuse Digital
svn-id: r16331
2004-12-27 01:32:40 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Max Horn
10dd548b85 Changed parameter order of SoundMixer::playInputStream to match that of playRaw
svn-id: r15950
2004-11-28 23:02:28 +00:00
Max Horn
1ae87c0fbb Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
2004-11-28 21:24:02 +00:00
Torbjörn Andersson
ecc7b79a44 Initialize variable to avoid warning and possibly undefined behaviour.
svn-id: r15879
2004-11-25 07:09:30 +00:00
Max Horn
147a09bcf5 (Partial) fix for bug #1035690 (COMI: cannon shooting uses a lot of performance) -- remember, busy waiting is almost always bad, esp. when waiting for another thread...
svn-id: r15875
2004-11-24 10:00:02 +00:00
Max Horn
666d7d106d Some code transformations (no functional change)
svn-id: r15874
2004-11-24 09:47:32 +00:00
Max Horn
eb9404beb8 This is really an IMA codec...
svn-id: r15776
2004-11-10 01:44:46 +00:00
Eugene Sandulenko
3ebaf08d6c Fix compilation.
svn-id: r15598
2004-10-17 21:34:37 +00:00
Max Horn
ea9d53be79 cleanup
svn-id: r15597
2004-10-17 19:40:34 +00:00
Max Horn
86113ad042 Fix doxygen warning
svn-id: r15452
2004-10-07 21:18:54 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Max Horn
61b7e2155a Fix doxygen warnings
svn-id: r15277
2004-09-25 23:26:46 +00:00
Paweł Kołodziejski
9baf06c9fa workaround for decode bundle bug (it overloaded memory)
svn-id: r15165
2004-09-18 13:24:02 +00:00
Torbjörn Andersson
dc461ca770 Fixed some other cases where the number of parameters to our message-
printing functions didn't agree with the format strings.

GCC will find a couple of other things to warn about if these functions
are labelled as printf()-style functions, but those were less important, I
think.

svn-id: r15081
2004-09-12 18:21:21 +00:00
Chris Apers
7988660bda On PalmOS too
svn-id: r15026
2004-09-12 11:07:32 +00:00
Paweł Kołodziejski
9032d086af added error info for bundle mgr bug
svn-id: r14893
2004-09-04 14:27:16 +00:00
Paweł Kołodziejski
3a19ca1be3 fixde bug IMUSE+DEBUG
svn-id: r14892
2004-09-04 13:13:23 +00:00
Paweł Kołodziejski
23e294e10c added comment for insane hack
svn-id: r14891
2004-09-04 12:35:19 +00:00
Max Horn
3e75807fa8 more cleanup
svn-id: r14816
2004-08-28 14:33:34 +00:00
Max Horn
13356dfa17 Reduce code duplication
svn-id: r14815
2004-08-28 14:19:56 +00:00
Max Horn
98bcae943d Cleaning up code a bit while trying to understand it...
svn-id: r14814
2004-08-28 14:06:36 +00:00
Travis Howell
057ea5cba8 Fix compile
svn-id: r14745
2004-08-25 07:23:48 +00:00
Paweł Kołodziejski
5b7f8b5e78 added comment for insane hack and not tested fix for deadlock bug imuse + debugger
svn-id: r14742
2004-08-25 07:03:38 +00:00
Max Horn
bf7eae7932 Added another sanity assert (I got one crash in this sport while using a memory debugger -- likely a thread race condition
svn-id: r14635
2004-08-16 22:24:24 +00:00
Max Horn
41288cb8e0 Init _compInput (prevents bad free)
svn-id: r14506
2004-08-07 18:17:09 +00:00
Torbjörn Andersson
963aa6085d Valgrind complained about an uninitialized value. This appears to fix it,
and anyway it won't hurt.

svn-id: r14279
2004-07-19 15:26:07 +00:00
Torbjörn Andersson
bc300cb062 Applied patch #993803 (fix for a COMI hang) after some discussion with
aquadran. Let's hope the cure isn't worse than the disease...

svn-id: r14277
2004-07-19 15:21:29 +00:00
Paweł Kołodziejski
9e7f2342c7 removed not needed code and moved pause mixer after pause imuse
svn-id: r14274
2004-07-19 10:51:00 +00:00
Nicolas Bacca
74d898d160 Fix Digital Imuse deadlocks for CE platforms. Other platforms using event-based timers may be interested in it, too
svn-id: r14248
2004-07-18 16:30:01 +00:00
Paweł Kołodziejski
11d552ff7e added code for bundle script vars
svn-id: r14166
2004-07-04 06:14:18 +00:00
Max Horn
b7f9e2137b Thanks to File::setDefaultDirectory(), in most cases it is *not* necessary to pass getGameDataPath() on to File::open()
svn-id: r14088
2004-06-27 22:03:38 +00:00
Paweł Kołodziejski
5ce27765af dont wait for end of stream while playing insane
svn-id: r13998
2004-06-21 19:37:54 +00:00
Paweł Kołodziejski
416b9b2ab4 fixed status of sounds for stream2
svn-id: r13991
2004-06-21 05:31:51 +00:00
Paweł Kołodziejski
8b789937c6 changed check to _insaneRunning
svn-id: r13986
2004-06-20 21:01:32 +00:00
Paweł Kołodziejski
6268fdae25 missed changes
svn-id: r13984
2004-06-20 20:19:09 +00:00
Paweł Kołodziejski
af3d123730 added exception for insane sounds to prevent deadlock
svn-id: r13983
2004-06-20 20:13:01 +00:00
Eugene Sandulenko
dad3482500 Fix compilation
svn-id: r13981
2004-06-20 19:19:53 +00:00
Paweł Kołodziejski
38ed122c95 what was that ?
svn-id: r13980
2004-06-20 18:48:17 +00:00
Paweł Kołodziejski
dcc12aa49f stop track after stream is reach end
svn-id: r13978
2004-06-20 18:36:10 +00:00
Paweł Kołodziejski
24f5130de2 better check if track is used
svn-id: r13976
2004-06-20 15:58:28 +00:00
Paweł Kołodziejski
92fce3fa49 i wanted 16 not 24
svn-id: r13975
2004-06-20 15:32:46 +00:00
Paweł Kołodziejski
83d4d9058e trackOffset is obsolote, added few debugs, added flush sounds while smush plying to prevent overload tracks
svn-id: r13974
2004-06-20 15:28:11 +00:00
Paweł Kołodziejski
b6ce351f6d fix for not finding sample
svn-id: r13970
2004-06-20 13:19:22 +00:00
Paweł Kołodziejski
8f1191b379 some optimisations
svn-id: r13969
2004-06-19 17:48:06 +00:00
Paweł Kołodziejski
4b9aa09f03 moved a bit
svn-id: r13968
2004-06-19 17:22:18 +00:00
Paweł Kołodziejski
f5c8c66642 chnaged fps in imuse digi to dynamic param
svn-id: r13967
2004-06-19 16:00:11 +00:00
Paweł Kołodziejski
22048dca58 that was very bad
svn-id: r13966
2004-06-19 15:17:50 +00:00