Commit Graph

2217 Commits

Author SHA1 Message Date
Johannes Schickel
5d6b9af72a Use Common::KeyCode instead of int as key type for KeyMap.
svn-id: r48078
2010-02-17 16:08:47 +00:00
Florian Kagerer
9b6042efb4 LOL: fixed script bug in castle cimmeria that would cause out of bounds mem access (should fix bug #2948109)
svn-id: r48016
2010-02-09 21:09:29 +00:00
Florian Kagerer
d4a0375f7e LOL: fixed handling of invalid monster attack sfx in the Urbish mines (should fix bug no #2945950)
svn-id: r47967
2010-02-07 16:12:31 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Johannes Schickel
8e69a24783 Fix yet another use of possibly undefined behavior reported by syke.
svn-id: r47689
2010-01-29 23:52:58 +00:00
Johannes Schickel
595a2e16f1 Fix use of undefined behavior. (Thanks to syke for reporting)
svn-id: r47685
2010-01-29 22:43:23 +00:00
Johannes Schickel
812603e29e Fix invalid sample position on Timestamp to sample conversion for Stereo streams.
svn-id: r47591
2010-01-27 08:08:33 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/
svn-id: r47579
2010-01-26 22:48:45 +00:00
Johannes Schickel
2eb16caade Remove HACK, which is obsolete because of r47336.
svn-id: r47548
2010-01-25 03:05:39 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Torbjörn Andersson
45cbc7b265 Fixed warning.
svn-id: r47504
2010-01-24 17:24:11 +00:00
Florian Kagerer
4eb077dcf3 LOL: save/load menu speed up
svn-id: r47501
2010-01-24 15:40:36 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Johannes Schickel
4fcc82e7a6 Paranoia change: add some explicit terminating 0 after some strncpy uses.
svn-id: r47479
2010-01-23 16:15:18 +00:00
Max Horn
b036392a7b Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change
svn-id: r47472
2010-01-23 13:34:29 +00:00
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
2010-01-22 19:05:02 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
2010-01-19 22:30:33 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
2010-01-19 00:56:29 +00:00
Max Horn
69be747621 Move raw audio streams to new header sound/raw.h
svn-id: r47368
2010-01-19 00:54:06 +00:00
Max Horn
349fcd1d71 Rename 'Linear' audio streams to 'raw'
svn-id: r47367
2010-01-19 00:52:41 +00:00
Florian Kagerer
0fd8008296 LOL: minor key map fix
svn-id: r47359
2010-01-18 19:15:05 +00:00
Florian Kagerer
4c9f323199 LOL: cleanup last commit
svn-id: r47354
2010-01-18 07:21:54 +00:00
Florian Kagerer
371a2a9ee9 LOL: fixed spell array size
svn-id: r47353
2010-01-18 00:56:30 +00:00
Johannes Schickel
e11e9338d1 Delay the time a sysEx takes to send instead of the old (incorrect) way of delaying only 45ms between two sysEx calls. (Code thankfully borrowed from waltervn).
svn-id: r47336
2010-01-17 02:42:31 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
2010-01-12 21:07:56 +00:00
Johannes Schickel
6ca0570fe3 - Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream.
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.

svn-id: r47226
2010-01-10 15:20:14 +00:00
Max Horn
be8371fb07 Replace AppendableAudioStream by QueuingAudioStream
svn-id: r47189
2010-01-09 00:19:13 +00:00
Max Horn
f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag
svn-id: r47182
2010-01-08 22:09:43 +00:00
Max Horn
0cf53b025d Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
2010-01-08 22:07:35 +00:00
Johannes Schickel
616e4626f5 Since AudioStream looping is no longer handled by the Mixer, drop Mixer::playAudioStreamLooping. (There's Audio::makeLoopingAudioStream).
svn-id: r47160
2010-01-08 16:27:29 +00:00
Johannes Schickel
297a955579 - Simplify Audio::calculateSampleOffset.
- Made Audio::calculateSampleOffset accessable from outside audiostream.cpp.
- Adapt KYRA's AUDStream to use Audio::calculateSampleOffset.

svn-id: r47082
2010-01-06 15:40:49 +00:00
Johannes Schickel
0e420431fd Adapt KYRA to use the new FLAC, Vorbis and MP3 factories.
svn-id: r47062
2010-01-06 00:00:25 +00:00
Johannes Schickel
79ee2b0895 Properly adapt AUDStream to be a SeekableAudioStream and switched KYRA3 to use playAudioStreamLooping for its looping purposes.
svn-id: r47060
2010-01-05 23:05:31 +00:00
Johannes Schickel
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream.
svn-id: r47037
2010-01-05 20:14:28 +00:00
Johannes Schickel
e9a94ecb9b Add a "getLength" function to SeekableAudioStream.
svn-id: r47036
2010-01-05 20:13:31 +00:00
Johannes Schickel
f5c3bd887e - Add a new SeekableAudioStream interface. Soon to be used to replace audio stream specific looping code by generic code in Mixer...
- Adapted some existing AudioStreams to implement that interface (not tested!)

svn-id: r47013
2010-01-05 02:27:24 +00:00
Torbjörn Andersson
72eb9ec9ea Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.

svn-id: r46941
2010-01-03 19:37:43 +00:00
Johannes Schickel
c671c17258 Use Common::StackLock.
svn-id: r46870
2010-01-02 00:54:11 +00:00
Florian Kagerer
998d511eeb LOL: cleanup
svn-id: r46866
2010-01-01 23:57:16 +00:00
Johannes Schickel
8817d6eeb5 Merge update_nop1 and update_nop2.
svn-id: r46860
2010-01-01 22:33:45 +00:00
Johannes Schickel
82b4b65bdc - Fix out of bounds array access.
- Add some asserts in output related functions

svn-id: r46859
2010-01-01 22:26:26 +00:00
Johannes Schickel
671cc15bd1 - Add some asserts
- Renamed snd_unkOpcode3 to snd_stopChannel
- Cleanup

svn-id: r46855
2010-01-01 21:59:11 +00:00
Johannes Schickel
e757e7a60a Fix out of bounds access reported by syke.
svn-id: r46844
2010-01-01 19:45:49 +00:00
Florian Kagerer
9f63095688 LOL: fixed debug message
svn-id: r46675
2009-12-28 15:08:53 +00:00
Florian Kagerer
2a0b03218c LOL: - added workaround for portrait speech animations which would sometimes "freeze"
- renamed some stuff

svn-id: r46601
2009-12-26 19:02:16 +00:00
Florian Kagerer
193b23bcad LOL: fixed minor bug in lamp code
svn-id: r46587
2009-12-26 14:12:38 +00:00
Florian Kagerer
7bf92fc795 LOL: fixed minor bug in lamp code
svn-id: r46534
2009-12-24 18:41:26 +00:00
Florian Kagerer
c1eaafcac7 LOL: removed unused variable
svn-id: r46434
2009-12-20 16:23:44 +00:00