Commit Graph

80 Commits

Author SHA1 Message Date
Johannes Schickel
8a5ceb9768 AGOS: Fix sound offset table access for StS 2 Mac/Amiga.
This (hopefully) fixes bug #6549: "#6549 AGOS: Simon2 Amiga Datafiles crashes with assertion in Intro".
I don't have any copy of StS 2 Mac/Amiga thus I cannot test this.

This bug was caused by a regression in c82a75df69.
2014-03-09 18:27:49 +01:00
Kirben
41d46f07ef AGOS: Correct typos in comments. 2014-03-05 09:17:54 +11:00
Johannes Schickel
c4fc0cee96 AGOS: Make GPL headers consistent in themselves. 2014-02-18 02:39:32 +01:00
Matthew Hoops
0031c41db8 COMMON: Change kPlatformPC to kPlatformDOS
"PC" was very ambiguous and now it matches what we show in the GUI.

This also corrects sword2's platform to Windows.
2013-05-02 18:43:10 -04:00
Johannes Schickel
89abab97e3 JANITORIAL: Remove trailing whitespaces.
Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:17:55 +02:00
Johannes Schickel
baafd74b66 AGOS: Fix silly copy&paste mistake, which broke Vorbis and MP3 support. 2012-01-26 01:35:06 +01:00
Johannes Schickel
c82a75df69 AGOS: Rework digital sound playback.
The BaseSound class does now only save the sound filename instead of a file
handle. When a new sound is started a new file handle is created, which
assures that each sound uses a different file handle and thus allows for
directly streaming sounds from disk.

This fixes bug #3475610
"AGOS: Wrong sound effects during intro of Simon 2 (DOS)".
2012-01-26 01:01:41 +01:00
Travis Howell
b05187c1a7 AGOS: Merge duplicate code remaining from refactoring in the past. 2011-11-03 13:02:12 +11:00
Eugene Sandulenko
0e1affcc97 AGOS: Fix warnings 2011-11-02 22:55:58 +00:00
Johannes Schickel
3e1405b939 AUDIO: Add default disposeAfterUse value to makeVOCStream again. 2011-10-09 21:24:06 +02:00
Johannes Schickel
221434a83f AUDIO: Remove unused makeVOCStream interface. 2011-10-09 21:23:29 +02:00
Christoph Mallon
a5a8833c05 COMMON: Add DisposablePtr<T>, which replaces many repeated implementations of a dispose flag. 2011-08-07 15:19:08 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +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
2180b2d6b5 COMMON: Split common/stream.h into several headers
svn-id: r54385
2010-11-19 17:03:07 +00:00
Max Horn
a1dd7a07a1 ENGINES: Remove some 'using' statements
svn-id: r54001
2010-11-01 16:00:17 +00:00
Torbjörn Andersson
ad02009888 AGOS: Hopefully fix bug #3000876 ("FF: Crackling/static popping")
We want the WAV stream in playSounData() to contain the entire WAV
data, but the size we read does not include the eight first bytes.

svn-id: r52908
2010-09-26 12:28:26 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
2010-04-12 09:14:17 +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
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
2010-01-30 15:26:54 +00:00
Max Horn
ff783e4bb7 AGOS: Turn BaseSound into a subclass of Common::NonCopyable
svn-id: r47581
2010-01-26 22:51:40 +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
4b996e7de7 Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
2010-01-23 23:55:35 +00:00
Travis Howell
ee653e19ec Update comments.
svn-id: r47461
2010-01-23 03:09:29 +00:00
Travis Howell
ed1de6e208 Fix regressions, only the Amiga CD32 version of Simon the Sorcerer 1 used signed sound data.
svn-id: r47460
2010-01-23 03:02:56 +00:00
Max Horn
409e44e7c3 AGOS: Further unify code related to compressed sound
svn-id: r47458
2010-01-23 00:04:43 +00:00
Max Horn
151906f14b AGOS: Fix memory leak in Sound::loadSfxTable
svn-id: r47457
2010-01-23 00:04:01 +00:00
Max Horn
a193c91e95 AGOS: Turn BaseSound::makeAudioStream into a pure virtual method
svn-id: r47456
2010-01-23 00:02:59 +00:00
Max Horn
c3c7071948 AGOS: Unify code related to compressed sound
svn-id: r47455
2010-01-23 00:02:01 +00:00
Max Horn
0b7ae99ad4 AGOS: Get rid of FLAG_LOOP usage
svn-id: r47454
2010-01-23 00:01:00 +00:00
Max Horn
a58efede57 AGOS: Start to refactor sound handling
svn-id: r47453
2010-01-23 00:00:11 +00:00
Max Horn
39af342fd1 AGOS: Add FIXME for a memory leak
svn-id: r47452
2010-01-22 23:59:16 +00:00
Max Horn
e270da88a6 AGOS: cleanup
svn-id: r47451
2010-01-22 23:58:24 +00:00
Max Horn
e754d8e1d3 AGOS: Rearrange sound code a bit
svn-id: r47450
2010-01-22 23:56:59 +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
68826c27da Get rid of Mixer::playRaw for good
svn-id: r47394
2010-01-19 22:19:43 +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
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
b47725540f Cleanup.
svn-id: r47133
2010-01-07 17:04:32 +00:00
Johannes Schickel
d5fe29c3c9 Make makeWAVStream return a RewindableAudioStream.
svn-id: r47129
2010-01-07 16:34:56 +00:00
Torbjörn Andersson
b6ca638180 Create the stream dynamically in playSoundData(), to avoid a crash (spotted by
salty-horse) when makeWAVStream() deletes it.

svn-id: r46676
2009-12-28 15:53:13 +00:00
Max Horn
6a2985ba08 Patch #2834677: Wave/ADPCM Endianness Fixes
svn-id: r45095
2009-10-14 22:37:05 +00:00
Travis Howell
0630c20722 Fix regression, that caused multiple sounds in Simon the Sorcerer 2 to be cut off.
svn-id: r43400
2009-08-15 10:09:32 +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
Travis Howell
42bb8b95be Fix the car chase scene in PN.
svn-id: r40299
2009-05-04 09:17:31 +00:00
Travis Howell
2620d6836c Add initial support for Personal Nightmare.
Thanks to dreammaster for file decompression and icon decoding code.

NOTE: setjmp/longjmp code will require conversion for portability.

svn-id: r39216
2009-03-08 08:45:21 +00:00
Travis Howell
f9d0d2a44a Add/Update comments.
svn-id: r36094
2009-01-27 03:26:51 +00:00