Commit Graph

91 Commits

Author SHA1 Message Date
Travis Howell
d9656ec355 Fix regression in Amiga version of simon2.
svn-id: r18721
2005-08-30 12:30:11 +00:00
Jonathan Gray
603a5e4d6f Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.

svn-id: r18642
2005-08-10 12:42:56 +00:00
Jonathan Gray
3c1b5648ae Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.

svn-id: r18641
2005-08-10 06:16:26 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix
svn-id: r18444
2005-06-24 15:23:51 +00:00
Max Horn
2de46dc8eb Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
2005-05-11 00:01:44 +00:00
Max Horn
1a615346ab Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
2005-05-10 23:48:48 +00:00
Max Horn
b75c969e66 Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
2005-05-10 22:56:25 +00:00
Max Horn
bd8831487f Renamed variables to match our naming conventions; added Sound::isVoiceActive() method; made some more members of class Sound private
svn-id: r17958
2005-05-08 12:33:25 +00:00
Travis Howell
21717273b4 No need to check for speech file in non-talkie versions.
svn-id: r17952
2005-05-08 05:56:09 +00:00
Travis Howell
169c85a19b Auto detect effect file type in Simon the Sorcerer 1.
svn-id: r17951
2005-05-08 05:23:31 +00:00
Travis Howell
0bcd57e87f Cleanup
svn-id: r17950
2005-05-08 04:54:08 +00:00
Travis Howell
d9b81f4ab8 Fix sound regressions.
svn-id: r17948
2005-05-08 02:50:43 +00:00
Travis Howell
076e42c302 Use ScummVM code formatting for names.
svn-id: r17930
2005-05-06 11:37:33 +00:00
Travis Howell
c8b17da61c Auto detect music and voice types, where possible.
Use correct set of MIDI tracks for MT32 in Simon the Sorcerer 2.

svn-id: r17925
2005-05-06 03:09:53 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Travis Howell
211ec4c32a Change SIMON to use makeWAVStream - patch #1101740
svn-id: r16555
2005-01-14 00:38:54 +00:00
Max Horn
7df70de2b1 Mark some places which probably should use loadWAVFromStream(); maybe some of the engine maintainers can look into using it
svn-id: r16503
2005-01-09 15:57:38 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +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
3891c0fa39 change loadVOCFromStream to take a reference instead of a pointer (to a stream)
svn-id: r16035
2004-12-11 23:34:34 +00:00
Max Horn
ba74a8e7f6 Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods
svn-id: r15914
2004-11-27 15:58:18 +00:00
Max Horn
4b6dae31eb changed loadVOCFile to work on a generic ReadStream instead of a File, and renamed it to loadVOCFromStream; removed readVOCFromMemory as it isn't used anymore, and in the future, a MemoryReadstream plus loadVOCFromStream can achieve the same effect
svn-id: r14383
2004-07-31 11:46:58 +00:00
Travis Howell
c6b037b9ed Reduce simon 1/2 targets
Add auto detection

svn-id: r14361
2004-07-30 09:00:29 +00:00
Max Horn
b8ad54b3af Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
svn-id: r14090
2004-06-27 22:14:35 +00:00
Max Horn
aa6ec62e9d Patch #885904 (Flac Support) with some tweaks by me
svn-id: r12984
2004-02-22 14:11:16 +00:00
Oliver Kiehl
a9f8a9ca18 oops
svn-id: r12511
2004-01-19 17:50:38 +00:00
Oliver Kiehl
7080232de0 fix memory leak
svn-id: r12510
2004-01-19 17:46:08 +00:00
Oliver Kiehl
18799981aa fix mp3 and vorbis specific bug in which sound files could have been read
as zero-byte files in the case that two following offsets pointed to the
same file.

svn-id: r12509
2004-01-19 17:44:04 +00:00
Oliver Kiehl
563d95c576 fix silly bug
svn-id: r12319
2004-01-11 15:42:11 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
b1d729d6dd renamed SimonSound class back to just Sound (now that we use namespaces that is just fine)
svn-id: r12098
2004-01-03 01:28:00 +00:00
Max Horn
436b5c5f7d Use VOC reader from voc.h
svn-id: r11963
2003-12-27 14:11:03 +00:00
Max Horn
e9269257f3 turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
svn-id: r11881
2003-12-24 00:25:18 +00:00
Max Horn
5eef5d4e15 add purely experimental & untested Ogg Vorbis support to Simon
svn-id: r11816
2003-12-21 16:01:36 +00:00
Max Horn
dafca64f36 don't use sound/mixer index, rather use the sound handle!
svn-id: r11794
2003-12-21 00:05:00 +00:00
Travis Howell
73f3c3bdd4 Remove warning.
svn-id: r11609
2003-12-13 01:54:53 +00:00
Travis Howell
3d04b69cbd Don't switch voice file in simon2mac unless needed.
svn-id: r11608
2003-12-13 01:54:17 +00:00
Max Horn
242efda7fb cleanup
svn-id: r11439
2003-12-01 00:45:16 +00:00
Max Horn
d98479ee5d cleanup; fix some memory leaks; more memory leaks remaining
svn-id: r11419
2003-11-29 11:56:24 +00:00
Paweł Kołodziejski
7d6c5bc1da cleanup whitespaces
svn-id: r11214
2003-11-08 20:54:31 +00:00
Travis Howell
3ccd6704bd Don't attempt to play sound in simon2mac if file doesn't exist.
Add fixme for simon2mac, freeing voice at this point which causes crashes.

svn-id: r10943
2003-10-23 04:49:04 +00:00
Max Horn
5301edc383 some cleanup
svn-id: r10720
2003-10-10 13:55:08 +00:00
Max Horn
a4b72c9d6e Simon namespace
svn-id: r10574
2003-10-03 19:42:27 +00:00
Travis Howell
3854ce8f3d Add Acorn version of Simon the Sorcerer 1 Talkie
svn-id: r10389
2003-09-24 06:19:30 +00:00
Max Horn
07a9646997 moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10152
2003-09-10 12:31:20 +00:00
Max Horn
7342163c7e make use of voc.h; some cleanup
svn-id: r10073
2003-09-07 20:30:02 +00:00
Max Horn
0be0196013 removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
2003-09-06 10:47:30 +00:00
Max Horn
06b6ff9a44 added default volume/pan values
svn-id: r10019
2003-09-05 21:06:32 +00:00