Commit Graph

116 Commits

Author SHA1 Message Date
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
athrxx
f80b2383e7 KYRA: cleanup last commit 2011-07-04 20:22:16 +02:00
athrxx
d7f877b3ab KYRA: pause midi sounds while gmm is running 2011-05-29 01:04:08 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +00:00
Johannes Schickel
01f5610836 Fix out of bounds access.
svn-id: r48338
2010-03-20 20:25:37 +00:00
Max Horn
f24cc1c8be Tweak makeVOCDiskStream
* now takes a SeekableReadStream *pointer* like (almost) all other
  audiostream factories
* fix potential memory leak in it
* rename takeOwnershipOfStream to disposeAfterUse for consistency

svn-id: r48184
2010-03-08 10:27:42 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream.
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
2010-02-03 09:42:11 +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
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
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +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
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
920dac2f9d Remove unsafe getTotalPlayTime from AudioStream.
svn-id: r47037
2010-01-05 20:14:28 +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
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Norbert Lange
c96affd0c1 merge with trunk
svn-id: r43443
2009-08-16 16:39:34 +00:00
Neil Millstone
a135a7f938 Allow VOCs to stream from disk. Disabled by default, use symbol STREAM_AUDIO_FROM_DISK to enable. See patch #2834001.
svn-id: r43357
2009-08-13 21:46:41 +00:00
Johannes Schickel
df06592be1 Implemented support for Amiga wander score map.
svn-id: r43133
2009-08-08 18:23:14 +00:00
Johannes Schickel
95d11e6e37 - Add new method "isVoicePresent" to "Sound".
- Change LoL character selection to use it.
- Allow quitting ScummVM in LoL character selection.

svn-id: r41008
2009-05-29 17:12:45 +00:00
Johannes Schickel
c0302661ed Cleanup.
svn-id: r40850
2009-05-24 01:37:51 +00:00
Johannes Schickel
344caa88fc Make various Sound functionality SoundHandle instead of filename based.
- This fixes multiple sounds being played at once in Lands of Lore

svn-id: r40848
2009-05-24 01:29:09 +00:00
Johannes Schickel
ad4549f28d - Reorder supported codecs list
- Add changes for upcoming audio compression changes (file extensions changed to standard ones)

svn-id: r40843
2009-05-24 00:11:28 +00:00
Johannes Schickel
b28279accc Cleanup.
svn-id: r40841
2009-05-23 23:58:40 +00:00
Florian Kagerer
5a4b3c5441 KYRA/LOL: restructured voice playing code so that audio compression can be supported
svn-id: r40839
2009-05-23 23:33:31 +00:00
Johannes Schickel
e51481d69b Remove trailing tabs/whitespaces.
svn-id: r40760
2009-05-21 13:13:09 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output.
svn-id: r40715
2009-05-19 01:13:29 +00:00
Florian Kagerer
dd84aaf648 LOL: - added some spell casting (spark, heal, swarm)
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
2009-05-10 13:40:28 +00:00
Johannes Schickel
b01e82488d Fix for Kyra 1 Mac CD music (check bug report #2772727 "KYRA1: Sound effect loops continuously (Mac CD)").
svn-id: r40039
2009-04-21 11:26:19 +00:00
Florian Kagerer
6d9a047276 LOL: minor fix for text displayer (text pages now advance automatically when the speech has reached the next part)
svn-id: r39250
2009-03-09 00:54:27 +00:00
Florian Kagerer
6cb3f665af LOL: some more work on the text displayer so that it handles longer texts (needed for some library books)
svn-id: r39249
2009-03-08 23:28:19 +00:00
Travis Howell
4131d3d07f Fix sound noise regression in CD32 version of Simon the Sorcerer 1.
svn-id: r36236
2009-02-07 05:05:14 +00:00
Johannes Schickel
9df7f7385c - Cleanup
- This time fixed the real cause of the mismatching malloc / delete[] call.

svn-id: r36191
2009-02-01 21:11:03 +00:00
Johannes Schickel
4662333b81 Oops wrong parameter in last commit.
svn-id: r36187
2009-02-01 20:54:24 +00:00
Johannes Schickel
1aa84d4b5e - Fixed mismatching new[] / free.
- Fixed bad casting

svn-id: r36186
2009-02-01 20:53:30 +00:00
Johannes Schickel
574a7924df Implemented per voice volume control. (Used for example in LoL intro)
svn-id: r36184
2009-02-01 20:35:51 +00:00
Florian Kagerer
784c99b3da svn-id: r36178 2009-02-01 19:27:01 +00:00
Max Horn
2d866c0483 Renamed Kyra's Resource::getFileStream to createReadStream
svn-id: r36022
2009-01-23 04:57:18 +00:00
Johannes Schickel
1fc33dbae5 - Fix some valgrind warnings
- Added MIDI SFX support for Kyra2

svn-id: r35178
2008-11-30 02:47:20 +00:00
Johannes Schickel
893a79b01d Initial version of proper MIDI support for KYRA.
svn-id: r35174
2008-11-30 01:53:32 +00:00
Johannes Schickel
64fe71fed3 Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
2008-08-02 15:05:19 +00:00
Johannes Schickel
2e65c05991 Add warning when a voc file is not found.
svn-id: r33524
2008-08-02 14:35:43 +00:00
Torbjörn Andersson
6b2337740e Make sure _musicVolume and _sfxVolume are clipped to fit in a byte.
svn-id: r33266
2008-07-24 22:12:48 +00:00
Johannes Schickel
9a34ef702d Fixed mem leak in MIDI related code.
svn-id: r32987
2008-07-10 11:28:51 +00:00
Torbjörn Andersson
1cc9af6b10 Implemented Good Enough(TM) XMIDI looping. This is used by Kyrandia 2 (the
loop hack is no longer needed, and has been removed), and will be used by
Discworld.

svn-id: r32930
2008-07-06 18:37:52 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Johannes Schickel
691306f0b7 Fixed KyraEngine_v1::snd_stopVoice and KyraEngine_v1::snd_voiceIsPlaying implementations.
svn-id: r32330
2008-05-27 21:04:27 +00:00