Commit Graph

50 Commits

Author SHA1 Message Date
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Johannes Schickel
c6afdbdca3 KYRA3: Add some sound debug output.
svn-id: r52699
2010-09-13 12:19:19 +00:00
Johannes Schickel
7da8c8949b Replace KYRA's strncpy and strncat usages by strlcpy/strlcat.
svn-id: r48954
2010-05-05 17:53:30 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +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
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
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
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
2010-01-16 21:36:08 +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
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
Joost Peters
6d1a386471 remove implicit SoundDigital::Sound ctor call, which is redundant because the required initialisation is done below -- this fixes a linker error with mipspro
svn-id: r42748
2009-07-25 12:41:46 +00:00
Max Horn
2d866c0483 Renamed Kyra's Resource::getFileStream to createReadStream
svn-id: r36022
2009-01-23 04:57:18 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +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
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Johannes Schickel
c26e62e288 - Implemented Kyra3 audio options menu, Helium mode still missing.
- Fixed unitialized variable

svn-id: r31881
2008-05-05 17:56:39 +00:00
Johannes Schickel
c0f4b3faa7 - load new tlk file on chapter change
- added warning when trying to play non-existent soundfile

svn-id: r31742
2008-04-26 22:53:00 +00:00
Johannes Schickel
87f10ebe40 Committed patch removing Audio::Mixer::SoundType alias in Kyra::SoundDigital.
svn-id: r31632
2008-04-20 22:24:24 +00:00
Johannes Schickel
d484c7ed43 Improved sound priority handling.
svn-id: r31598
2008-04-20 14:36:39 +00:00
Johannes Schickel
96fd18a13b Implemented sound priority handling.
svn-id: r31597
2008-04-20 14:25:37 +00:00
Johannes Schickel
eb2ffce2fd Implemented volume handling for SFX.
svn-id: r31548
2008-04-17 17:57:16 +00:00
Johannes Schickel
0f34c16c1e Cleanup.
svn-id: r31547
2008-04-17 17:49:18 +00:00
Johannes Schickel
87256747b1 Implemented sfx support for Kyra3.
svn-id: r31546
2008-04-17 17:46:39 +00:00
Johannes Schickel
10fe009db3 Fixed music fade out.
svn-id: r31506
2008-04-14 20:57:24 +00:00
Johannes Schickel
853b6e28e9 Implemented some kyra3 code.
svn-id: r31503
2008-04-14 20:20:51 +00:00
Johannes Schickel
d54eaa39a1 Added fade out time parameter for digital sounds.
svn-id: r31489
2008-04-12 23:26:13 +00:00
Johannes Schickel
31938bc071 Fixed kyra3 code.
svn-id: r30822
2008-02-07 23:27:08 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Johannes Schickel
287e79d477 Documenting the sound code a bit.
svn-id: r29392
2007-11-03 23:32:15 +00:00
Max Horn
e2ad271bd8 Removing non-ASCII chars from source code
svn-id: r27818
2007-07-01 12:47:07 +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
Johannes Schickel
21b2c7bceb Formatting/Cleanup.
svn-id: r26511
2007-04-15 16:41:20 +00:00
Max Horn
8466221fce Simplify code a bit -- got rid of File::incRef usage, an unnecessary member var, fixed a potential memory leak (if all channels are in use), and fixed a potential OOB error (if stopSound(-1) was called)
svn-id: r25916
2007-03-01 17:04:50 +00:00
Lars Persson
44d48ed594 GCC 2.9x fix for Symbian OS, for accessing class within Common namespace
svn-id: r22807
2006-05-31 19:55:29 +00:00
Torbjörn Andersson
1162a759c0 Added support for fading digital music in or out.
svn-id: r22624
2006-05-25 09:53:51 +00:00
Johannes Schickel
344cc2f475 - allows kyra3 to exit again
- implements language selection for kyra3

svn-id: r22559
2006-05-21 16:06:29 +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
Torbjörn Andersson
65091f7370 Added (optional) looping to the digital sound class.
svn-id: r22504
2006-05-17 21:14:19 +00:00
Torbjörn Andersson
6bf1e10768 Fixed two off-by-one errors. One would cause the same frame of the Kyra 3 to be
displayed twice in a row. The other, more serious one, would cause ScummVM to
crash when reaching the end of the music. Now the music loops properly. (It
does fade down before looping, but that's how it is in the original as well.
It's just the way the music is recorded.)

svn-id: r22503
2006-05-17 20:54:51 +00:00
Torbjörn Andersson
4da20ba369 Maybe the svn:keywords were already set? Maybe this will fix the file headers instead.
svn-id: r22501
2006-05-17 20:25:08 +00:00
Torbjörn Andersson
c27b1201d4 Fixed crackling in Kyra 3 sound. (At least what little of it ScummVM currently
plays before finishing.)

svn-id: r22499
2006-05-17 19:42:55 +00:00
Johannes Schickel
f7c29ccc8b - adds AUD file player (has still some problems with playing)
- adds a new sound class SoundDigital (only used for Kyra3) (needs more work though)

svn-id: r22497
2006-05-17 18:07:02 +00:00